basic UDP support (patch 835128)

[wxWidgets.git] / contrib / samples / ogl / studio / Makefile.in

diff --git a/contrib/samples/ogl/studio/Makefile.in b/contrib/samples/ogl/studio/Makefile.in
index e22235f422e0c80a9b30d8f8ab93b5d924ae8e65..f31224e0bfad996cb0b6285dbe5ce5ac3be4d34e 100644 (file)
--- a/contrib/samples/ogl/studio/Makefile.in
+++ b/contrib/samples/ogl/studio/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -10,51 +10,57 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 INSTALL = @INSTALL@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 INSTALL = @INSTALL@

-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@

 EXEEXT = @EXEEXT@
 EXEEXT = @EXEEXT@

-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-LDFLAGS = @LDFLAGS@
-LDFLAGS_GUI = @LDFLAGS_GUI@

 RESCOMP = @RESCOMP@
 RESCOMP = @RESCOMP@

-SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@

 SETFILE = @SETFILE@
 SETFILE = @SETFILE@

-TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
+NM = @NM@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+LDFLAGS_GUI = @LDFLAGS_GUI@
+CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@

 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@

-srcdir = @srcdir@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
+TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
+EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_HTML = @EXTRALIBS_HTML@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
+EXTRALIBS_SDL = @EXTRALIBS_SDL@
+HOST_SUFFIX = @HOST_SUFFIX@
+SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@

 
 ### Variables: ###
 
 
 ### Variables: ###
 

+DESTDIR = 
+WX_VERSION = 2.5.2

 LIBDIRNAME = $(top_builddir)lib
 LIBDIRNAME = $(top_builddir)lib

-OGLEDIT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
-       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \
-       -I$(srcdir)/../../../include $(CXXFLAGS)
-OGLEDIT_OBJECTS =  \
-       ogledit_studio.o \
-       ogledit_doc.o \
-       ogledit_shapes.o \
-       ogledit_symbols.o \
-       ogledit_view.o \
-       ogledit_cspalette.o \
-       ogledit_mainfrm.o \
-       ogledit_project.o \
-       ogledit_dialogs.o \
-       ogledit_csprint.o \
-       $(__ogledit___win32rc)
+STUDIO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
+       $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
+       -I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS)
+STUDIO_OBJECTS =  \
+       $(__studio_os2_lib_res) \
+       studio_studio.o \
+       studio_doc.o \
+       studio_shapes.o \
+       studio_symbols.o \
+       studio_view.o \
+       studio_cspalette.o \
+       studio_mainfrm.o \
+       studio_project.o \
+       studio_dialogs.o \
+       studio_csprint.o \
+       $(__studio___win32rc)

 
 ### Conditionally set variables: ###
 
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
 
 ### Conditionally set variables: ###
 
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

+@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)

 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon


@@ -62,86 +68,112 @@ OGLEDIT_OBJECTS =  \
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ

+@COND_PLATFORM_MAC_1@__studio___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@  $(SETFILE) -a C studio$(EXEEXT)
+@COND_PLATFORM_MAC_1@__studio___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__

 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL

-@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib
-@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_1 = -i $(top_srcdir)/src/expat/lib
-@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_2 = \
-@COND_WXUSE_EXPAT_BUILTIN@     --include-dir $(top_srcdir)/src/expat/lib
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \
-@COND_WXUSE_LIBJPEG_BUILTIN@   --include-dir $(top_srcdir)/src/jpeg
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \
-@COND_WXUSE_ODBC_BUILTIN@      --include-dir $(top_srcdir)/src/odbc
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \
-@COND_WXUSE_LIBPNG_BUILTIN@    --include-dir $(top_srcdir)/src/png
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \
-@COND_WXUSE_REGEX_BUILTIN@     --include-dir $(top_srcdir)/src/regex
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \
-@COND_WXUSE_LIBTIFF_BUILTIN@   --include-dir $(top_srcdir)/src/tiff
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \
-@COND_WXUSE_ZLIB_BUILTIN@      --include-dir $(top_srcdir)/src/zlib
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
+COND_PLATFORM_OS2_1___studio___os2_emxbindcmd = $(NM) studio$(EXEEXT) | if grep \
+       -q pmwin.763 ; then emxbind -ep studio$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__studio___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___studio___os2_emxbindcmd)
+@COND_PLATFORM_OS2_1@__studio_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__studio_bundle___depname = studio_bundle
+@COND_TOOLKIT_COCOA@____studio_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   studio.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____studio_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     studio.app/Contents/PkgInfo
+COND_MONOLITHIC_0___WXLIB_ADV_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
+@COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
+@COND_PLATFORM_WIN32_1@__studio___win32rc = studio_studio_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
+@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)

 @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
 @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
 @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
 @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
 @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)

-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)

 @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
 @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  = \
 @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
 @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  = \
 @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)

-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
-@COND_WXUSE_REGEX_BUILTIN@     -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)

 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
 @COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
 @COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)

+@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
+@COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
+@COND_WXUSE_REGEX_BUILTIN@     -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
+@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)

 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \

-       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
-       $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
-       $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
-       $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \
-       ogledit$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
-       ../../../../samples/sample.r
+       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
+       $(srcdir)/../../../../samples -i $(top_srcdir)/include -i \
+       $(srcdir)/../../../include -o studio$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)

-@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
-@COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-@COND_PLATFORM_MAC_1@__ogledit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_PLATFORM_MAC_1@__ogledit___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@  $(SETFILE) -a C ogledit$(EXEEXT)
-@COND_PLATFORM_WIN32_1@__ogledit___win32rc = ogledit_studio_rc.o

 
 ### Targets: ###
 
 
 ### Targets: ###
 

-all: ogledit$(EXEEXT) data
+all: studio$(EXEEXT) $(__studio_bundle___depname) data
+
+install: all
+
+uninstall: 
+
+install-strip: install

 
 clean: 
 
 clean: 

-       rm -rf ./.deps
+       rm -rf ./.deps ./.pch

        rm -f ./*.o
        rm -f ./*.o

-       rm -f ogledit$(EXEEXT)
+       rm -f studio$(EXEEXT)
+       rm -rf studio.app
+
+distclean: clean
+       rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+studio$(EXEEXT): $(STUDIO_OBJECTS) $(__studio___win32rc)
+       $(CXX) -o $@ $(STUDIO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
+       $(__studio___mac_rezcmd)
+       $(__studio___mac_setfilecmd)
+       $(__studio___os2_emxbindcmd)
+       $(SAMPLES_RPATH_POSTLINK)
+
+studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+       mkdir -p studio.app/Contents
+       mkdir -p studio.app/Contents/MacOS
+       mkdir -p studio.app/Contents/Resources
+       
+       
+       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+       -e "s/EXECUTABLE/studio/" \
+       -e "s/VERSION/$(WX_VERSION)/" \
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >studio.app/Contents/Info.plist
+       
+       
+       echo -n "APPL????" >studio.app/Contents/PkgInfo
+       
+       
+       ln -f studio$(EXEEXT) studio.app/Contents/MacOS/studio
+       
+       
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc studio.app/Contents/Resources/studio.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns studio.app/Contents/Resources/wxmac.icns
+
+@COND_PLATFORM_MACOSX_1@studio_bundle: $(____studio_BUNDLE_TGT_REF_DEP)

 
 data: 
        @mkdir -p .
 
 data: 
        @mkdir -p .


@@ -151,56 +183,41 @@ data:
        fi; \
        done
 
        fi; \
        done
 

-distclean: clean
-       rm -f configure config.cache config.log config.status
-       rm -f bk-deps shared-ld-sh
-
-install: all
-
-install-strip: install
-
-ogledit$(EXEEXT): $(OGLEDIT_OBJECTS) $(__ogledit___win32rc)
-       $(CXX) -o $@ $(OGLEDIT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
-       $(__ogledit___mac_rezcmd)
-       $(__ogledit___mac_setfilecmd)
-
-ogledit_cspalette.o: $(srcdir)/cspalette.cpp
-       $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+studio_studio.o: $(srcdir)/studio.cpp
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<

 
 

-ogledit_csprint.o: $(srcdir)/csprint.cpp
-       $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+studio_doc.o: $(srcdir)/doc.cpp
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<

 
 

-ogledit_dialogs.o: $(srcdir)/dialogs.cpp
-       $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+studio_shapes.o: $(srcdir)/shapes.cpp
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<

 
 

-ogledit_doc.o: $(srcdir)/doc.cpp
-       $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+studio_symbols.o: $(srcdir)/symbols.cpp
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<

 
 

-ogledit_mainfrm.o: $(srcdir)/mainfrm.cpp
-       $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+studio_view.o: $(srcdir)/view.cpp
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<

 
 

-ogledit_project.o: $(srcdir)/project.cpp
-       $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+studio_cspalette.o: $(srcdir)/cspalette.cpp
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<

 
 

-ogledit_shapes.o: $(srcdir)/shapes.cpp
-       $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+studio_mainfrm.o: $(srcdir)/mainfrm.cpp
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<

 
 

-ogledit_studio.o: $(srcdir)/studio.cpp
-       $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+studio_project.o: $(srcdir)/project.cpp
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<

 
 

-ogledit_studio_rc.o: $(srcdir)/studio.rc
-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples --include-dir $(srcdir)/../../../include
+studio_dialogs.o: $(srcdir)/dialogs.cpp
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<

 
 

-ogledit_symbols.o: $(srcdir)/symbols.cpp
-       $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+studio_csprint.o: $(srcdir)/csprint.cpp
+       $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $<

 
 

-ogledit_view.o: $(srcdir)/view.cpp
-       $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
-
-uninstall: 
+studio_studio_rc.o: $(srcdir)/studio.rc
+       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../../include

 
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
 
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 

-.PHONY: all clean data distclean install uninstall
+.PHONY: all install uninstall clean distclean studio_bundle data