From d391f6679dc29d7c76e4401aa2cc01ed013651e1 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 14 Apr 2005 22:11:55 +0000 Subject: [PATCH] Removed rules for copying the Mac resource file since they are no longer needed for wxMac git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 6 ++++- build/bakefiles/common_samples.bkl | 2 +- build/bakefiles/mac_bundles.bkl | 5 ---- contrib/samples/animate/Makefile.in | 7 ++--- .../samples/deprecated/proplist/Makefile.in | 7 ++--- .../samples/deprecated/resource/Makefile.in | 7 ++--- .../samples/deprecated/treelay/Makefile.in | 7 ++--- contrib/samples/fl/Makefile.in | 26 +++++++------------ contrib/samples/foldbar/extended/Makefile.in | 11 +++----- .../samples/foldbar/foldpanelbar/Makefile.in | 7 ++--- contrib/samples/gizmos/dynsash/Makefile.in | 7 ++--- .../samples/gizmos/dynsash_switch/Makefile.in | 7 ++--- contrib/samples/gizmos/editlbox/Makefile.in | 7 ++--- contrib/samples/gizmos/led/Makefile.in | 7 ++--- contrib/samples/gizmos/multicell/Makefile.in | 7 ++--- contrib/samples/gizmos/splittree/Makefile.in | 7 ++--- contrib/samples/mmedia/Makefile.in | 7 ++--- contrib/samples/ogl/ogledit/Makefile.in | 7 ++--- contrib/samples/ogl/studio/Makefile.in | 7 ++--- contrib/samples/plot/Makefile.in | 7 ++--- contrib/samples/stc/Makefile.in | 7 ++--- contrib/samples/svg/Makefile.in | 7 ++--- contrib/utils/convertrc/Makefile.in | 4 +-- contrib/utils/wxrcedit/Makefile.in | 4 +-- demos/bombs/Makefile.in | 6 ++--- demos/dbbrowse/Makefile.in | 6 ++--- demos/forty/Makefile.in | 6 ++--- demos/fractal/Makefile.in | 6 ++--- demos/life/Makefile.in | 6 ++--- demos/poem/Makefile.in | 6 ++--- samples/access/Makefile.in | 6 ++--- samples/artprov/Makefile.in | 6 ++--- samples/calendar/Makefile.in | 6 ++--- samples/caret/Makefile.in | 6 ++--- samples/checklst/Makefile.in | 6 ++--- samples/config/Makefile.in | 6 ++--- samples/controls/Makefile.in | 6 ++--- samples/db/Makefile.in | 6 ++--- samples/debugrpt/Makefile.in | 6 ++--- samples/dialogs/Makefile.in | 6 ++--- samples/dialup/Makefile.in | 6 ++--- samples/display/Makefile.in | 6 ++--- samples/dnd/Makefile.in | 10 +++---- samples/docview/Makefile.in | 7 ++--- samples/docvwmdi/Makefile.in | 6 ++--- samples/dragimag/Makefile.in | 6 ++--- samples/drawing/Makefile.in | 6 ++--- samples/dynamic/Makefile.in | 6 ++--- samples/erase/Makefile.in | 6 ++--- samples/event/Makefile.in | 6 ++--- samples/except/Makefile.in | 6 ++--- samples/exec/Makefile.in | 6 ++--- samples/font/Makefile.in | 6 ++--- samples/grid/Makefile.in | 6 ++--- samples/help/Makefile.in | 6 ++--- samples/htlbox/Makefile.in | 6 ++--- samples/html/about/Makefile.in | 6 ++--- samples/html/help/Makefile.in | 6 ++--- samples/html/helpview/Makefile.in | 6 ++--- samples/html/htmlctrl/Makefile.in | 6 ++--- samples/html/printing/Makefile.in | 6 ++--- samples/html/test/Makefile.in | 6 ++--- samples/html/virtual/Makefile.in | 6 ++--- samples/html/widget/Makefile.in | 6 ++--- samples/html/zip/Makefile.in | 6 ++--- samples/image/Makefile.in | 6 ++--- samples/internat/Makefile.in | 6 ++--- samples/ipc/Makefile.in | 11 +++----- samples/joytest/Makefile.in | 6 ++--- samples/keyboard/Makefile.in | 6 ++--- samples/layout/Makefile.in | 6 ++--- samples/listbox/Makefile.in | 6 ++--- samples/listctrl/Makefile.in | 6 ++--- samples/mdi/Makefile.in | 6 ++--- samples/mediaplayer/Makefile.in | 6 ++--- samples/memcheck/Makefile.in | 6 ++--- samples/menu/Makefile.in | 6 ++--- samples/mfc/Makefile.in | 6 ++--- samples/minifram/Makefile.in | 6 ++--- samples/minimal/Makefile.in | 6 ++--- samples/mobile/styles/Makefile.in | 6 ++--- samples/mobile/wxedit/Makefile.in | 6 ++--- samples/multimon/Makefile.in | 6 ++--- samples/nativdlg/Makefile.in | 6 ++--- samples/notebook/Makefile.in | 6 ++--- samples/oleauto/Makefile.in | 6 ++--- samples/opengl/cube/Makefile.in | 6 ++--- samples/opengl/isosurf/Makefile.in | 6 ++--- samples/opengl/penguin/Makefile.in | 6 ++--- samples/ownerdrw/Makefile.in | 6 ++--- samples/png/Makefile.in | 6 ++--- samples/popup/Makefile.in | 6 ++--- samples/printing/Makefile.in | 6 ++--- samples/propsize/Makefile.in | 6 ++--- samples/regtest/Makefile.in | 6 ++--- samples/render/Makefile.in | 6 ++--- samples/richedit/Makefile.in | 6 ++--- samples/rotate/Makefile.in | 6 ++--- samples/sashtest/Makefile.in | 6 ++--- samples/scroll/Makefile.in | 6 ++--- samples/scrollsub/Makefile.in | 6 ++--- samples/shaped/Makefile.in | 6 ++--- samples/sockets/Makefile.in | 11 +++----- samples/sound/Makefile.in | 6 ++--- samples/splash/Makefile.in | 6 ++--- samples/splitter/Makefile.in | 6 ++--- samples/statbar/Makefile.in | 6 ++--- samples/stc/Makefile.in | 7 ++--- samples/svg/Makefile.in | 7 ++--- samples/taskbar/Makefile.in | 6 ++--- samples/text/Makefile.in | 6 ++--- samples/thread/Makefile.in | 6 ++--- samples/toolbar/Makefile.in | 6 ++--- samples/treectrl/Makefile.in | 6 ++--- samples/typetest/Makefile.in | 6 ++--- samples/validate/Makefile.in | 6 ++--- samples/vscroll/Makefile.in | 6 ++--- samples/widgets/Makefile.in | 6 ++--- samples/wizard/Makefile.in | 6 ++--- samples/xrc/Makefile.in | 6 ++--- utils/configtool/src/Makefile.in | 3 +-- utils/emulator/src/Makefile.in | 3 +-- utils/helpview/src/Makefile.in | 3 +-- utils/hhp2cached/Makefile.in | 3 +-- utils/tex2rtf/src/Makefile.in | 3 +-- 125 files changed, 259 insertions(+), 526 deletions(-) diff --git a/Makefile.in b/Makefile.in index 9518a2e304..f4ce3b1b75 100644 --- a/Makefile.in +++ b/Makefile.in @@ -169,6 +169,7 @@ WXTIFF_OBJECTS = \ wxtiff_tif_dirwrite.o \ wxtiff_tif_dumpmode.o \ wxtiff_tif_error.o \ + wxtiff_tif_extension.o \ wxtiff_tif_fax3.o \ wxtiff_tif_fax3sm.o \ wxtiff_tif_getimage.o \ @@ -9663,7 +9664,7 @@ install-wxconfig: $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config - (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) + (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) locale_install: $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale @@ -9959,6 +9960,9 @@ wxtiff_tif_dumpmode.o: $(srcdir)/src/tiff/tif_dumpmode.c wxtiff_tif_error.o: $(srcdir)/src/tiff/tif_error.c $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/tif_error.c +wxtiff_tif_extension.o: $(srcdir)/src/tiff/tif_extension.c + $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/tif_extension.c + wxtiff_tif_fax3.o: $(srcdir)/src/tiff/tif_fax3.c $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/tif_fax3.c diff --git a/build/bakefiles/common_samples.bkl b/build/bakefiles/common_samples.bkl index fc9a862b0a..3e46c6a7c8 100644 --- a/build/bakefiles/common_samples.bkl +++ b/build/bakefiles/common_samples.bkl @@ -13,7 +13,7 @@ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r sample.r + Carbon.r sample.r diff --git a/build/bakefiles/mac_bundles.bkl b/build/bakefiles/mac_bundles.bkl index 87443306a3..b5c69912d7 100644 --- a/build/bakefiles/mac_bundles.bkl +++ b/build/bakefiles/mac_bundles.bkl @@ -18,9 +18,6 @@ $(TOP_SRCDIR)src/mac/carbon/Info.plist.in - - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).rsrc - $(TOP_SRCDIR)src/mac/carbon/wxmac.icns @@ -40,7 +37,6 @@ $(id) $(BUNDLE_PLIST) - $(BUNDLE_RESOURCE) $(BUNDLE_ICONS) @@ -62,7 +58,6 @@ ln -f $(ref("__targetdir",id))$(ref("__targetname",id)) $(BUNDLE)/MacOS/$(id) - cp -f $(BUNDLE_RESOURCE) $(BUNDLE)/Resources/$(id).rsrc cp -f $(BUNDLE_ICONS) $(BUNDLE)/Resources/wxmac.icns diff --git a/contrib/samples/animate/Makefile.in b/contrib/samples/animate/Makefile.in index a5496e8462..b1ae722a61 100644 --- a/contrib/samples/animate/Makefile.in +++ b/contrib/samples/animate/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -123,8 +122,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -i \ - $(srcdir)/../../include -o anitest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(srcdir)/../../include -o anitest$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -153,7 +151,7 @@ anitest$(EXEEXT): $(ANITEST_OBJECTS) $(__anitest___win32rc) $(__anitest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -anitest.app/Contents/PkgInfo: anitest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +anitest.app/Contents/PkgInfo: anitest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p anitest.app/Contents mkdir -p anitest.app/Contents/MacOS mkdir -p anitest.app/Contents/Resources @@ -171,7 +169,6 @@ anitest.app/Contents/PkgInfo: anitest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f anitest$(EXEEXT) anitest.app/Contents/MacOS/anitest - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc anitest.app/Contents/Resources/anitest.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns anitest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@anitest_bundle: $(____anitest_BUNDLE_TGT_REF_DEP) diff --git a/contrib/samples/deprecated/proplist/Makefile.in b/contrib/samples/deprecated/proplist/Makefile.in index 0aba1da5dd..f55b75c471 100644 --- a/contrib/samples/deprecated/proplist/Makefile.in +++ b/contrib/samples/deprecated/proplist/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -123,8 +122,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../../samples -i $(top_srcdir)/include -i \ - $(srcdir)/../../../include -o proplist$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(srcdir)/../../../include -o proplist$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -153,7 +151,7 @@ proplist$(EXEEXT): $(PROPLIST_OBJECTS) $(__proplist___win32rc) $(__proplist___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -proplist.app/Contents/PkgInfo: proplist$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +proplist.app/Contents/PkgInfo: proplist$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p proplist.app/Contents mkdir -p proplist.app/Contents/MacOS mkdir -p proplist.app/Contents/Resources @@ -171,7 +169,6 @@ proplist.app/Contents/PkgInfo: proplist$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f proplist$(EXEEXT) proplist.app/Contents/MacOS/proplist - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc proplist.app/Contents/Resources/proplist.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns proplist.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@proplist_bundle: $(____proplist_BUNDLE_TGT_REF_DEP) diff --git a/contrib/samples/deprecated/resource/Makefile.in b/contrib/samples/deprecated/resource/Makefile.in index beb71f0b15..8315fe8cb5 100644 --- a/contrib/samples/deprecated/resource/Makefile.in +++ b/contrib/samples/deprecated/resource/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -123,8 +122,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../../samples -i $(top_srcdir)/include -i \ - $(srcdir)/../../../include -o resource$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(srcdir)/../../../include -o resource$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -153,7 +151,7 @@ resource$(EXEEXT): $(RESOURCE_OBJECTS) $(__resource___win32rc) $(__resource___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -resource.app/Contents/PkgInfo: resource$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +resource.app/Contents/PkgInfo: resource$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p resource.app/Contents mkdir -p resource.app/Contents/MacOS mkdir -p resource.app/Contents/Resources @@ -171,7 +169,6 @@ resource.app/Contents/PkgInfo: resource$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f resource$(EXEEXT) resource.app/Contents/MacOS/resource - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc resource.app/Contents/Resources/resource.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns resource.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@resource_bundle: $(____resource_BUNDLE_TGT_REF_DEP) diff --git a/contrib/samples/deprecated/treelay/Makefile.in b/contrib/samples/deprecated/treelay/Makefile.in index c063541d05..a42b48266d 100644 --- a/contrib/samples/deprecated/treelay/Makefile.in +++ b/contrib/samples/deprecated/treelay/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -123,8 +122,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../../samples -i $(top_srcdir)/include -i \ - $(srcdir)/../../../include -o treelay$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(srcdir)/../../../include -o treelay$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -153,7 +151,7 @@ treelay$(EXEEXT): $(TREELAY_OBJECTS) $(__treelay___win32rc) $(__treelay___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -treelay.app/Contents/PkgInfo: treelay$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +treelay.app/Contents/PkgInfo: treelay$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p treelay.app/Contents mkdir -p treelay.app/Contents/MacOS mkdir -p treelay.app/Contents/Resources @@ -171,7 +169,6 @@ treelay.app/Contents/PkgInfo: treelay$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f treelay$(EXEEXT) treelay.app/Contents/MacOS/treelay - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc treelay.app/Contents/Resources/treelay.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns treelay.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@treelay_bundle: $(____treelay_BUNDLE_TGT_REF_DEP) diff --git a/contrib/samples/fl/Makefile.in b/contrib/samples/fl/Makefile.in index 2b97d447d0..d5285dc56c 100644 --- a/contrib/samples/fl/Makefile.in +++ b/contrib/samples/fl/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -160,35 +159,35 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_5 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ $(__RTTI_DEFINE_p_1_2) $(__THREAD_DEFINE_p_1_2) -i $(srcdir) \ $(__DLLFLAG_p_1_2) -i $(srcdir)/../../../samples -i $(top_srcdir)/include -i \ $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o fl_demo1$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_5 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_5) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_6 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) $(__EXCEPTIONS_DEFINE_p_1_2) \ $(__RTTI_DEFINE_p_1_2) $(__THREAD_DEFINE_p_1_2) -i $(srcdir) \ $(__DLLFLAG_p_1_2) -i $(srcdir)/../../../samples -i $(top_srcdir)/include -i \ $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o fl_demo2$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_6 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_6) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_7 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) $(__EXCEPTIONS_DEFINE_p_1_2) \ $(__RTTI_DEFINE_p_1_2) $(__THREAD_DEFINE_p_1_2) -i $(srcdir) \ $(__DLLFLAG_p_1_2) -i $(srcdir)/../../../samples -i $(top_srcdir)/include -i \ $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o fl_sample1$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_7 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_7) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_8 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) $(__EXCEPTIONS_DEFINE_p_1_2) \ $(__RTTI_DEFINE_p_1_2) $(__THREAD_DEFINE_p_1_2) -i $(srcdir) \ $(__DLLFLAG_p_1_2) -i $(srcdir)/../../../samples -i $(top_srcdir)/include -i \ $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o fl_sample2$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_8 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_8) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) $(__EXCEPTIONS_DEFINE_p_1_2) \ $(__RTTI_DEFINE_p_1_2) $(__THREAD_DEFINE_p_1_2) -i $(srcdir) \ $(__DLLFLAG_p_1_2) -i $(srcdir)/../../../samples -i $(top_srcdir)/include -i \ $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o fl_sample3$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_9 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1_2 = -d __WXUNIVERSAL__ @@ -268,7 +267,7 @@ fl_demo1$(EXEEXT): $(FL_DEMO1_OBJECTS) $(__fl_demo1___win32rc) $(__fl_demo1___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -fl_demo1.app/Contents/PkgInfo: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +fl_demo1.app/Contents/PkgInfo: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p fl_demo1.app/Contents mkdir -p fl_demo1.app/Contents/MacOS mkdir -p fl_demo1.app/Contents/Resources @@ -286,7 +285,6 @@ fl_demo1.app/Contents/PkgInfo: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f fl_demo1$(EXEEXT) fl_demo1.app/Contents/MacOS/fl_demo1 - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_demo1.app/Contents/Resources/fl_demo1.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fl_demo1.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@fl_demo1_bundle: $(____fl_demo1_BUNDLE_TGT_REF_DEP) @@ -298,7 +296,7 @@ fl_demo2$(EXEEXT): $(FL_DEMO2_OBJECTS) $(__fl_demo2___win32rc) $(__fl_demo2___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -fl_demo2.app/Contents/PkgInfo: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +fl_demo2.app/Contents/PkgInfo: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p fl_demo2.app/Contents mkdir -p fl_demo2.app/Contents/MacOS mkdir -p fl_demo2.app/Contents/Resources @@ -316,7 +314,6 @@ fl_demo2.app/Contents/PkgInfo: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f fl_demo2$(EXEEXT) fl_demo2.app/Contents/MacOS/fl_demo2 - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_demo2.app/Contents/Resources/fl_demo2.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fl_demo2.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@fl_demo2_bundle: $(____fl_demo2_BUNDLE_TGT_REF_DEP) @@ -328,7 +325,7 @@ fl_sample1$(EXEEXT): $(FL_SAMPLE1_OBJECTS) $(__fl_sample1___win32rc) $(__fl_sample1___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -fl_sample1.app/Contents/PkgInfo: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +fl_sample1.app/Contents/PkgInfo: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p fl_sample1.app/Contents mkdir -p fl_sample1.app/Contents/MacOS mkdir -p fl_sample1.app/Contents/Resources @@ -346,7 +343,6 @@ fl_sample1.app/Contents/PkgInfo: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/carbo ln -f fl_sample1$(EXEEXT) fl_sample1.app/Contents/MacOS/fl_sample1 - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_sample1.app/Contents/Resources/fl_sample1.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fl_sample1.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@fl_sample1_bundle: $(____fl_sample1_BUNDLE_TGT_REF_DEP) @@ -358,7 +354,7 @@ fl_sample2$(EXEEXT): $(FL_SAMPLE2_OBJECTS) $(__fl_sample2___win32rc) $(__fl_sample2___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -fl_sample2.app/Contents/PkgInfo: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +fl_sample2.app/Contents/PkgInfo: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p fl_sample2.app/Contents mkdir -p fl_sample2.app/Contents/MacOS mkdir -p fl_sample2.app/Contents/Resources @@ -376,7 +372,6 @@ fl_sample2.app/Contents/PkgInfo: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/carbo ln -f fl_sample2$(EXEEXT) fl_sample2.app/Contents/MacOS/fl_sample2 - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_sample2.app/Contents/Resources/fl_sample2.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fl_sample2.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@fl_sample2_bundle: $(____fl_sample2_BUNDLE_TGT_REF_DEP) @@ -388,7 +383,7 @@ fl_sample3$(EXEEXT): $(FL_SAMPLE3_OBJECTS) $(__fl_sample3___win32rc) $(__fl_sample3___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -fl_sample3.app/Contents/PkgInfo: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +fl_sample3.app/Contents/PkgInfo: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p fl_sample3.app/Contents mkdir -p fl_sample3.app/Contents/MacOS mkdir -p fl_sample3.app/Contents/Resources @@ -406,7 +401,6 @@ fl_sample3.app/Contents/PkgInfo: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/carbo ln -f fl_sample3$(EXEEXT) fl_sample3.app/Contents/MacOS/fl_sample3 - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_sample3.app/Contents/Resources/fl_sample3.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fl_sample3.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@fl_sample3_bundle: $(____fl_sample3_BUNDLE_TGT_REF_DEP) diff --git a/contrib/samples/foldbar/extended/Makefile.in b/contrib/samples/foldbar/extended/Makefile.in index 0438b37672..c780c64199 100644 --- a/contrib/samples/foldbar/extended/Makefile.in +++ b/contrib/samples/foldbar/extended/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_SDL = @EXTRALIBS_SDL@ @@ -37,8 +36,8 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ ### Variables: ### DESTDIR = -WX_RELEASE = 2.5 -WX_VERSION = $(WX_RELEASE).5 +WX_RELEASE = 2.6 +WX_VERSION = $(WX_RELEASE).0 LIBDIRNAME = $(top_builddir)lib EXTENDED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ @@ -128,8 +127,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../../samples -i $(top_srcdir)/include -i \ - $(srcdir)/../../../include -o extended$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.r sample.r + $(srcdir)/../../../include -o extended$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -158,7 +156,7 @@ extended$(EXEEXT): $(EXTENDED_OBJECTS) $(__extended___win32rc) $(__extended___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -extended.app/Contents/PkgInfo: extended$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +extended.app/Contents/PkgInfo: extended$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p extended.app/Contents mkdir -p extended.app/Contents/MacOS mkdir -p extended.app/Contents/Resources @@ -176,7 +174,6 @@ extended.app/Contents/PkgInfo: extended$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f extended$(EXEEXT) extended.app/Contents/MacOS/extended - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc extended.app/Contents/Resources/extended.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns extended.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@extended_bundle: $(____extended_BUNDLE_TGT_REF_DEP) diff --git a/contrib/samples/foldbar/foldpanelbar/Makefile.in b/contrib/samples/foldbar/foldpanelbar/Makefile.in index 587674d37f..c29642bfe0 100644 --- a/contrib/samples/foldbar/foldpanelbar/Makefile.in +++ b/contrib/samples/foldbar/foldpanelbar/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -127,8 +126,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../../samples -i $(top_srcdir)/include -i \ - $(srcdir)/../../../include -o foldtest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(srcdir)/../../../include -o foldtest$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -157,7 +155,7 @@ foldtest$(EXEEXT): $(FOLDTEST_OBJECTS) $(__foldtest___win32rc) $(__foldtest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -foldtest.app/Contents/PkgInfo: foldtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +foldtest.app/Contents/PkgInfo: foldtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p foldtest.app/Contents mkdir -p foldtest.app/Contents/MacOS mkdir -p foldtest.app/Contents/Resources @@ -175,7 +173,6 @@ foldtest.app/Contents/PkgInfo: foldtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f foldtest$(EXEEXT) foldtest.app/Contents/MacOS/foldtest - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc foldtest.app/Contents/Resources/foldtest.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns foldtest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@foldtest_bundle: $(____foldtest_BUNDLE_TGT_REF_DEP) diff --git a/contrib/samples/gizmos/dynsash/Makefile.in b/contrib/samples/gizmos/dynsash/Makefile.in index adc5b53e4e..4c3ab9da7e 100644 --- a/contrib/samples/gizmos/dynsash/Makefile.in +++ b/contrib/samples/gizmos/dynsash/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_HTML = @EXTRALIBS_HTML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -127,8 +126,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../../samples -i $(top_srcdir)/include -i \ - $(srcdir)/../../../include -o dynsash$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(srcdir)/../../../include -o dynsash$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -157,7 +155,7 @@ dynsash$(EXEEXT): $(DYNSASH_OBJECTS) $(__dynsash___win32rc) $(__dynsash___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -dynsash.app/Contents/PkgInfo: dynsash$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +dynsash.app/Contents/PkgInfo: dynsash$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p dynsash.app/Contents mkdir -p dynsash.app/Contents/MacOS mkdir -p dynsash.app/Contents/Resources @@ -175,7 +173,6 @@ dynsash.app/Contents/PkgInfo: dynsash$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f dynsash$(EXEEXT) dynsash.app/Contents/MacOS/dynsash - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dynsash.app/Contents/Resources/dynsash.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dynsash.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@dynsash_bundle: $(____dynsash_BUNDLE_TGT_REF_DEP) diff --git a/contrib/samples/gizmos/dynsash_switch/Makefile.in b/contrib/samples/gizmos/dynsash_switch/Makefile.in index ccb54df5a9..72f02d34f0 100644 --- a/contrib/samples/gizmos/dynsash_switch/Makefile.in +++ b/contrib/samples/gizmos/dynsash_switch/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -127,8 +126,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../../samples -i $(top_srcdir)/include -i \ - $(srcdir)/../../../include -o dynsash_switch$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(srcdir)/../../../include -o dynsash_switch$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -157,7 +155,7 @@ dynsash_switch$(EXEEXT): $(DYNSASH_SWITCH_OBJECTS) $(__dynsash_switch___win32rc) $(__dynsash_switch___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -dynsash_switch.app/Contents/PkgInfo: dynsash_switch$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +dynsash_switch.app/Contents/PkgInfo: dynsash_switch$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p dynsash_switch.app/Contents mkdir -p dynsash_switch.app/Contents/MacOS mkdir -p dynsash_switch.app/Contents/Resources @@ -175,7 +173,6 @@ dynsash_switch.app/Contents/PkgInfo: dynsash_switch$(EXEEXT) $(top_srcdir)/src/m ln -f dynsash_switch$(EXEEXT) dynsash_switch.app/Contents/MacOS/dynsash_switch - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dynsash_switch.app/Contents/Resources/dynsash_switch.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dynsash_switch.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@dynsash_switch_bundle: $(____dynsash_switch_BUNDLE_TGT_REF_DEP) diff --git a/contrib/samples/gizmos/editlbox/Makefile.in b/contrib/samples/gizmos/editlbox/Makefile.in index 0658102a74..7838e52ffb 100644 --- a/contrib/samples/gizmos/editlbox/Makefile.in +++ b/contrib/samples/gizmos/editlbox/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -121,8 +120,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../../samples -i $(top_srcdir)/include -i \ - $(srcdir)/../../../include -o test$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(srcdir)/../../../include -o test$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +149,7 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc) $(__test___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p test.app/Contents mkdir -p test.app/Contents/MacOS mkdir -p test.app/Contents/Resources @@ -169,7 +167,6 @@ test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist ln -f test$(EXEEXT) test.app/Contents/MacOS/test - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc test.app/Contents/Resources/test.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns test.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@test_bundle: $(____test_BUNDLE_TGT_REF_DEP) diff --git a/contrib/samples/gizmos/led/Makefile.in b/contrib/samples/gizmos/led/Makefile.in index a009be7f79..e17c82f9eb 100644 --- a/contrib/samples/gizmos/led/Makefile.in +++ b/contrib/samples/gizmos/led/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -120,8 +119,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../../samples -i $(top_srcdir)/include -i \ - $(srcdir)/../../../include -o led$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(srcdir)/../../../include -o led$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -150,7 +148,7 @@ led$(EXEEXT): $(LED_OBJECTS) $(__led___win32rc) $(__led___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -led.app/Contents/PkgInfo: led$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +led.app/Contents/PkgInfo: led$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p led.app/Contents mkdir -p led.app/Contents/MacOS mkdir -p led.app/Contents/Resources @@ -168,7 +166,6 @@ led.app/Contents/PkgInfo: led$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.i ln -f led$(EXEEXT) led.app/Contents/MacOS/led - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc led.app/Contents/Resources/led.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns led.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@led_bundle: $(____led_BUNDLE_TGT_REF_DEP) diff --git a/contrib/samples/gizmos/multicell/Makefile.in b/contrib/samples/gizmos/multicell/Makefile.in index 2147127339..388546ffd5 100644 --- a/contrib/samples/gizmos/multicell/Makefile.in +++ b/contrib/samples/gizmos/multicell/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,8 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../../samples -i $(top_srcdir)/include -i \ - $(srcdir)/../../../include -o mtest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(srcdir)/../../../include -o mtest$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -152,7 +150,7 @@ mtest$(EXEEXT): $(MTEST_OBJECTS) $(__mtest___win32rc) $(__mtest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -mtest.app/Contents/PkgInfo: mtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +mtest.app/Contents/PkgInfo: mtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p mtest.app/Contents mkdir -p mtest.app/Contents/MacOS mkdir -p mtest.app/Contents/Resources @@ -170,7 +168,6 @@ mtest.app/Contents/PkgInfo: mtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli ln -f mtest$(EXEEXT) mtest.app/Contents/MacOS/mtest - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc mtest.app/Contents/Resources/mtest.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mtest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@mtest_bundle: $(____mtest_BUNDLE_TGT_REF_DEP) diff --git a/contrib/samples/gizmos/splittree/Makefile.in b/contrib/samples/gizmos/splittree/Makefile.in index 6482ef83ff..4be37f6227 100644 --- a/contrib/samples/gizmos/splittree/Makefile.in +++ b/contrib/samples/gizmos/splittree/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -123,8 +122,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../../samples -i $(top_srcdir)/include -i \ - $(srcdir)/../../../include -o splittree$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(srcdir)/../../../include -o splittree$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -153,7 +151,7 @@ splittree$(EXEEXT): $(SPLITTREE_OBJECTS) $(__splittree___win32rc) $(__splittree___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -splittree.app/Contents/PkgInfo: splittree$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +splittree.app/Contents/PkgInfo: splittree$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p splittree.app/Contents mkdir -p splittree.app/Contents/MacOS mkdir -p splittree.app/Contents/Resources @@ -171,7 +169,6 @@ splittree.app/Contents/PkgInfo: splittree$(EXEEXT) $(top_srcdir)/src/mac/carbon/ ln -f splittree$(EXEEXT) splittree.app/Contents/MacOS/splittree - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc splittree.app/Contents/Resources/splittree.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns splittree.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@splittree_bundle: $(____splittree_BUNDLE_TGT_REF_DEP) diff --git a/contrib/samples/mmedia/Makefile.in b/contrib/samples/mmedia/Makefile.in index f86e18fe4c..97ec085251 100644 --- a/contrib/samples/mmedia/Makefile.in +++ b/contrib/samples/mmedia/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -125,8 +124,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -i \ - $(srcdir)/../../include -o mmboard$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(srcdir)/../../include -o mmboard$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -155,7 +153,7 @@ mmboard$(EXEEXT): $(MMBOARD_OBJECTS) $(__mmboard___win32rc) $(__mmboard___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -mmboard.app/Contents/PkgInfo: mmboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +mmboard.app/Contents/PkgInfo: mmboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p mmboard.app/Contents mkdir -p mmboard.app/Contents/MacOS mkdir -p mmboard.app/Contents/Resources @@ -173,7 +171,6 @@ mmboard.app/Contents/PkgInfo: mmboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f mmboard$(EXEEXT) mmboard.app/Contents/MacOS/mmboard - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc mmboard.app/Contents/Resources/mmboard.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mmboard.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@mmboard_bundle: $(____mmboard_BUNDLE_TGT_REF_DEP) diff --git a/contrib/samples/ogl/ogledit/Makefile.in b/contrib/samples/ogl/ogledit/Makefile.in index ad7a55376b..bf1b3bf305 100644 --- a/contrib/samples/ogl/ogledit/Makefile.in +++ b/contrib/samples/ogl/ogledit/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -126,8 +125,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../../samples -i $(top_srcdir)/include -i \ - $(srcdir)/../../../include -o ogledit$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(srcdir)/../../../include -o ogledit$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,7 +154,7 @@ ogledit$(EXEEXT): $(OGLEDIT_OBJECTS) $(__ogledit___win32rc) $(__ogledit___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -ogledit.app/Contents/PkgInfo: ogledit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +ogledit.app/Contents/PkgInfo: ogledit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p ogledit.app/Contents mkdir -p ogledit.app/Contents/MacOS mkdir -p ogledit.app/Contents/Resources @@ -174,7 +172,6 @@ ogledit.app/Contents/PkgInfo: ogledit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f ogledit$(EXEEXT) ogledit.app/Contents/MacOS/ogledit - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc ogledit.app/Contents/Resources/ogledit.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns ogledit.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@ogledit_bundle: $(____ogledit_BUNDLE_TGT_REF_DEP) diff --git a/contrib/samples/ogl/studio/Makefile.in b/contrib/samples/ogl/studio/Makefile.in index 4791af8a50..74f6c0c5bb 100644 --- a/contrib/samples/ogl/studio/Makefile.in +++ b/contrib/samples/ogl/studio/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_HTML = @EXTRALIBS_HTML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -141,8 +140,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_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).0.r sample.r + $(srcdir)/../../../include -o studio$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -171,7 +169,7 @@ studio$(EXEEXT): $(STUDIO_OBJECTS) $(__studio___win32rc) $(__studio___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p studio.app/Contents mkdir -p studio.app/Contents/MacOS mkdir -p studio.app/Contents/Resources @@ -189,7 +187,6 @@ studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f studio$(EXEEXT) studio.app/Contents/MacOS/studio - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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) diff --git a/contrib/samples/plot/Makefile.in b/contrib/samples/plot/Makefile.in index 971bcb2730..3bae1020b9 100644 --- a/contrib/samples/plot/Makefile.in +++ b/contrib/samples/plot/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -121,8 +120,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -i \ - $(srcdir)/../../include -o plot$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(srcdir)/../../include -o plot$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +149,7 @@ plot$(EXEEXT): $(PLOT_OBJECTS) $(__plot___win32rc) $(__plot___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -plot.app/Contents/PkgInfo: plot$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +plot.app/Contents/PkgInfo: plot$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p plot.app/Contents mkdir -p plot.app/Contents/MacOS mkdir -p plot.app/Contents/Resources @@ -169,7 +167,6 @@ plot.app/Contents/PkgInfo: plot$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist ln -f plot$(EXEEXT) plot.app/Contents/MacOS/plot - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc plot.app/Contents/Resources/plot.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns plot.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@plot_bundle: $(____plot_BUNDLE_TGT_REF_DEP) diff --git a/contrib/samples/stc/Makefile.in b/contrib/samples/stc/Makefile.in index 560c6ba44d..5ff40f13eb 100644 --- a/contrib/samples/stc/Makefile.in +++ b/contrib/samples/stc/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -125,8 +124,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -i \ - $(srcdir)/../../include -o stctest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(srcdir)/../../include -o stctest$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -155,7 +153,7 @@ stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc) $(__stctest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p stctest.app/Contents mkdir -p stctest.app/Contents/MacOS mkdir -p stctest.app/Contents/Resources @@ -173,7 +171,6 @@ stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f stctest$(EXEEXT) stctest.app/Contents/MacOS/stctest - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc stctest.app/Contents/Resources/stctest.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns stctest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@stctest_bundle: $(____stctest_BUNDLE_TGT_REF_DEP) diff --git a/contrib/samples/svg/Makefile.in b/contrib/samples/svg/Makefile.in index 61ebdb0bd7..58633749c7 100644 --- a/contrib/samples/svg/Makefile.in +++ b/contrib/samples/svg/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -123,8 +122,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -i \ - $(srcdir)/../../include -o svgtest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(srcdir)/../../include -o svgtest$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -153,7 +151,7 @@ svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc) $(__svgtest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p svgtest.app/Contents mkdir -p svgtest.app/Contents/MacOS mkdir -p svgtest.app/Contents/Resources @@ -171,7 +169,6 @@ svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f svgtest$(EXEEXT) svgtest.app/Contents/MacOS/svgtest - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc svgtest.app/Contents/Resources/svgtest.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns svgtest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@svgtest_bundle: $(____svgtest_BUNDLE_TGT_REF_DEP) diff --git a/contrib/utils/convertrc/Makefile.in b/contrib/utils/convertrc/Makefile.in index d8ae86cd07..814399ff1d 100644 --- a/contrib/utils/convertrc/Makefile.in +++ b/contrib/utils/convertrc/Makefile.in @@ -30,7 +30,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_XML = @EXTRALIBS_XML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -126,8 +125,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -i \ - $(srcdir)/../../include -o convertrc$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(srcdir)/../../include -o convertrc$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### diff --git a/contrib/utils/wxrcedit/Makefile.in b/contrib/utils/wxrcedit/Makefile.in index 20545345cf..836d39f6af 100644 --- a/contrib/utils/wxrcedit/Makefile.in +++ b/contrib/utils/wxrcedit/Makefile.in @@ -30,7 +30,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_XML = @EXTRALIBS_XML@ EXTRALIBS_HTML = @EXTRALIBS_HTML@ @@ -145,8 +144,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -i \ - $(srcdir)/../../include -o wxrcedit$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(srcdir)/../../include -o wxrcedit$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in index ca78ff3ca8..a84c2bbef7 100644 --- a/demos/bombs/Makefile.in +++ b/demos/bombs/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -123,7 +122,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o bombs$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -152,7 +151,7 @@ bombs$(EXEEXT): $(BOMBS_OBJECTS) $(__bombs___win32rc) $(__bombs___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -bombs.app/Contents/PkgInfo: bombs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +bombs.app/Contents/PkgInfo: bombs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p bombs.app/Contents mkdir -p bombs.app/Contents/MacOS mkdir -p bombs.app/Contents/Resources @@ -170,7 +169,6 @@ bombs.app/Contents/PkgInfo: bombs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli ln -f bombs$(EXEEXT) bombs.app/Contents/MacOS/bombs - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc bombs.app/Contents/Resources/bombs.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns bombs.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@bombs_bundle: $(____bombs_BUNDLE_TGT_REF_DEP) diff --git a/demos/dbbrowse/Makefile.in b/demos/dbbrowse/Makefile.in index c6edac5f8f..5ade944d33 100644 --- a/demos/dbbrowse/Makefile.in +++ b/demos/dbbrowse/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_HTML = @EXTRALIBS_HTML@ EXTRALIBS_ODBC = @EXTRALIBS_ODBC@ @@ -146,7 +145,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o dbbrowse$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -175,7 +174,7 @@ distclean: clean @COND_USE_ODBC_1@ $(__dbbrowse___os2_emxbindcmd) @COND_USE_ODBC_1@ $(SAMPLES_RPATH_POSTLINK) -dbbrowse.app/Contents/PkgInfo: $(__dbbrowse___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +dbbrowse.app/Contents/PkgInfo: $(__dbbrowse___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p dbbrowse.app/Contents mkdir -p dbbrowse.app/Contents/MacOS mkdir -p dbbrowse.app/Contents/Resources @@ -193,7 +192,6 @@ dbbrowse.app/Contents/PkgInfo: $(__dbbrowse___depname) $(top_srcdir)/src/mac/car ln -f dbbrowse$(EXEEXT) dbbrowse.app/Contents/MacOS/dbbrowse - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dbbrowse.app/Contents/Resources/dbbrowse.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dbbrowse.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@dbbrowse_bundle: $(____dbbrowse_BUNDLE_TGT_REF_DEP) diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in index 40c7fc325a..4127008268 100644 --- a/demos/forty/Makefile.in +++ b/demos/forty/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_HTML = @EXTRALIBS_HTML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -137,7 +136,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o forty$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -166,7 +165,7 @@ forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc) $(__forty___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -forty.app/Contents/PkgInfo: forty$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +forty.app/Contents/PkgInfo: forty$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p forty.app/Contents mkdir -p forty.app/Contents/MacOS mkdir -p forty.app/Contents/Resources @@ -184,7 +183,6 @@ forty.app/Contents/PkgInfo: forty$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli ln -f forty$(EXEEXT) forty.app/Contents/MacOS/forty - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc forty.app/Contents/Resources/forty.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns forty.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@forty_bundle: $(____forty_BUNDLE_TGT_REF_DEP) diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in index ef5e108171..bcefe39e58 100644 --- a/demos/fractal/Makefile.in +++ b/demos/fractal/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o fractal$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc) $(__fractal___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -fractal.app/Contents/PkgInfo: fractal$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +fractal.app/Contents/PkgInfo: fractal$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p fractal.app/Contents mkdir -p fractal.app/Contents/MacOS mkdir -p fractal.app/Contents/Resources @@ -169,7 +168,6 @@ fractal.app/Contents/PkgInfo: fractal$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f fractal$(EXEEXT) fractal.app/Contents/MacOS/fractal - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fractal.app/Contents/Resources/fractal.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fractal.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@fractal_bundle: $(____fractal_BUNDLE_TGT_REF_DEP) diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in index eadeee95f5..29edfc2a53 100644 --- a/demos/life/Makefile.in +++ b/demos/life/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -123,7 +122,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o life$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -152,7 +151,7 @@ life$(EXEEXT): $(LIFE_OBJECTS) $(__life___win32rc) $(__life___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -life.app/Contents/PkgInfo: life$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +life.app/Contents/PkgInfo: life$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p life.app/Contents mkdir -p life.app/Contents/MacOS mkdir -p life.app/Contents/Resources @@ -170,7 +169,6 @@ life.app/Contents/PkgInfo: life$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist ln -f life$(EXEEXT) life.app/Contents/MacOS/life - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc life.app/Contents/Resources/life.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns life.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@life_bundle: $(____life_BUNDLE_TGT_REF_DEP) diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in index 535b5b9af6..3a1f1f75b7 100644 --- a/demos/poem/Makefile.in +++ b/demos/poem/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_HTML = @EXTRALIBS_HTML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -126,7 +125,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o wxpoem$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -155,7 +154,7 @@ wxpoem$(EXEEXT): $(WXPOEM_OBJECTS) $(__wxpoem___win32rc) $(__wxpoem___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -wxpoem.app/Contents/PkgInfo: wxpoem$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +wxpoem.app/Contents/PkgInfo: wxpoem$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p wxpoem.app/Contents mkdir -p wxpoem.app/Contents/MacOS mkdir -p wxpoem.app/Contents/Resources @@ -173,7 +172,6 @@ wxpoem.app/Contents/PkgInfo: wxpoem$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f wxpoem$(EXEEXT) wxpoem.app/Contents/MacOS/wxpoem - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc wxpoem.app/Contents/Resources/wxpoem.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns wxpoem.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@wxpoem_bundle: $(____wxpoem_BUNDLE_TGT_REF_DEP) diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in index 01315191c1..9d88a6087e 100644 --- a/samples/access/Makefile.in +++ b/samples/access/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o accesstest$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ accesstest$(EXEEXT): $(ACCESSTEST_OBJECTS) $(__accesstest___win32rc) $(__accesstest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -accesstest.app/Contents/PkgInfo: accesstest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +accesstest.app/Contents/PkgInfo: accesstest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p accesstest.app/Contents mkdir -p accesstest.app/Contents/MacOS mkdir -p accesstest.app/Contents/Resources @@ -169,7 +168,6 @@ accesstest.app/Contents/PkgInfo: accesstest$(EXEEXT) $(top_srcdir)/src/mac/carbo ln -f accesstest$(EXEEXT) accesstest.app/Contents/MacOS/accesstest - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc accesstest.app/Contents/Resources/accesstest.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns accesstest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@accesstest_bundle: $(____accesstest_BUNDLE_TGT_REF_DEP) diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in index 1f6d4b8c8e..715bb53c93 100644 --- a/samples/artprov/Makefile.in +++ b/samples/artprov/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -123,7 +122,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o arttest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -152,7 +151,7 @@ arttest$(EXEEXT): $(ARTTEST_OBJECTS) $(__arttest___win32rc) $(__arttest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -arttest.app/Contents/PkgInfo: arttest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +arttest.app/Contents/PkgInfo: arttest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p arttest.app/Contents mkdir -p arttest.app/Contents/MacOS mkdir -p arttest.app/Contents/Resources @@ -170,7 +169,6 @@ arttest.app/Contents/PkgInfo: arttest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f arttest$(EXEEXT) arttest.app/Contents/MacOS/arttest - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc arttest.app/Contents/Resources/arttest.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns arttest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@arttest_bundle: $(____arttest_BUNDLE_TGT_REF_DEP) diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in index fe5a7bc0e7..5bd6ac679e 100644 --- a/samples/calendar/Makefile.in +++ b/samples/calendar/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_SDL = @EXTRALIBS_SDL@ @@ -127,7 +126,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o calendar$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,7 +155,7 @@ calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___win32rc) $(__calendar___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -calendar.app/Contents/PkgInfo: calendar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +calendar.app/Contents/PkgInfo: calendar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p calendar.app/Contents mkdir -p calendar.app/Contents/MacOS mkdir -p calendar.app/Contents/Resources @@ -174,7 +173,6 @@ calendar.app/Contents/PkgInfo: calendar$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f calendar$(EXEEXT) calendar.app/Contents/MacOS/calendar - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc calendar.app/Contents/Resources/calendar.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns calendar.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@calendar_bundle: $(____calendar_BUNDLE_TGT_REF_DEP) diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in index cb0ae08445..b974c42f86 100644 --- a/samples/caret/Makefile.in +++ b/samples/caret/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -121,7 +120,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o caret$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -150,7 +149,7 @@ caret$(EXEEXT): $(CARET_OBJECTS) $(__caret___win32rc) $(__caret___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -caret.app/Contents/PkgInfo: caret$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +caret.app/Contents/PkgInfo: caret$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p caret.app/Contents mkdir -p caret.app/Contents/MacOS mkdir -p caret.app/Contents/Resources @@ -168,7 +167,6 @@ caret.app/Contents/PkgInfo: caret$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli ln -f caret$(EXEEXT) caret.app/Contents/MacOS/caret - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc caret.app/Contents/Resources/caret.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns caret.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@caret_bundle: $(____caret_BUNDLE_TGT_REF_DEP) diff --git a/samples/checklst/Makefile.in b/samples/checklst/Makefile.in index e006ff332c..ae25a73f54 100644 --- a/samples/checklst/Makefile.in +++ b/samples/checklst/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o checklst$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ checklst$(EXEEXT): $(CHECKLST_OBJECTS) $(__checklst___win32rc) $(__checklst___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -checklst.app/Contents/PkgInfo: checklst$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +checklst.app/Contents/PkgInfo: checklst$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p checklst.app/Contents mkdir -p checklst.app/Contents/MacOS mkdir -p checklst.app/Contents/Resources @@ -169,7 +168,6 @@ checklst.app/Contents/PkgInfo: checklst$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f checklst$(EXEEXT) checklst.app/Contents/MacOS/checklst - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc checklst.app/Contents/Resources/checklst.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns checklst.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@checklst_bundle: $(____checklst_BUNDLE_TGT_REF_DEP) diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in index 9ea038dde0..4dcf0c0dbd 100644 --- a/samples/config/Makefile.in +++ b/samples/config/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o conftest$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc) $(__conftest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -conftest.app/Contents/PkgInfo: conftest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +conftest.app/Contents/PkgInfo: conftest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p conftest.app/Contents mkdir -p conftest.app/Contents/MacOS mkdir -p conftest.app/Contents/Resources @@ -169,7 +168,6 @@ conftest.app/Contents/PkgInfo: conftest$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f conftest$(EXEEXT) conftest.app/Contents/MacOS/conftest - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc conftest.app/Contents/Resources/conftest.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns conftest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@conftest_bundle: $(____conftest_BUNDLE_TGT_REF_DEP) diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in index 756c4ffac1..a645b92659 100644 --- a/samples/controls/Makefile.in +++ b/samples/controls/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o controls$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ controls$(EXEEXT): $(CONTROLS_OBJECTS) $(__controls___win32rc) $(__controls___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -controls.app/Contents/PkgInfo: controls$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +controls.app/Contents/PkgInfo: controls$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p controls.app/Contents mkdir -p controls.app/Contents/MacOS mkdir -p controls.app/Contents/Resources @@ -169,7 +168,6 @@ controls.app/Contents/PkgInfo: controls$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f controls$(EXEEXT) controls.app/Contents/MacOS/controls - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc controls.app/Contents/Resources/controls.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns controls.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@controls_bundle: $(____controls_BUNDLE_TGT_REF_DEP) diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in index 44ccd21d59..3021c18a57 100644 --- a/samples/db/Makefile.in +++ b/samples/db/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_ODBC = @EXTRALIBS_ODBC@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -136,7 +135,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o dbtest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -165,7 +164,7 @@ distclean: clean @COND_USE_ODBC_1@ $(__dbtest___os2_emxbindcmd) @COND_USE_ODBC_1@ $(SAMPLES_RPATH_POSTLINK) -dbtest.app/Contents/PkgInfo: $(__dbtest___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +dbtest.app/Contents/PkgInfo: $(__dbtest___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p dbtest.app/Contents mkdir -p dbtest.app/Contents/MacOS mkdir -p dbtest.app/Contents/Resources @@ -183,7 +182,6 @@ dbtest.app/Contents/PkgInfo: $(__dbtest___depname) $(top_srcdir)/src/mac/carbon/ ln -f dbtest$(EXEEXT) dbtest.app/Contents/MacOS/dbtest - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dbtest.app/Contents/Resources/dbtest.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dbtest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@dbtest_bundle: $(____dbtest_BUNDLE_TGT_REF_DEP) diff --git a/samples/debugrpt/Makefile.in b/samples/debugrpt/Makefile.in index 29131e97b8..7d212af48b 100644 --- a/samples/debugrpt/Makefile.in +++ b/samples/debugrpt/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_XML = @EXTRALIBS_XML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -129,7 +128,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o debugrpt$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -158,7 +157,7 @@ debugrpt$(EXEEXT): $(DEBUGRPT_OBJECTS) $(__debugrpt___win32rc) $(__debugrpt___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -debugrpt.app/Contents/PkgInfo: debugrpt$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +debugrpt.app/Contents/PkgInfo: debugrpt$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p debugrpt.app/Contents mkdir -p debugrpt.app/Contents/MacOS mkdir -p debugrpt.app/Contents/Resources @@ -176,7 +175,6 @@ debugrpt.app/Contents/PkgInfo: debugrpt$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f debugrpt$(EXEEXT) debugrpt.app/Contents/MacOS/debugrpt - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc debugrpt.app/Contents/Resources/debugrpt.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns debugrpt.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@debugrpt_bundle: $(____debugrpt_BUNDLE_TGT_REF_DEP) diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index 64dd55cb79..8bf54310f6 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_SDL = @EXTRALIBS_SDL@ @@ -136,7 +135,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o dialogs$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -165,7 +164,7 @@ dialogs$(EXEEXT): $(DIALOGS_OBJECTS) $(__dialogs___win32rc) $(__dialogs___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -dialogs.app/Contents/PkgInfo: dialogs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +dialogs.app/Contents/PkgInfo: dialogs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p dialogs.app/Contents mkdir -p dialogs.app/Contents/MacOS mkdir -p dialogs.app/Contents/Resources @@ -183,7 +182,6 @@ dialogs.app/Contents/PkgInfo: dialogs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f dialogs$(EXEEXT) dialogs.app/Contents/MacOS/dialogs - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dialogs.app/Contents/Resources/dialogs.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dialogs.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@dialogs_bundle: $(____dialogs_BUNDLE_TGT_REF_DEP) diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in index 3da1ec5d38..cd2c2ab246 100644 --- a/samples/dialup/Makefile.in +++ b/samples/dialup/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o nettest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc) $(__nettest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -nettest.app/Contents/PkgInfo: nettest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +nettest.app/Contents/PkgInfo: nettest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p nettest.app/Contents mkdir -p nettest.app/Contents/MacOS mkdir -p nettest.app/Contents/Resources @@ -169,7 +168,6 @@ nettest.app/Contents/PkgInfo: nettest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f nettest$(EXEEXT) nettest.app/Contents/MacOS/nettest - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc nettest.app/Contents/Resources/nettest.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns nettest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@nettest_bundle: $(____nettest_BUNDLE_TGT_REF_DEP) diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in index 900220afc5..2c142985e3 100644 --- a/samples/display/Makefile.in +++ b/samples/display/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o display$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ display$(EXEEXT): $(DISPLAY_OBJECTS) $(__display___win32rc) $(__display___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -display.app/Contents/PkgInfo: display$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +display.app/Contents/PkgInfo: display$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p display.app/Contents mkdir -p display.app/Contents/MacOS mkdir -p display.app/Contents/Resources @@ -169,7 +168,6 @@ display.app/Contents/PkgInfo: display$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f display$(EXEEXT) display.app/Contents/MacOS/display - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc display.app/Contents/Resources/display.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns display.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@display_bundle: $(____display_BUNDLE_TGT_REF_DEP) diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in index df4db2083c..cb6401d9f7 100644 --- a/samples/dnd/Makefile.in +++ b/samples/dnd/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -36,8 +35,8 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ ### Variables: ### DESTDIR = -WX_RELEASE = 2.5 -WX_VERSION = $(WX_RELEASE).5 +WX_RELEASE = 2.6 +WX_VERSION = $(WX_RELEASE).0 LIBDIRNAME = $(top_builddir)lib DND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ @@ -119,7 +118,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o dnd$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -148,7 +147,7 @@ dnd$(EXEEXT): $(DND_OBJECTS) $(__dnd___win32rc) $(__dnd___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -dnd.app/Contents/PkgInfo: dnd$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +dnd.app/Contents/PkgInfo: dnd$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p dnd.app/Contents mkdir -p dnd.app/Contents/MacOS mkdir -p dnd.app/Contents/Resources @@ -166,7 +165,6 @@ dnd.app/Contents/PkgInfo: dnd$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.i ln -f dnd$(EXEEXT) dnd.app/Contents/MacOS/dnd - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc dnd.app/Contents/Resources/dnd.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dnd.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@dnd_bundle: $(____dnd_BUNDLE_TGT_REF_DEP) diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in index 6e586e2bf5..14c5f3d23e 100644 --- a/samples/docview/Makefile.in +++ b/samples/docview/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -64,8 +63,7 @@ DOCVIEW_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r \ -@COND_TOOLKIT_MAC@ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r sample.r @COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C docview$(EXEEXT) COND_PLATFORM_MAC_1___docview___mac_rezcmd = $(RESCOMP) -d __DARWIN__ -t APPL -d \ @@ -154,7 +152,7 @@ docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc) $(__docview___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -docview.app/Contents/PkgInfo: docview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +docview.app/Contents/PkgInfo: docview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p docview.app/Contents mkdir -p docview.app/Contents/MacOS mkdir -p docview.app/Contents/Resources @@ -172,7 +170,6 @@ docview.app/Contents/PkgInfo: docview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f docview$(EXEEXT) docview.app/Contents/MacOS/docview - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc docview.app/Contents/Resources/docview.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns docview.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@docview_bundle: $(____docview_BUNDLE_TGT_REF_DEP) diff --git a/samples/docvwmdi/Makefile.in b/samples/docvwmdi/Makefile.in index da98e995c9..36749fca19 100644 --- a/samples/docvwmdi/Makefile.in +++ b/samples/docvwmdi/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -124,7 +123,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o docview$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -153,7 +152,7 @@ docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc) $(__docview___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -docview.app/Contents/PkgInfo: docview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +docview.app/Contents/PkgInfo: docview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p docview.app/Contents mkdir -p docview.app/Contents/MacOS mkdir -p docview.app/Contents/Resources @@ -171,7 +170,6 @@ docview.app/Contents/PkgInfo: docview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f docview$(EXEEXT) docview.app/Contents/MacOS/docview - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc docview.app/Contents/Resources/docview.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns docview.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@docview_bundle: $(____docview_BUNDLE_TGT_REF_DEP) diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in index 462ac4ffd2..09271f6686 100644 --- a/samples/dragimag/Makefile.in +++ b/samples/dragimag/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o dragimag$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ dragimag$(EXEEXT): $(DRAGIMAG_OBJECTS) $(__dragimag___win32rc) $(__dragimag___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -dragimag.app/Contents/PkgInfo: dragimag$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +dragimag.app/Contents/PkgInfo: dragimag$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p dragimag.app/Contents mkdir -p dragimag.app/Contents/MacOS mkdir -p dragimag.app/Contents/Resources @@ -169,7 +168,6 @@ dragimag.app/Contents/PkgInfo: dragimag$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f dragimag$(EXEEXT) dragimag.app/Contents/MacOS/dragimag - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dragimag.app/Contents/Resources/dragimag.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dragimag.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@dragimag_bundle: $(____dragimag_BUNDLE_TGT_REF_DEP) diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in index 5d4efea5a4..490ff6ae8b 100644 --- a/samples/drawing/Makefile.in +++ b/samples/drawing/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o drawing$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ drawing$(EXEEXT): $(DRAWING_OBJECTS) $(__drawing___win32rc) $(__drawing___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -drawing.app/Contents/PkgInfo: drawing$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +drawing.app/Contents/PkgInfo: drawing$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p drawing.app/Contents mkdir -p drawing.app/Contents/MacOS mkdir -p drawing.app/Contents/Resources @@ -169,7 +168,6 @@ drawing.app/Contents/PkgInfo: drawing$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f drawing$(EXEEXT) drawing.app/Contents/MacOS/drawing - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc drawing.app/Contents/Resources/drawing.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns drawing.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@drawing_bundle: $(____drawing_BUNDLE_TGT_REF_DEP) diff --git a/samples/dynamic/Makefile.in b/samples/dynamic/Makefile.in index 890dcfff83..1e0314d178 100644 --- a/samples/dynamic/Makefile.in +++ b/samples/dynamic/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o dynamic$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ dynamic$(EXEEXT): $(DYNAMIC_OBJECTS) $(__dynamic___win32rc) $(__dynamic___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -dynamic.app/Contents/PkgInfo: dynamic$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +dynamic.app/Contents/PkgInfo: dynamic$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p dynamic.app/Contents mkdir -p dynamic.app/Contents/MacOS mkdir -p dynamic.app/Contents/Resources @@ -169,7 +168,6 @@ dynamic.app/Contents/PkgInfo: dynamic$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f dynamic$(EXEEXT) dynamic.app/Contents/MacOS/dynamic - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dynamic.app/Contents/Resources/dynamic.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dynamic.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@dynamic_bundle: $(____dynamic_BUNDLE_TGT_REF_DEP) diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in index 017e238271..c44b112816 100644 --- a/samples/erase/Makefile.in +++ b/samples/erase/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -121,7 +120,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o erase$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -150,7 +149,7 @@ erase$(EXEEXT): $(ERASE_OBJECTS) $(__erase___win32rc) $(__erase___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -erase.app/Contents/PkgInfo: erase$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +erase.app/Contents/PkgInfo: erase$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p erase.app/Contents mkdir -p erase.app/Contents/MacOS mkdir -p erase.app/Contents/Resources @@ -168,7 +167,6 @@ erase.app/Contents/PkgInfo: erase$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli ln -f erase$(EXEEXT) erase.app/Contents/MacOS/erase - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc erase.app/Contents/Resources/erase.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns erase.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@erase_bundle: $(____erase_BUNDLE_TGT_REF_DEP) diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in index 8f0432e12b..548142d348 100644 --- a/samples/event/Makefile.in +++ b/samples/event/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -121,7 +120,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o event$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -150,7 +149,7 @@ event$(EXEEXT): $(EVENT_OBJECTS) $(__event___win32rc) $(__event___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -event.app/Contents/PkgInfo: event$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +event.app/Contents/PkgInfo: event$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p event.app/Contents mkdir -p event.app/Contents/MacOS mkdir -p event.app/Contents/Resources @@ -168,7 +167,6 @@ event.app/Contents/PkgInfo: event$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli ln -f event$(EXEEXT) event.app/Contents/MacOS/event - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc event.app/Contents/Resources/event.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns event.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@event_bundle: $(____event_BUNDLE_TGT_REF_DEP) diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in index 64b16df71b..de3b62ede6 100644 --- a/samples/except/Makefile.in +++ b/samples/except/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o except$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ except$(EXEEXT): $(EXCEPT_OBJECTS) $(__except___win32rc) $(__except___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -except.app/Contents/PkgInfo: except$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +except.app/Contents/PkgInfo: except$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p except.app/Contents mkdir -p except.app/Contents/MacOS mkdir -p except.app/Contents/Resources @@ -169,7 +168,6 @@ except.app/Contents/PkgInfo: except$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f except$(EXEEXT) except.app/Contents/MacOS/except - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc except.app/Contents/Resources/except.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns except.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@except_bundle: $(____except_BUNDLE_TGT_REF_DEP) diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in index 5a11d5291f..84000dc638 100644 --- a/samples/exec/Makefile.in +++ b/samples/exec/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -120,7 +119,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o exec$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -149,7 +148,7 @@ exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc) $(__exec___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -exec.app/Contents/PkgInfo: exec$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +exec.app/Contents/PkgInfo: exec$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p exec.app/Contents mkdir -p exec.app/Contents/MacOS mkdir -p exec.app/Contents/Resources @@ -167,7 +166,6 @@ exec.app/Contents/PkgInfo: exec$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist ln -f exec$(EXEEXT) exec.app/Contents/MacOS/exec - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc exec.app/Contents/Resources/exec.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns exec.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@exec_bundle: $(____exec_BUNDLE_TGT_REF_DEP) diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in index 5c711566f6..bc586a0cfb 100644 --- a/samples/font/Makefile.in +++ b/samples/font/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -120,7 +119,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o font$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -149,7 +148,7 @@ font$(EXEEXT): $(FONT_OBJECTS) $(__font___win32rc) $(__font___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -font.app/Contents/PkgInfo: font$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +font.app/Contents/PkgInfo: font$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p font.app/Contents mkdir -p font.app/Contents/MacOS mkdir -p font.app/Contents/Resources @@ -167,7 +166,6 @@ font.app/Contents/PkgInfo: font$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist ln -f font$(EXEEXT) font.app/Contents/MacOS/font - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc font.app/Contents/Resources/font.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns font.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@font_bundle: $(____font_BUNDLE_TGT_REF_DEP) diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in index af6292fb0a..42be3384fb 100644 --- a/samples/grid/Makefile.in +++ b/samples/grid/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_SDL = @EXTRALIBS_SDL@ @@ -125,7 +124,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o grid$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -154,7 +153,7 @@ grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc) $(__grid___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -grid.app/Contents/PkgInfo: grid$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +grid.app/Contents/PkgInfo: grid$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p grid.app/Contents mkdir -p grid.app/Contents/MacOS mkdir -p grid.app/Contents/Resources @@ -172,7 +171,6 @@ grid.app/Contents/PkgInfo: grid$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist ln -f grid$(EXEEXT) grid.app/Contents/MacOS/grid - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc grid.app/Contents/Resources/grid.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns grid.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@grid_bundle: $(____grid_BUNDLE_TGT_REF_DEP) diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in index f150d2a3b9..376d087a05 100644 --- a/samples/help/Makefile.in +++ b/samples/help/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_HTML = @EXTRALIBS_HTML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -124,7 +123,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o help$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -153,7 +152,7 @@ help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc) $(__help___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p help.app/Contents mkdir -p help.app/Contents/MacOS mkdir -p help.app/Contents/Resources @@ -171,7 +170,6 @@ help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist ln -f help$(EXEEXT) help.app/Contents/MacOS/help - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc help.app/Contents/Resources/help.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns help.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@help_bundle: $(____help_BUNDLE_TGT_REF_DEP) diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in index f062b772f0..8c1a66cd97 100644 --- a/samples/htlbox/Makefile.in +++ b/samples/htlbox/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_HTML = @EXTRALIBS_HTML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -126,7 +125,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o htlbox$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -155,7 +154,7 @@ htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc) $(__htlbox___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p htlbox.app/Contents mkdir -p htlbox.app/Contents/MacOS mkdir -p htlbox.app/Contents/Resources @@ -173,7 +172,6 @@ htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f htlbox$(EXEEXT) htlbox.app/Contents/MacOS/htlbox - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc htlbox.app/Contents/Resources/htlbox.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns htlbox.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@htlbox_bundle: $(____htlbox_BUNDLE_TGT_REF_DEP) diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in index 75ece766ca..a26d08cdea 100644 --- a/samples/html/about/Makefile.in +++ b/samples/html/about/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_HTML = @EXTRALIBS_HTML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -126,7 +125,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -o about$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -155,7 +154,7 @@ about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc) $(__about___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -about.app/Contents/PkgInfo: about$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +about.app/Contents/PkgInfo: about$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p about.app/Contents mkdir -p about.app/Contents/MacOS mkdir -p about.app/Contents/Resources @@ -173,7 +172,6 @@ about.app/Contents/PkgInfo: about$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli ln -f about$(EXEEXT) about.app/Contents/MacOS/about - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc about.app/Contents/Resources/about.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns about.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@about_bundle: $(____about_BUNDLE_TGT_REF_DEP) diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in index b202858e7a..10200b23a7 100644 --- a/samples/html/help/Makefile.in +++ b/samples/html/help/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_HTML = @EXTRALIBS_HTML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -125,7 +124,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -o help$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -154,7 +153,7 @@ help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc) $(__help___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p help.app/Contents mkdir -p help.app/Contents/MacOS mkdir -p help.app/Contents/Resources @@ -172,7 +171,6 @@ help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist ln -f help$(EXEEXT) help.app/Contents/MacOS/help - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc help.app/Contents/Resources/help.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns help.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@help_bundle: $(____help_BUNDLE_TGT_REF_DEP) diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in index 227c1561c3..3edd865e38 100644 --- a/samples/html/helpview/Makefile.in +++ b/samples/html/helpview/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_HTML = @EXTRALIBS_HTML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -127,7 +126,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -o helpview$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,7 +155,7 @@ helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc) $(__helpview___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -helpview.app/Contents/PkgInfo: helpview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +helpview.app/Contents/PkgInfo: helpview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p helpview.app/Contents mkdir -p helpview.app/Contents/MacOS mkdir -p helpview.app/Contents/Resources @@ -174,7 +173,6 @@ helpview.app/Contents/PkgInfo: helpview$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f helpview$(EXEEXT) helpview.app/Contents/MacOS/helpview - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc helpview.app/Contents/Resources/helpview.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns helpview.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@helpview_bundle: $(____helpview_BUNDLE_TGT_REF_DEP) diff --git a/samples/html/htmlctrl/Makefile.in b/samples/html/htmlctrl/Makefile.in index 2fff39270b..03c9c021bf 100644 --- a/samples/html/htmlctrl/Makefile.in +++ b/samples/html/htmlctrl/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -123,7 +122,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -o htmlctrl$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -152,7 +151,7 @@ htmlctrl$(EXEEXT): $(HTMLCTRL_OBJECTS) $(__htmlctrl___win32rc) $(__htmlctrl___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -htmlctrl.app/Contents/PkgInfo: htmlctrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +htmlctrl.app/Contents/PkgInfo: htmlctrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p htmlctrl.app/Contents mkdir -p htmlctrl.app/Contents/MacOS mkdir -p htmlctrl.app/Contents/Resources @@ -170,7 +169,6 @@ htmlctrl.app/Contents/PkgInfo: htmlctrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f htmlctrl$(EXEEXT) htmlctrl.app/Contents/MacOS/htmlctrl - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc htmlctrl.app/Contents/Resources/htmlctrl.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns htmlctrl.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@htmlctrl_bundle: $(____htmlctrl_BUNDLE_TGT_REF_DEP) diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in index 4c44215697..dbcd25dbf6 100644 --- a/samples/html/printing/Makefile.in +++ b/samples/html/printing/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_HTML = @EXTRALIBS_HTML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -127,7 +126,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -o printing$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,7 +155,7 @@ printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc) $(__printing___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p printing.app/Contents mkdir -p printing.app/Contents/MacOS mkdir -p printing.app/Contents/Resources @@ -174,7 +173,6 @@ printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f printing$(EXEEXT) printing.app/Contents/MacOS/printing - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc printing.app/Contents/Resources/printing.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns printing.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@printing_bundle: $(____printing_BUNDLE_TGT_REF_DEP) diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in index 55b053a4ee..e1be7a303a 100644 --- a/samples/html/test/Makefile.in +++ b/samples/html/test/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_HTML = @EXTRALIBS_HTML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -128,7 +127,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -o test$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -157,7 +156,7 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc) $(__test___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p test.app/Contents mkdir -p test.app/Contents/MacOS mkdir -p test.app/Contents/Resources @@ -175,7 +174,6 @@ test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist ln -f test$(EXEEXT) test.app/Contents/MacOS/test - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc test.app/Contents/Resources/test.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns test.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@test_bundle: $(____test_BUNDLE_TGT_REF_DEP) diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in index 9e925e3245..abb722fa7c 100644 --- a/samples/html/virtual/Makefile.in +++ b/samples/html/virtual/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_HTML = @EXTRALIBS_HTML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -127,7 +126,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -o virtual$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,7 +155,7 @@ virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc) $(__virtual___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -virtual.app/Contents/PkgInfo: virtual$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +virtual.app/Contents/PkgInfo: virtual$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p virtual.app/Contents mkdir -p virtual.app/Contents/MacOS mkdir -p virtual.app/Contents/Resources @@ -174,7 +173,6 @@ virtual.app/Contents/PkgInfo: virtual$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f virtual$(EXEEXT) virtual.app/Contents/MacOS/virtual - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc virtual.app/Contents/Resources/virtual.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns virtual.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@virtual_bundle: $(____virtual_BUNDLE_TGT_REF_DEP) diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in index c1daa800ea..7daedf8fa3 100644 --- a/samples/html/widget/Makefile.in +++ b/samples/html/widget/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_HTML = @EXTRALIBS_HTML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -127,7 +126,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -o widget$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,7 +155,7 @@ widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc) $(__widget___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -widget.app/Contents/PkgInfo: widget$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +widget.app/Contents/PkgInfo: widget$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p widget.app/Contents mkdir -p widget.app/Contents/MacOS mkdir -p widget.app/Contents/Resources @@ -174,7 +173,6 @@ widget.app/Contents/PkgInfo: widget$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f widget$(EXEEXT) widget.app/Contents/MacOS/widget - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc widget.app/Contents/Resources/widget.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns widget.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@widget_bundle: $(____widget_BUNDLE_TGT_REF_DEP) diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in index b2c38c2e36..41e5ada8c7 100644 --- a/samples/html/zip/Makefile.in +++ b/samples/html/zip/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_HTML = @EXTRALIBS_HTML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -124,7 +123,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -o zip$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -153,7 +152,7 @@ zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc) $(__zip___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -zip.app/Contents/PkgInfo: zip$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +zip.app/Contents/PkgInfo: zip$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p zip.app/Contents mkdir -p zip.app/Contents/MacOS mkdir -p zip.app/Contents/Resources @@ -171,7 +170,6 @@ zip.app/Contents/PkgInfo: zip$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.i ln -f zip$(EXEEXT) zip.app/Contents/MacOS/zip - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc zip.app/Contents/Resources/zip.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns zip.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@zip_bundle: $(____zip_BUNDLE_TGT_REF_DEP) diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in index 301120a198..0b85ec54de 100644 --- a/samples/image/Makefile.in +++ b/samples/image/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -121,7 +120,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o image$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -150,7 +149,7 @@ image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc) $(__image___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p image.app/Contents mkdir -p image.app/Contents/MacOS mkdir -p image.app/Contents/Resources @@ -168,7 +167,6 @@ image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli ln -f image$(EXEEXT) image.app/Contents/MacOS/image - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc image.app/Contents/Resources/image.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns image.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@image_bundle: $(____image_BUNDLE_TGT_REF_DEP) diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in index ec6ba533da..079b6d5837 100644 --- a/samples/internat/Makefile.in +++ b/samples/internat/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o internat$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc) $(__internat___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p internat.app/Contents mkdir -p internat.app/Contents/MacOS mkdir -p internat.app/Contents/Resources @@ -169,7 +168,6 @@ internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f internat$(EXEEXT) internat.app/Contents/MacOS/internat - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc internat.app/Contents/Resources/internat.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns internat.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@internat_bundle: $(____internat_BUNDLE_TGT_REF_DEP) diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in index 63efc04453..6806114ca9 100644 --- a/samples/ipc/Makefile.in +++ b/samples/ipc/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -97,13 +96,13 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) \ $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_0) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o client$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_2 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) \ $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_0) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o server$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_3 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = -d __WXUNIVERSAL__ @@ -180,7 +179,7 @@ client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc) $(__client___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p client.app/Contents mkdir -p client.app/Contents/MacOS mkdir -p client.app/Contents/Resources @@ -198,7 +197,6 @@ client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f client$(EXEEXT) client.app/Contents/MacOS/client - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc client.app/Contents/Resources/client.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns client.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@client_bundle: $(____client_BUNDLE_TGT_REF_DEP) @@ -210,7 +208,7 @@ server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc) $(__server___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p server.app/Contents mkdir -p server.app/Contents/MacOS mkdir -p server.app/Contents/Resources @@ -228,7 +226,6 @@ server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f server$(EXEEXT) server.app/Contents/MacOS/server - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc server.app/Contents/Resources/server.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns server.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@server_bundle: $(____server_BUNDLE_TGT_REF_DEP) diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in index f5719b3a63..6f6f367429 100644 --- a/samples/joytest/Makefile.in +++ b/samples/joytest/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_SDL = @EXTRALIBS_SDL@ @@ -127,7 +126,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o joytest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,7 +155,7 @@ joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc) $(__joytest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p joytest.app/Contents mkdir -p joytest.app/Contents/MacOS mkdir -p joytest.app/Contents/Resources @@ -174,7 +173,6 @@ joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f joytest$(EXEEXT) joytest.app/Contents/MacOS/joytest - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc joytest.app/Contents/Resources/joytest.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns joytest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@joytest_bundle: $(____joytest_BUNDLE_TGT_REF_DEP) diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in index 9422bf11d0..13fb7009e9 100644 --- a/samples/keyboard/Makefile.in +++ b/samples/keyboard/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o keyboard$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc) $(__keyboard___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p keyboard.app/Contents mkdir -p keyboard.app/Contents/MacOS mkdir -p keyboard.app/Contents/Resources @@ -169,7 +168,6 @@ keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f keyboard$(EXEEXT) keyboard.app/Contents/MacOS/keyboard - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc keyboard.app/Contents/Resources/keyboard.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns keyboard.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@keyboard_bundle: $(____keyboard_BUNDLE_TGT_REF_DEP) diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in index 460fab7f08..364d6a2306 100644 --- a/samples/layout/Makefile.in +++ b/samples/layout/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o layout$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc) $(__layout___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -layout.app/Contents/PkgInfo: layout$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +layout.app/Contents/PkgInfo: layout$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p layout.app/Contents mkdir -p layout.app/Contents/MacOS mkdir -p layout.app/Contents/Resources @@ -169,7 +168,6 @@ layout.app/Contents/PkgInfo: layout$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f layout$(EXEEXT) layout.app/Contents/MacOS/layout - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc layout.app/Contents/Resources/layout.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns layout.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@layout_bundle: $(____layout_BUNDLE_TGT_REF_DEP) diff --git a/samples/listbox/Makefile.in b/samples/listbox/Makefile.in index 87b25a45e7..6414c7216c 100644 --- a/samples/listbox/Makefile.in +++ b/samples/listbox/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o listbox$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ listbox$(EXEEXT): $(LISTBOX_OBJECTS) $(__listbox___win32rc) $(__listbox___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -listbox.app/Contents/PkgInfo: listbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +listbox.app/Contents/PkgInfo: listbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p listbox.app/Contents mkdir -p listbox.app/Contents/MacOS mkdir -p listbox.app/Contents/Resources @@ -169,7 +168,6 @@ listbox.app/Contents/PkgInfo: listbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f listbox$(EXEEXT) listbox.app/Contents/MacOS/listbox - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc listbox.app/Contents/Resources/listbox.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns listbox.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@listbox_bundle: $(____listbox_BUNDLE_TGT_REF_DEP) diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in index 75e0ce6b70..80f8437b58 100644 --- a/samples/listctrl/Makefile.in +++ b/samples/listctrl/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o listctrl$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ listctrl$(EXEEXT): $(LISTCTRL_OBJECTS) $(__listctrl___win32rc) $(__listctrl___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -listctrl.app/Contents/PkgInfo: listctrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +listctrl.app/Contents/PkgInfo: listctrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p listctrl.app/Contents mkdir -p listctrl.app/Contents/MacOS mkdir -p listctrl.app/Contents/Resources @@ -169,7 +168,6 @@ listctrl.app/Contents/PkgInfo: listctrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f listctrl$(EXEEXT) listctrl.app/Contents/MacOS/listctrl - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc listctrl.app/Contents/Resources/listctrl.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns listctrl.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@listctrl_bundle: $(____listctrl_BUNDLE_TGT_REF_DEP) diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in index c861cd3902..8abc645e11 100644 --- a/samples/mdi/Makefile.in +++ b/samples/mdi/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -119,7 +118,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o mdi$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -148,7 +147,7 @@ mdi$(EXEEXT): $(MDI_OBJECTS) $(__mdi___win32rc) $(__mdi___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -mdi.app/Contents/PkgInfo: mdi$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +mdi.app/Contents/PkgInfo: mdi$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p mdi.app/Contents mkdir -p mdi.app/Contents/MacOS mkdir -p mdi.app/Contents/Resources @@ -166,7 +165,6 @@ mdi.app/Contents/PkgInfo: mdi$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.i ln -f mdi$(EXEEXT) mdi.app/Contents/MacOS/mdi - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc mdi.app/Contents/Resources/mdi.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mdi.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@mdi_bundle: $(____mdi_BUNDLE_TGT_REF_DEP) diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in index 93e7364d24..25f852c1b4 100644 --- a/samples/mediaplayer/Makefile.in +++ b/samples/mediaplayer/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -126,7 +125,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o mediaplayer$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -155,7 +154,7 @@ mediaplayer$(EXEEXT): $(MEDIAPLAYER_OBJECTS) $(__mediaplayer___win32rc) $(__mediaplayer___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -mediaplayer.app/Contents/PkgInfo: mediaplayer$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +mediaplayer.app/Contents/PkgInfo: mediaplayer$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p mediaplayer.app/Contents mkdir -p mediaplayer.app/Contents/MacOS mkdir -p mediaplayer.app/Contents/Resources @@ -173,7 +172,6 @@ mediaplayer.app/Contents/PkgInfo: mediaplayer$(EXEEXT) $(top_srcdir)/src/mac/car ln -f mediaplayer$(EXEEXT) mediaplayer.app/Contents/MacOS/mediaplayer - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc mediaplayer.app/Contents/Resources/mediaplayer.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mediaplayer.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@mediaplayer_bundle: $(____mediaplayer_BUNDLE_TGT_REF_DEP) diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in index 37f8582ba6..a6ee93762b 100644 --- a/samples/memcheck/Makefile.in +++ b/samples/memcheck/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o memcheck$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ memcheck$(EXEEXT): $(MEMCHECK_OBJECTS) $(__memcheck___win32rc) $(__memcheck___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -memcheck.app/Contents/PkgInfo: memcheck$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +memcheck.app/Contents/PkgInfo: memcheck$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p memcheck.app/Contents mkdir -p memcheck.app/Contents/MacOS mkdir -p memcheck.app/Contents/Resources @@ -169,7 +168,6 @@ memcheck.app/Contents/PkgInfo: memcheck$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f memcheck$(EXEEXT) memcheck.app/Contents/MacOS/memcheck - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc memcheck.app/Contents/Resources/memcheck.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns memcheck.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@memcheck_bundle: $(____memcheck_BUNDLE_TGT_REF_DEP) diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in index 74c5c98717..dc9c61759a 100644 --- a/samples/menu/Makefile.in +++ b/samples/menu/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -120,7 +119,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o menu$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -149,7 +148,7 @@ menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc) $(__menu___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -menu.app/Contents/PkgInfo: menu$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +menu.app/Contents/PkgInfo: menu$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p menu.app/Contents mkdir -p menu.app/Contents/MacOS mkdir -p menu.app/Contents/Resources @@ -167,7 +166,6 @@ menu.app/Contents/PkgInfo: menu$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist ln -f menu$(EXEEXT) menu.app/Contents/MacOS/menu - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc menu.app/Contents/Resources/menu.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns menu.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@menu_bundle: $(____menu_BUNDLE_TGT_REF_DEP) diff --git a/samples/mfc/Makefile.in b/samples/mfc/Makefile.in index c3848dcbff..21f1c6533b 100644 --- a/samples/mfc/Makefile.in +++ b/samples/mfc/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o mfctest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ mfctest$(EXEEXT): $(MFCTEST_OBJECTS) $(__mfctest___win32rc) $(__mfctest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -mfctest.app/Contents/PkgInfo: mfctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +mfctest.app/Contents/PkgInfo: mfctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p mfctest.app/Contents mkdir -p mfctest.app/Contents/MacOS mkdir -p mfctest.app/Contents/Resources @@ -169,7 +168,6 @@ mfctest.app/Contents/PkgInfo: mfctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f mfctest$(EXEEXT) mfctest.app/Contents/MacOS/mfctest - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc mfctest.app/Contents/Resources/mfctest.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mfctest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@mfctest_bundle: $(____mfctest_BUNDLE_TGT_REF_DEP) diff --git a/samples/minifram/Makefile.in b/samples/minifram/Makefile.in index ed3e1b5e82..c97ed48380 100644 --- a/samples/minifram/Makefile.in +++ b/samples/minifram/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o minifram$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ minifram$(EXEEXT): $(MINIFRAM_OBJECTS) $(__minifram___win32rc) $(__minifram___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -minifram.app/Contents/PkgInfo: minifram$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +minifram.app/Contents/PkgInfo: minifram$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p minifram.app/Contents mkdir -p minifram.app/Contents/MacOS mkdir -p minifram.app/Contents/Resources @@ -169,7 +168,6 @@ minifram.app/Contents/PkgInfo: minifram$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f minifram$(EXEEXT) minifram.app/Contents/MacOS/minifram - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc minifram.app/Contents/Resources/minifram.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns minifram.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@minifram_bundle: $(____minifram_BUNDLE_TGT_REF_DEP) diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in index f43fada8ff..8d9861ed36 100644 --- a/samples/minimal/Makefile.in +++ b/samples/minimal/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o minimal$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc) $(__minimal___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -minimal.app/Contents/PkgInfo: minimal$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +minimal.app/Contents/PkgInfo: minimal$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p minimal.app/Contents mkdir -p minimal.app/Contents/MacOS mkdir -p minimal.app/Contents/Resources @@ -169,7 +168,6 @@ minimal.app/Contents/PkgInfo: minimal$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f minimal$(EXEEXT) minimal.app/Contents/MacOS/minimal - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc minimal.app/Contents/Resources/minimal.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns minimal.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@minimal_bundle: $(____minimal_BUNDLE_TGT_REF_DEP) diff --git a/samples/mobile/styles/Makefile.in b/samples/mobile/styles/Makefile.in index 7f3971dcc4..c6341260d7 100644 --- a/samples/mobile/styles/Makefile.in +++ b/samples/mobile/styles/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -123,7 +122,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -o styles$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -152,7 +151,7 @@ styles$(EXEEXT): $(STYLES_OBJECTS) $(__styles___win32rc) $(__styles___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -styles.app/Contents/PkgInfo: styles$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +styles.app/Contents/PkgInfo: styles$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p styles.app/Contents mkdir -p styles.app/Contents/MacOS mkdir -p styles.app/Contents/Resources @@ -170,7 +169,6 @@ styles.app/Contents/PkgInfo: styles$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f styles$(EXEEXT) styles.app/Contents/MacOS/styles - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc styles.app/Contents/Resources/styles.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns styles.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@styles_bundle: $(____styles_BUNDLE_TGT_REF_DEP) diff --git a/samples/mobile/wxedit/Makefile.in b/samples/mobile/wxedit/Makefile.in index 9903f6ec18..ca96acec8a 100644 --- a/samples/mobile/wxedit/Makefile.in +++ b/samples/mobile/wxedit/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -123,7 +122,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -o wxedit$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -152,7 +151,7 @@ wxedit$(EXEEXT): $(WXEDIT_OBJECTS) $(__wxedit___win32rc) $(__wxedit___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -wxedit.app/Contents/PkgInfo: wxedit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +wxedit.app/Contents/PkgInfo: wxedit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p wxedit.app/Contents mkdir -p wxedit.app/Contents/MacOS mkdir -p wxedit.app/Contents/Resources @@ -170,7 +169,6 @@ wxedit.app/Contents/PkgInfo: wxedit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f wxedit$(EXEEXT) wxedit.app/Contents/MacOS/wxedit - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc wxedit.app/Contents/Resources/wxedit.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns wxedit.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@wxedit_bundle: $(____wxedit_BUNDLE_TGT_REF_DEP) diff --git a/samples/multimon/Makefile.in b/samples/multimon/Makefile.in index 70b04cca07..6b8110f658 100644 --- a/samples/multimon/Makefile.in +++ b/samples/multimon/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -126,7 +125,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o multimon_test$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -155,7 +154,7 @@ multimon_test$(EXEEXT): $(MULTIMON_TEST_OBJECTS) $(__multimon_test___win32rc) $(__multimon_test___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -multimon_test.app/Contents/PkgInfo: multimon_test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +multimon_test.app/Contents/PkgInfo: multimon_test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p multimon_test.app/Contents mkdir -p multimon_test.app/Contents/MacOS mkdir -p multimon_test.app/Contents/Resources @@ -173,7 +172,6 @@ multimon_test.app/Contents/PkgInfo: multimon_test$(EXEEXT) $(top_srcdir)/src/mac ln -f multimon_test$(EXEEXT) multimon_test.app/Contents/MacOS/multimon_test - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc multimon_test.app/Contents/Resources/multimon_test.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns multimon_test.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@multimon_test_bundle: $(____multimon_test_BUNDLE_TGT_REF_DEP) diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in index f4ea87f79c..6bfcaae54d 100644 --- a/samples/nativdlg/Makefile.in +++ b/samples/nativdlg/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o nativdlg$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ nativdlg$(EXEEXT): $(NATIVDLG_OBJECTS) $(__nativdlg___win32rc) $(__nativdlg___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -nativdlg.app/Contents/PkgInfo: nativdlg$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +nativdlg.app/Contents/PkgInfo: nativdlg$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p nativdlg.app/Contents mkdir -p nativdlg.app/Contents/MacOS mkdir -p nativdlg.app/Contents/Resources @@ -169,7 +168,6 @@ nativdlg.app/Contents/PkgInfo: nativdlg$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f nativdlg$(EXEEXT) nativdlg.app/Contents/MacOS/nativdlg - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc nativdlg.app/Contents/Resources/nativdlg.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns nativdlg.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@nativdlg_bundle: $(____nativdlg_BUNDLE_TGT_REF_DEP) diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in index 2319364cd5..65d86431bd 100644 --- a/samples/notebook/Makefile.in +++ b/samples/notebook/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o notebook$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ notebook$(EXEEXT): $(NOTEBOOK_OBJECTS) $(__notebook___win32rc) $(__notebook___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -notebook.app/Contents/PkgInfo: notebook$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +notebook.app/Contents/PkgInfo: notebook$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p notebook.app/Contents mkdir -p notebook.app/Contents/MacOS mkdir -p notebook.app/Contents/Resources @@ -169,7 +168,6 @@ notebook.app/Contents/PkgInfo: notebook$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f notebook$(EXEEXT) notebook.app/Contents/MacOS/notebook - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc notebook.app/Contents/Resources/notebook.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns notebook.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@notebook_bundle: $(____notebook_BUNDLE_TGT_REF_DEP) diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in index 335323c15a..66ec35d1ea 100644 --- a/samples/oleauto/Makefile.in +++ b/samples/oleauto/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o oleauto$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ oleauto$(EXEEXT): $(OLEAUTO_OBJECTS) $(__oleauto___win32rc) $(__oleauto___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -oleauto.app/Contents/PkgInfo: oleauto$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +oleauto.app/Contents/PkgInfo: oleauto$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p oleauto.app/Contents mkdir -p oleauto.app/Contents/MacOS mkdir -p oleauto.app/Contents/Resources @@ -169,7 +168,6 @@ oleauto.app/Contents/PkgInfo: oleauto$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f oleauto$(EXEEXT) oleauto.app/Contents/MacOS/oleauto - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc oleauto.app/Contents/Resources/oleauto.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns oleauto.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@oleauto_bundle: $(____oleauto_BUNDLE_TGT_REF_DEP) diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in index 2272f6d86c..6fbeec9e45 100644 --- a/samples/opengl/cube/Makefile.in +++ b/samples/opengl/cube/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@ @@ -123,7 +122,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -o cube$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -152,7 +151,7 @@ distclean: clean @COND_USE_OPENGL_1@ $(__cube___os2_emxbindcmd) @COND_USE_OPENGL_1@ $(SAMPLES_RPATH_POSTLINK) -cube.app/Contents/PkgInfo: $(__cube___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +cube.app/Contents/PkgInfo: $(__cube___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p cube.app/Contents mkdir -p cube.app/Contents/MacOS mkdir -p cube.app/Contents/Resources @@ -170,7 +169,6 @@ cube.app/Contents/PkgInfo: $(__cube___depname) $(top_srcdir)/src/mac/carbon/Info ln -f cube$(EXEEXT) cube.app/Contents/MacOS/cube - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc cube.app/Contents/Resources/cube.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns cube.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@cube_bundle: $(____cube_BUNDLE_TGT_REF_DEP) diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in index d6613ae60e..25df7f75d4 100644 --- a/samples/opengl/isosurf/Makefile.in +++ b/samples/opengl/isosurf/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@ @@ -125,7 +124,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -o isosurf$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -154,7 +153,7 @@ distclean: clean @COND_USE_OPENGL_1@ $(__isosurf___os2_emxbindcmd) @COND_USE_OPENGL_1@ $(SAMPLES_RPATH_POSTLINK) -isosurf.app/Contents/PkgInfo: $(__isosurf___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +isosurf.app/Contents/PkgInfo: $(__isosurf___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p isosurf.app/Contents mkdir -p isosurf.app/Contents/MacOS mkdir -p isosurf.app/Contents/Resources @@ -172,7 +171,6 @@ isosurf.app/Contents/PkgInfo: $(__isosurf___depname) $(top_srcdir)/src/mac/carbo ln -f isosurf$(EXEEXT) isosurf.app/Contents/MacOS/isosurf - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc isosurf.app/Contents/Resources/isosurf.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns isosurf.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@isosurf_bundle: $(____isosurf_BUNDLE_TGT_REF_DEP) diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in index c0222ca8f2..de91feba33 100644 --- a/samples/opengl/penguin/Makefile.in +++ b/samples/opengl/penguin/Makefile.in @@ -28,7 +28,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@ @@ -135,7 +134,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -o penguin$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -164,7 +163,7 @@ distclean: clean @COND_USE_OPENGL_1@ $(__penguin___os2_emxbindcmd) @COND_USE_OPENGL_1@ $(SAMPLES_RPATH_POSTLINK) -penguin.app/Contents/PkgInfo: $(__penguin___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +penguin.app/Contents/PkgInfo: $(__penguin___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p penguin.app/Contents mkdir -p penguin.app/Contents/MacOS mkdir -p penguin.app/Contents/Resources @@ -182,7 +181,6 @@ penguin.app/Contents/PkgInfo: $(__penguin___depname) $(top_srcdir)/src/mac/carbo ln -f penguin$(EXEEXT) penguin.app/Contents/MacOS/penguin - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc penguin.app/Contents/Resources/penguin.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns penguin.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@penguin_bundle: $(____penguin_BUNDLE_TGT_REF_DEP) diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in index c2a218210b..afd546c250 100644 --- a/samples/ownerdrw/Makefile.in +++ b/samples/ownerdrw/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o ownerdrw$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ ownerdrw$(EXEEXT): $(OWNERDRW_OBJECTS) $(__ownerdrw___win32rc) $(__ownerdrw___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -ownerdrw.app/Contents/PkgInfo: ownerdrw$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +ownerdrw.app/Contents/PkgInfo: ownerdrw$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p ownerdrw.app/Contents mkdir -p ownerdrw.app/Contents/MacOS mkdir -p ownerdrw.app/Contents/Resources @@ -169,7 +168,6 @@ ownerdrw.app/Contents/PkgInfo: ownerdrw$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f ownerdrw$(EXEEXT) ownerdrw.app/Contents/MacOS/ownerdrw - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc ownerdrw.app/Contents/Resources/ownerdrw.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns ownerdrw.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@ownerdrw_bundle: $(____ownerdrw_BUNDLE_TGT_REF_DEP) diff --git a/samples/png/Makefile.in b/samples/png/Makefile.in index 9de10f315e..a69622ac56 100644 --- a/samples/png/Makefile.in +++ b/samples/png/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -119,7 +118,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o png$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -148,7 +147,7 @@ png$(EXEEXT): $(PNG_OBJECTS) $(__png___win32rc) $(__png___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -png.app/Contents/PkgInfo: png$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +png.app/Contents/PkgInfo: png$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p png.app/Contents mkdir -p png.app/Contents/MacOS mkdir -p png.app/Contents/Resources @@ -166,7 +165,6 @@ png.app/Contents/PkgInfo: png$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.i ln -f png$(EXEEXT) png.app/Contents/MacOS/png - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc png.app/Contents/Resources/png.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns png.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@png_bundle: $(____png_BUNDLE_TGT_REF_DEP) diff --git a/samples/popup/Makefile.in b/samples/popup/Makefile.in index bc32277f25..958e1d8823 100644 --- a/samples/popup/Makefile.in +++ b/samples/popup/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -121,7 +120,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o popup$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -150,7 +149,7 @@ popup$(EXEEXT): $(POPUP_OBJECTS) $(__popup___win32rc) $(__popup___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -popup.app/Contents/PkgInfo: popup$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +popup.app/Contents/PkgInfo: popup$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p popup.app/Contents mkdir -p popup.app/Contents/MacOS mkdir -p popup.app/Contents/Resources @@ -168,7 +167,6 @@ popup.app/Contents/PkgInfo: popup$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli ln -f popup$(EXEEXT) popup.app/Contents/MacOS/popup - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc popup.app/Contents/Resources/popup.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns popup.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@popup_bundle: $(____popup_BUNDLE_TGT_REF_DEP) diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in index 8da5c1bbd6..da78d996b5 100644 --- a/samples/printing/Makefile.in +++ b/samples/printing/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o printing$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc) $(__printing___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p printing.app/Contents mkdir -p printing.app/Contents/MacOS mkdir -p printing.app/Contents/Resources @@ -169,7 +168,6 @@ printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f printing$(EXEEXT) printing.app/Contents/MacOS/printing - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc printing.app/Contents/Resources/printing.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns printing.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@printing_bundle: $(____printing_BUNDLE_TGT_REF_DEP) diff --git a/samples/propsize/Makefile.in b/samples/propsize/Makefile.in index f3ff570fc9..bb7e137b7d 100644 --- a/samples/propsize/Makefile.in +++ b/samples/propsize/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o propsize$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ propsize$(EXEEXT): $(PROPSIZE_OBJECTS) $(__propsize___win32rc) $(__propsize___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -propsize.app/Contents/PkgInfo: propsize$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +propsize.app/Contents/PkgInfo: propsize$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p propsize.app/Contents mkdir -p propsize.app/Contents/MacOS mkdir -p propsize.app/Contents/Resources @@ -169,7 +168,6 @@ propsize.app/Contents/PkgInfo: propsize$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f propsize$(EXEEXT) propsize.app/Contents/MacOS/propsize - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc propsize.app/Contents/Resources/propsize.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns propsize.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@propsize_bundle: $(____propsize_BUNDLE_TGT_REF_DEP) diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in index ebb8f3795d..9b46a55918 100644 --- a/samples/regtest/Makefile.in +++ b/samples/regtest/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o regtest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ regtest$(EXEEXT): $(REGTEST_OBJECTS) $(__regtest___win32rc) $(__regtest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -regtest.app/Contents/PkgInfo: regtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +regtest.app/Contents/PkgInfo: regtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p regtest.app/Contents mkdir -p regtest.app/Contents/MacOS mkdir -p regtest.app/Contents/Resources @@ -169,7 +168,6 @@ regtest.app/Contents/PkgInfo: regtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f regtest$(EXEEXT) regtest.app/Contents/MacOS/regtest - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc regtest.app/Contents/Resources/regtest.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns regtest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@regtest_bundle: $(____regtest_BUNDLE_TGT_REF_DEP) diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in index c984383feb..28ecd12735 100644 --- a/samples/render/Makefile.in +++ b/samples/render/Makefile.in @@ -34,7 +34,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -119,7 +118,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o render$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS @@ -181,7 +180,7 @@ render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc) $(__render___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p render.app/Contents mkdir -p render.app/Contents/MacOS mkdir -p render.app/Contents/Resources @@ -199,7 +198,6 @@ render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f render$(EXEEXT) render.app/Contents/MacOS/render - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc render.app/Contents/Resources/render.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns render.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@render_bundle: $(____render_BUNDLE_TGT_REF_DEP) diff --git a/samples/richedit/Makefile.in b/samples/richedit/Makefile.in index ce1c6629d5..595b9fb361 100644 --- a/samples/richedit/Makefile.in +++ b/samples/richedit/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -126,7 +125,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o richedit$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -155,7 +154,7 @@ richedit$(EXEEXT): $(RICHEDIT_OBJECTS) $(__richedit___win32rc) $(__richedit___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -richedit.app/Contents/PkgInfo: richedit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +richedit.app/Contents/PkgInfo: richedit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p richedit.app/Contents mkdir -p richedit.app/Contents/MacOS mkdir -p richedit.app/Contents/Resources @@ -173,7 +172,6 @@ richedit.app/Contents/PkgInfo: richedit$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f richedit$(EXEEXT) richedit.app/Contents/MacOS/richedit - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc richedit.app/Contents/Resources/richedit.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns richedit.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@richedit_bundle: $(____richedit_BUNDLE_TGT_REF_DEP) diff --git a/samples/rotate/Makefile.in b/samples/rotate/Makefile.in index 970e78a1d5..b4fca22b03 100644 --- a/samples/rotate/Makefile.in +++ b/samples/rotate/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o rotate$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ rotate$(EXEEXT): $(ROTATE_OBJECTS) $(__rotate___win32rc) $(__rotate___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -rotate.app/Contents/PkgInfo: rotate$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +rotate.app/Contents/PkgInfo: rotate$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p rotate.app/Contents mkdir -p rotate.app/Contents/MacOS mkdir -p rotate.app/Contents/Resources @@ -169,7 +168,6 @@ rotate.app/Contents/PkgInfo: rotate$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f rotate$(EXEEXT) rotate.app/Contents/MacOS/rotate - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc rotate.app/Contents/Resources/rotate.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns rotate.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@rotate_bundle: $(____rotate_BUNDLE_TGT_REF_DEP) diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in index 074f8eafd0..367d7e2856 100644 --- a/samples/sashtest/Makefile.in +++ b/samples/sashtest/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_SDL = @EXTRALIBS_SDL@ @@ -127,7 +126,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o sashtest$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,7 +155,7 @@ sashtest$(EXEEXT): $(SASHTEST_OBJECTS) $(__sashtest___win32rc) $(__sashtest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -sashtest.app/Contents/PkgInfo: sashtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +sashtest.app/Contents/PkgInfo: sashtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p sashtest.app/Contents mkdir -p sashtest.app/Contents/MacOS mkdir -p sashtest.app/Contents/Resources @@ -174,7 +173,6 @@ sashtest.app/Contents/PkgInfo: sashtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f sashtest$(EXEEXT) sashtest.app/Contents/MacOS/sashtest - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc sashtest.app/Contents/Resources/sashtest.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns sashtest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@sashtest_bundle: $(____sashtest_BUNDLE_TGT_REF_DEP) diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in index 2a8e97de48..00bcfafc08 100644 --- a/samples/scroll/Makefile.in +++ b/samples/scroll/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o scroll$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ scroll$(EXEEXT): $(SCROLL_OBJECTS) $(__scroll___win32rc) $(__scroll___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -scroll.app/Contents/PkgInfo: scroll$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +scroll.app/Contents/PkgInfo: scroll$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p scroll.app/Contents mkdir -p scroll.app/Contents/MacOS mkdir -p scroll.app/Contents/Resources @@ -169,7 +168,6 @@ scroll.app/Contents/PkgInfo: scroll$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f scroll$(EXEEXT) scroll.app/Contents/MacOS/scroll - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc scroll.app/Contents/Resources/scroll.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns scroll.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@scroll_bundle: $(____scroll_BUNDLE_TGT_REF_DEP) diff --git a/samples/scrollsub/Makefile.in b/samples/scrollsub/Makefile.in index bd1c445e3e..689a9b18d9 100644 --- a/samples/scrollsub/Makefile.in +++ b/samples/scrollsub/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o scrollsub$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ scrollsub$(EXEEXT): $(SCROLLSUB_OBJECTS) $(__scrollsub___win32rc) $(__scrollsub___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -scrollsub.app/Contents/PkgInfo: scrollsub$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +scrollsub.app/Contents/PkgInfo: scrollsub$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p scrollsub.app/Contents mkdir -p scrollsub.app/Contents/MacOS mkdir -p scrollsub.app/Contents/Resources @@ -169,7 +168,6 @@ scrollsub.app/Contents/PkgInfo: scrollsub$(EXEEXT) $(top_srcdir)/src/mac/carbon/ ln -f scrollsub$(EXEEXT) scrollsub.app/Contents/MacOS/scrollsub - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc scrollsub.app/Contents/Resources/scrollsub.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns scrollsub.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@scrollsub_bundle: $(____scrollsub_BUNDLE_TGT_REF_DEP) diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in index 2114bcc7f8..8d49e91c0b 100644 --- a/samples/shaped/Makefile.in +++ b/samples/shaped/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o shaped$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc) $(__shaped___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p shaped.app/Contents mkdir -p shaped.app/Contents/MacOS mkdir -p shaped.app/Contents/Resources @@ -169,7 +168,6 @@ shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f shaped$(EXEEXT) shaped.app/Contents/MacOS/shaped - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc shaped.app/Contents/Resources/shaped.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns shaped.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@shaped_bundle: $(____shaped_BUNDLE_TGT_REF_DEP) diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in index fe82fbc8c0..60ee087d1b 100644 --- a/samples/sockets/Makefile.in +++ b/samples/sockets/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -97,13 +96,13 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) \ $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_0) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o client$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_2 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) \ $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_0) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o server$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_3 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = -d __WXUNIVERSAL__ @@ -180,7 +179,7 @@ client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc) $(__client___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p client.app/Contents mkdir -p client.app/Contents/MacOS mkdir -p client.app/Contents/Resources @@ -198,7 +197,6 @@ client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f client$(EXEEXT) client.app/Contents/MacOS/client - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc client.app/Contents/Resources/client.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns client.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@client_bundle: $(____client_BUNDLE_TGT_REF_DEP) @@ -210,7 +208,7 @@ server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc) $(__server___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p server.app/Contents mkdir -p server.app/Contents/MacOS mkdir -p server.app/Contents/Resources @@ -228,7 +226,6 @@ server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f server$(EXEEXT) server.app/Contents/MacOS/server - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc server.app/Contents/Resources/server.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns server.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@server_bundle: $(____server_BUNDLE_TGT_REF_DEP) diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in index c1e4d75f51..ce79439e5f 100644 --- a/samples/sound/Makefile.in +++ b/samples/sound/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_SDL = @EXTRALIBS_SDL@ @@ -126,7 +125,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o sound$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -155,7 +154,7 @@ sound$(EXEEXT): $(SOUND_OBJECTS) $(__sound___win32rc) $(__sound___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p sound.app/Contents mkdir -p sound.app/Contents/MacOS mkdir -p sound.app/Contents/Resources @@ -173,7 +172,6 @@ sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli ln -f sound$(EXEEXT) sound.app/Contents/MacOS/sound - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc sound.app/Contents/Resources/sound.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns sound.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@sound_bundle: $(____sound_BUNDLE_TGT_REF_DEP) diff --git a/samples/splash/Makefile.in b/samples/splash/Makefile.in index 239eaa7095..c1416b85e4 100644 --- a/samples/splash/Makefile.in +++ b/samples/splash/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_SDL = @EXTRALIBS_SDL@ @@ -130,7 +129,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o splash$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -159,7 +158,7 @@ splash$(EXEEXT): $(SPLASH_OBJECTS) $(__splash___win32rc) $(__splash___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -splash.app/Contents/PkgInfo: splash$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +splash.app/Contents/PkgInfo: splash$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p splash.app/Contents mkdir -p splash.app/Contents/MacOS mkdir -p splash.app/Contents/Resources @@ -177,7 +176,6 @@ splash.app/Contents/PkgInfo: splash$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f splash$(EXEEXT) splash.app/Contents/MacOS/splash - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc splash.app/Contents/Resources/splash.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns splash.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@splash_bundle: $(____splash_BUNDLE_TGT_REF_DEP) diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in index 68ff7edb63..b90e0f422d 100644 --- a/samples/splitter/Makefile.in +++ b/samples/splitter/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o splitter$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ splitter$(EXEEXT): $(SPLITTER_OBJECTS) $(__splitter___win32rc) $(__splitter___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -splitter.app/Contents/PkgInfo: splitter$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +splitter.app/Contents/PkgInfo: splitter$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p splitter.app/Contents mkdir -p splitter.app/Contents/MacOS mkdir -p splitter.app/Contents/Resources @@ -169,7 +168,6 @@ splitter.app/Contents/PkgInfo: splitter$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f splitter$(EXEEXT) splitter.app/Contents/MacOS/splitter - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc splitter.app/Contents/Resources/splitter.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns splitter.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@splitter_bundle: $(____splitter_BUNDLE_TGT_REF_DEP) diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in index ff88d47f65..10ec7605ef 100644 --- a/samples/statbar/Makefile.in +++ b/samples/statbar/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o statbar$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ statbar$(EXEEXT): $(STATBAR_OBJECTS) $(__statbar___win32rc) $(__statbar___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -statbar.app/Contents/PkgInfo: statbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +statbar.app/Contents/PkgInfo: statbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p statbar.app/Contents mkdir -p statbar.app/Contents/MacOS mkdir -p statbar.app/Contents/Resources @@ -169,7 +168,6 @@ statbar.app/Contents/PkgInfo: statbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f statbar$(EXEEXT) statbar.app/Contents/MacOS/statbar - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc statbar.app/Contents/Resources/statbar.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns statbar.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@statbar_bundle: $(____statbar_BUNDLE_TGT_REF_DEP) diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in index 560c6ba44d..5ff40f13eb 100644 --- a/samples/stc/Makefile.in +++ b/samples/stc/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -125,8 +124,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -i \ - $(srcdir)/../../include -o stctest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(srcdir)/../../include -o stctest$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -155,7 +153,7 @@ stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc) $(__stctest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p stctest.app/Contents mkdir -p stctest.app/Contents/MacOS mkdir -p stctest.app/Contents/Resources @@ -173,7 +171,6 @@ stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f stctest$(EXEEXT) stctest.app/Contents/MacOS/stctest - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc stctest.app/Contents/Resources/stctest.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns stctest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@stctest_bundle: $(____stctest_BUNDLE_TGT_REF_DEP) diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in index 61ebdb0bd7..58633749c7 100644 --- a/samples/svg/Makefile.in +++ b/samples/svg/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -123,8 +122,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -i \ - $(srcdir)/../../include -o svgtest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(srcdir)/../../include -o svgtest$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -153,7 +151,7 @@ svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc) $(__svgtest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p svgtest.app/Contents mkdir -p svgtest.app/Contents/MacOS mkdir -p svgtest.app/Contents/Resources @@ -171,7 +169,6 @@ svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f svgtest$(EXEEXT) svgtest.app/Contents/MacOS/svgtest - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc svgtest.app/Contents/Resources/svgtest.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns svgtest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@svgtest_bundle: $(____svgtest_BUNDLE_TGT_REF_DEP) diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in index f8cd85c6f7..b94c755724 100644 --- a/samples/taskbar/Makefile.in +++ b/samples/taskbar/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_SDL = @EXTRALIBS_SDL@ @@ -127,7 +126,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o taskbar$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,7 +155,7 @@ taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc) $(__taskbar___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p taskbar.app/Contents mkdir -p taskbar.app/Contents/MacOS mkdir -p taskbar.app/Contents/Resources @@ -174,7 +173,6 @@ taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f taskbar$(EXEEXT) taskbar.app/Contents/MacOS/taskbar - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc taskbar.app/Contents/Resources/taskbar.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns taskbar.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@taskbar_bundle: $(____taskbar_BUNDLE_TGT_REF_DEP) diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in index d4edbffa78..b36878098d 100644 --- a/samples/text/Makefile.in +++ b/samples/text/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -120,7 +119,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o text$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -149,7 +148,7 @@ text$(EXEEXT): $(TEXT_OBJECTS) $(__text___win32rc) $(__text___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -text.app/Contents/PkgInfo: text$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +text.app/Contents/PkgInfo: text$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p text.app/Contents mkdir -p text.app/Contents/MacOS mkdir -p text.app/Contents/Resources @@ -167,7 +166,6 @@ text.app/Contents/PkgInfo: text$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist ln -f text$(EXEEXT) text.app/Contents/MacOS/text - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc text.app/Contents/Resources/text.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns text.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@text_bundle: $(____text_BUNDLE_TGT_REF_DEP) diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in index 12157063c3..7096e620b2 100644 --- a/samples/thread/Makefile.in +++ b/samples/thread/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o thread$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ thread$(EXEEXT): $(THREAD_OBJECTS) $(__thread___win32rc) $(__thread___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -thread.app/Contents/PkgInfo: thread$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +thread.app/Contents/PkgInfo: thread$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p thread.app/Contents mkdir -p thread.app/Contents/MacOS mkdir -p thread.app/Contents/Resources @@ -169,7 +168,6 @@ thread.app/Contents/PkgInfo: thread$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f thread$(EXEEXT) thread.app/Contents/MacOS/thread - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc thread.app/Contents/Resources/thread.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns thread.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@thread_bundle: $(____thread_BUNDLE_TGT_REF_DEP) diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in index d557c48481..c512b33ddb 100644 --- a/samples/toolbar/Makefile.in +++ b/samples/toolbar/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o toolbar$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ toolbar$(EXEEXT): $(TOOLBAR_OBJECTS) $(__toolbar___win32rc) $(__toolbar___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p toolbar.app/Contents mkdir -p toolbar.app/Contents/MacOS mkdir -p toolbar.app/Contents/Resources @@ -169,7 +168,6 @@ toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f toolbar$(EXEEXT) toolbar.app/Contents/MacOS/toolbar - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc toolbar.app/Contents/Resources/toolbar.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns toolbar.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@toolbar_bundle: $(____toolbar_BUNDLE_TGT_REF_DEP) diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in index b7d1b5c32d..9cfaba3773 100644 --- a/samples/treectrl/Makefile.in +++ b/samples/treectrl/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o treectrl$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ treectrl$(EXEEXT): $(TREECTRL_OBJECTS) $(__treectrl___win32rc) $(__treectrl___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p treectrl.app/Contents mkdir -p treectrl.app/Contents/MacOS mkdir -p treectrl.app/Contents/Resources @@ -169,7 +168,6 @@ treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f treectrl$(EXEEXT) treectrl.app/Contents/MacOS/treectrl - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc treectrl.app/Contents/Resources/treectrl.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns treectrl.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@treectrl_bundle: $(____treectrl_BUNDLE_TGT_REF_DEP) diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in index 54ec116420..32a44ce4c7 100644 --- a/samples/typetest/Makefile.in +++ b/samples/typetest/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o typetest$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ typetest$(EXEEXT): $(TYPETEST_OBJECTS) $(__typetest___win32rc) $(__typetest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -typetest.app/Contents/PkgInfo: typetest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +typetest.app/Contents/PkgInfo: typetest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p typetest.app/Contents mkdir -p typetest.app/Contents/MacOS mkdir -p typetest.app/Contents/Resources @@ -169,7 +168,6 @@ typetest.app/Contents/PkgInfo: typetest$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f typetest$(EXEEXT) typetest.app/Contents/MacOS/typetest - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc typetest.app/Contents/Resources/typetest.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns typetest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@typetest_bundle: $(____typetest_BUNDLE_TGT_REF_DEP) diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in index cd76677c90..9279dacbd6 100644 --- a/samples/validate/Makefile.in +++ b/samples/validate/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o validate$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ validate$(EXEEXT): $(VALIDATE_OBJECTS) $(__validate___win32rc) $(__validate___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -validate.app/Contents/PkgInfo: validate$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +validate.app/Contents/PkgInfo: validate$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p validate.app/Contents mkdir -p validate.app/Contents/MacOS mkdir -p validate.app/Contents/Resources @@ -169,7 +168,6 @@ validate.app/Contents/PkgInfo: validate$(EXEEXT) $(top_srcdir)/src/mac/carbon/In ln -f validate$(EXEEXT) validate.app/Contents/MacOS/validate - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc validate.app/Contents/Resources/validate.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns validate.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@validate_bundle: $(____validate_BUNDLE_TGT_REF_DEP) diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in index 50fc5984e2..2fe39a251a 100644 --- a/samples/vscroll/Makefile.in +++ b/samples/vscroll/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o vstest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -151,7 +150,7 @@ vstest$(EXEEXT): $(VSTEST_OBJECTS) $(__vstest___win32rc) $(__vstest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -vstest.app/Contents/PkgInfo: vstest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +vstest.app/Contents/PkgInfo: vstest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p vstest.app/Contents mkdir -p vstest.app/Contents/MacOS mkdir -p vstest.app/Contents/Resources @@ -169,7 +168,6 @@ vstest.app/Contents/PkgInfo: vstest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f vstest$(EXEEXT) vstest.app/Contents/MacOS/vstest - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc vstest.app/Contents/Resources/vstest.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns vstest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@vstest_bundle: $(____vstest_BUNDLE_TGT_REF_DEP) diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in index ecccb0ccd6..9e28c1d9a7 100644 --- a/samples/widgets/Makefile.in +++ b/samples/widgets/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -133,7 +132,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o widgets$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -162,7 +161,7 @@ widgets$(EXEEXT): $(WIDGETS_OBJECTS) $(__widgets___win32rc) $(__widgets___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -widgets.app/Contents/PkgInfo: widgets$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +widgets.app/Contents/PkgInfo: widgets$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p widgets.app/Contents mkdir -p widgets.app/Contents/MacOS mkdir -p widgets.app/Contents/Resources @@ -180,7 +179,6 @@ widgets.app/Contents/PkgInfo: widgets$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f widgets$(EXEEXT) widgets.app/Contents/MacOS/widgets - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc widgets.app/Contents/Resources/widgets.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns widgets.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@widgets_bundle: $(____widgets_BUNDLE_TGT_REF_DEP) diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in index 657020824d..d5cc68adba 100644 --- a/samples/wizard/Makefile.in +++ b/samples/wizard/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_SDL = @EXTRALIBS_SDL@ @@ -127,7 +126,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o wizard$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -156,7 +155,7 @@ wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc) $(__wizard___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -wizard.app/Contents/PkgInfo: wizard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +wizard.app/Contents/PkgInfo: wizard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p wizard.app/Contents mkdir -p wizard.app/Contents/MacOS mkdir -p wizard.app/Contents/Resources @@ -174,7 +173,6 @@ wizard.app/Contents/PkgInfo: wizard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p ln -f wizard$(EXEEXT) wizard.app/Contents/MacOS/wizard - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc wizard.app/Contents/Resources/wizard.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns wizard.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@wizard_bundle: $(____wizard_BUNDLE_TGT_REF_DEP) diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in index de230e3aae..f298bc6716 100644 --- a/samples/xrc/Makefile.in +++ b/samples/xrc/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_XML = @EXTRALIBS_XML@ EXTRALIBS_HTML = @EXTRALIBS_HTML@ @@ -141,7 +140,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o xrcdemo$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -170,7 +169,7 @@ xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc) $(__xrcdemo___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns +xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p xrcdemo.app/Contents mkdir -p xrcdemo.app/Contents/MacOS mkdir -p xrcdemo.app/Contents/Resources @@ -188,7 +187,6 @@ xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info ln -f xrcdemo$(EXEEXT) xrcdemo.app/Contents/MacOS/xrcdemo - cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc xrcdemo.app/Contents/Resources/xrcdemo.rsrc cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns xrcdemo.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@xrcdemo_bundle: $(____xrcdemo_BUNDLE_TGT_REF_DEP) diff --git a/utils/configtool/src/Makefile.in b/utils/configtool/src/Makefile.in index 90f5dd234a..ce3cfd919b 100644 --- a/utils/configtool/src/Makefile.in +++ b/utils/configtool/src/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_XML = @EXTRALIBS_XML@ EXTRALIBS_HTML = @EXTRALIBS_HTML@ @@ -143,7 +142,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -o wxconfigtool$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### diff --git a/utils/emulator/src/Makefile.in b/utils/emulator/src/Makefile.in index 2bbe7bbcec..1bee6b863d 100644 --- a/utils/emulator/src/Makefile.in +++ b/utils/emulator/src/Makefile.in @@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -115,7 +114,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -o wxemulator$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### diff --git a/utils/helpview/src/Makefile.in b/utils/helpview/src/Makefile.in index 0d6adfcb8d..686a8206a7 100644 --- a/utils/helpview/src/Makefile.in +++ b/utils/helpview/src/Makefile.in @@ -30,7 +30,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_HTML = @EXTRALIBS_HTML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -126,7 +125,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -o helpview$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### diff --git a/utils/hhp2cached/Makefile.in b/utils/hhp2cached/Makefile.in index db59f6e6fd..dd6c014064 100644 --- a/utils/hhp2cached/Makefile.in +++ b/utils/hhp2cached/Makefile.in @@ -30,7 +30,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_HTML = @EXTRALIBS_HTML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -122,7 +121,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ $(srcdir)/../../samples -i $(top_srcdir)/include -o hhp2cached$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### diff --git a/utils/tex2rtf/src/Makefile.in b/utils/tex2rtf/src/Makefile.in index 195e6c3160..3f16e00b1a 100644 --- a/utils/tex2rtf/src/Makefile.in +++ b/utils/tex2rtf/src/Makefile.in @@ -30,7 +30,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_HTML = @EXTRALIBS_HTML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ @@ -118,7 +117,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_4) $(__EXCEPTIONS_DEFINE_p_4) \ $(__RTTI_DEFINE_p_4) $(__THREAD_DEFINE_p_4) -i $(srcdir) $(__DLLFLAG_p_4) -i \ $(srcdir)/../../../samples -i $(top_srcdir)/include -o tex2rtf_gui$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -- 2.45.2