From 2383c21c636dc63bef5c46ca0e529626087236ae Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 12 Jun 2008 18:15:36 +0000 Subject: [PATCH] mac paths updated git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- 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/image/Makefile.in | 6 +++--- samples/internat/Makefile.in | 6 +++--- samples/ipc/Makefile.in | 12 ++++++------ samples/joytest/Makefile.in | 6 +++--- samples/keyboard/Makefile.in | 6 +++--- samples/layout/Makefile.in | 6 +++--- samples/listctrl/Makefile.in | 6 +++--- samples/mdi/Makefile.in | 6 +++--- samples/memcheck/Makefile.in | 6 +++--- samples/menu/Makefile.in | 6 +++--- samples/mfc/Makefile.in | 6 +++--- samples/minimal/Makefile.in | 6 +++--- samples/nativdlg/Makefile.in | 6 +++--- samples/notebook/Makefile.in | 6 +++--- samples/oleauto/Makefile.in | 6 +++--- samples/ownerdrw/Makefile.in | 6 +++--- samples/popup/Makefile.in | 6 +++--- samples/power/Makefile.in | 6 +++--- samples/printing/Makefile.in | 6 +++--- samples/regtest/Makefile.in | 6 +++--- samples/render/Makefile.in | 6 +++--- samples/richtext/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 | 12 ++++++------ samples/sound/Makefile.in | 6 +++--- samples/splitter/Makefile.in | 6 +++--- samples/statbar/Makefile.in | 6 +++--- samples/stc/Makefile.in | 6 +++--- samples/svg/Makefile.in | 6 +++--- samples/taborder/Makefile.in | 6 +++--- 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/wrapsizer/Makefile.in | 6 +++--- samples/xrc/Makefile.in | 6 +++--- 51 files changed, 159 insertions(+), 159 deletions(-) diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in index 82619df46a..669dafd219 100644 --- a/samples/except/Makefile.in +++ b/samples/except/Makefile.in @@ -162,7 +162,7 @@ except$(EXEEXT): $(EXCEPT_OBJECTS) $(__except___win32rc) $(__except___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@except.app/Contents/PkgInfo: except$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@except.app/Contents/PkgInfo: except$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p except.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p except.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p except.app/Contents/Resources @@ -171,7 +171,7 @@ except$(EXEEXT): $(EXCEPT_OBJECTS) $(__except___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/except/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >except.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >except.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >except.app/Contents/PkgInfo @@ -180,7 +180,7 @@ except$(EXEEXT): $(EXCEPT_OBJECTS) $(__except___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f except$(EXEEXT) except.app/Contents/MacOS/except @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns except.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 3deee97157..ebdffa61a0 100644 --- a/samples/exec/Makefile.in +++ b/samples/exec/Makefile.in @@ -162,7 +162,7 @@ exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc) $(__exec___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@exec.app/Contents/PkgInfo: exec$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@exec.app/Contents/PkgInfo: exec$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p exec.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p exec.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p exec.app/Contents/Resources @@ -171,7 +171,7 @@ exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/exec/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >exec.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >exec.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >exec.app/Contents/PkgInfo @@ -180,7 +180,7 @@ exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f exec$(EXEEXT) exec.app/Contents/MacOS/exec @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns exec.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 80ddb290b3..01f19be91b 100644 --- a/samples/font/Makefile.in +++ b/samples/font/Makefile.in @@ -162,7 +162,7 @@ font$(EXEEXT): $(FONT_OBJECTS) $(__font___win32rc) $(__font___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@font.app/Contents/PkgInfo: font$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@font.app/Contents/PkgInfo: font$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p font.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p font.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p font.app/Contents/Resources @@ -171,7 +171,7 @@ font$(EXEEXT): $(FONT_OBJECTS) $(__font___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/font/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >font.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >font.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >font.app/Contents/PkgInfo @@ -180,7 +180,7 @@ font$(EXEEXT): $(FONT_OBJECTS) $(__font___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f font$(EXEEXT) font.app/Contents/MacOS/font @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns font.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 1fdf1d6995..d43dbc46f1 100644 --- a/samples/grid/Makefile.in +++ b/samples/grid/Makefile.in @@ -175,7 +175,7 @@ grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc) $(__grid___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@grid.app/Contents/PkgInfo: grid$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@grid.app/Contents/PkgInfo: grid$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p grid.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p grid.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p grid.app/Contents/Resources @@ -184,7 +184,7 @@ grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/grid/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >grid.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >grid.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >grid.app/Contents/PkgInfo @@ -193,7 +193,7 @@ grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f grid$(EXEEXT) grid.app/Contents/MacOS/grid @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns grid.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 3558bd1b76..a1612a4d47 100644 --- a/samples/help/Makefile.in +++ b/samples/help/Makefile.in @@ -171,7 +171,7 @@ help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc) $(__help___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p help.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p help.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p help.app/Contents/Resources @@ -180,7 +180,7 @@ help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/help/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >help.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >help.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >help.app/Contents/PkgInfo @@ -189,7 +189,7 @@ help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f help$(EXEEXT) help.app/Contents/MacOS/help @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns help.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 dfdce721f8..0c4a3d043c 100644 --- a/samples/htlbox/Makefile.in +++ b/samples/htlbox/Makefile.in @@ -166,7 +166,7 @@ htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc) $(__htlbox___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p htlbox.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p htlbox.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p htlbox.app/Contents/Resources @@ -175,7 +175,7 @@ htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/htlbox/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >htlbox.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >htlbox.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >htlbox.app/Contents/PkgInfo @@ -184,7 +184,7 @@ htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f htlbox$(EXEEXT) htlbox.app/Contents/MacOS/htlbox @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns htlbox.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns htlbox.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@htlbox_bundle: $(____htlbox_BUNDLE_TGT_REF_DEP) diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in index 0eb4c35c34..4447f7eb83 100644 --- a/samples/image/Makefile.in +++ b/samples/image/Makefile.in @@ -162,7 +162,7 @@ image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc) $(__image___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p image.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p image.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p image.app/Contents/Resources @@ -171,7 +171,7 @@ image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/image/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >image.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >image.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >image.app/Contents/PkgInfo @@ -180,7 +180,7 @@ image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f image$(EXEEXT) image.app/Contents/MacOS/image @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns image.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 cecc8e8ec1..c2e55547c7 100644 --- a/samples/internat/Makefile.in +++ b/samples/internat/Makefile.in @@ -162,7 +162,7 @@ internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc) $(__internat___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p internat.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p internat.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p internat.app/Contents/Resources @@ -171,7 +171,7 @@ internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/internat/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >internat.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >internat.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >internat.app/Contents/PkgInfo @@ -180,7 +180,7 @@ internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f internat$(EXEEXT) internat.app/Contents/MacOS/internat @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns internat.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 cc65ce9d2d..31ebe42e16 100644 --- a/samples/ipc/Makefile.in +++ b/samples/ipc/Makefile.in @@ -219,7 +219,7 @@ distclean: clean @COND_USE_GUI_1@ $(__ipcclient___os2_emxbindcmd) @COND_USE_GUI_1@ $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcclient.app/Contents/PkgInfo: $(__ipcclient___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcclient.app/Contents/PkgInfo: $(__ipcclient___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p ipcclient.app/Contents @COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p ipcclient.app/Contents/MacOS @COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p ipcclient.app/Contents/Resources @@ -228,7 +228,7 @@ distclean: clean @COND_PLATFORM_MACOSX_1_USE_GUI_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/EXECUTABLE/ipcclient/" \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >ipcclient.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >ipcclient.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1_USE_GUI_1@ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ echo -n "APPL????" >ipcclient.app/Contents/PkgInfo @@ -237,7 +237,7 @@ distclean: clean @COND_PLATFORM_MACOSX_1_USE_GUI_1@ ln -f ipcclient$(EXEEXT) ipcclient.app/Contents/MacOS/ipcclient @COND_PLATFORM_MACOSX_1_USE_GUI_1@ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ -@COND_PLATFORM_MACOSX_1_USE_GUI_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns ipcclient.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns ipcclient.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcclient_bundle: $(____ipcclient_BUNDLE_TGT_REF_DEP) @@ -248,7 +248,7 @@ distclean: clean @COND_USE_GUI_1@ $(__ipcserver___os2_emxbindcmd) @COND_USE_GUI_1@ $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcserver.app/Contents/PkgInfo: $(__ipcserver___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcserver.app/Contents/PkgInfo: $(__ipcserver___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p ipcserver.app/Contents @COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p ipcserver.app/Contents/MacOS @COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p ipcserver.app/Contents/Resources @@ -257,7 +257,7 @@ distclean: clean @COND_PLATFORM_MACOSX_1_USE_GUI_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/EXECUTABLE/ipcserver/" \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >ipcserver.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >ipcserver.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1_USE_GUI_1@ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ echo -n "APPL????" >ipcserver.app/Contents/PkgInfo @@ -266,7 +266,7 @@ distclean: clean @COND_PLATFORM_MACOSX_1_USE_GUI_1@ ln -f ipcserver$(EXEEXT) ipcserver.app/Contents/MacOS/ipcserver @COND_PLATFORM_MACOSX_1_USE_GUI_1@ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ -@COND_PLATFORM_MACOSX_1_USE_GUI_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns ipcserver.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns ipcserver.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcserver_bundle: $(____ipcserver_BUNDLE_TGT_REF_DEP) diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in index 86b139984c..5076772ab5 100644 --- a/samples/joytest/Makefile.in +++ b/samples/joytest/Makefile.in @@ -175,7 +175,7 @@ joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc) $(__joytest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p joytest.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p joytest.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p joytest.app/Contents/Resources @@ -184,7 +184,7 @@ joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/joytest/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >joytest.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >joytest.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >joytest.app/Contents/PkgInfo @@ -193,7 +193,7 @@ joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f joytest$(EXEEXT) joytest.app/Contents/MacOS/joytest @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns joytest.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 b18210dc02..e344444f1f 100644 --- a/samples/keyboard/Makefile.in +++ b/samples/keyboard/Makefile.in @@ -162,7 +162,7 @@ keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc) $(__keyboard___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p keyboard.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p keyboard.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p keyboard.app/Contents/Resources @@ -171,7 +171,7 @@ keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/keyboard/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >keyboard.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >keyboard.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >keyboard.app/Contents/PkgInfo @@ -180,7 +180,7 @@ keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f keyboard$(EXEEXT) keyboard.app/Contents/MacOS/keyboard @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns keyboard.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 7329fcef8f..8a428ee87b 100644 --- a/samples/layout/Makefile.in +++ b/samples/layout/Makefile.in @@ -162,7 +162,7 @@ layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc) $(__layout___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@layout.app/Contents/PkgInfo: layout$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@layout.app/Contents/PkgInfo: layout$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p layout.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p layout.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p layout.app/Contents/Resources @@ -171,7 +171,7 @@ layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/layout/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >layout.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >layout.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >layout.app/Contents/PkgInfo @@ -180,7 +180,7 @@ layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f layout$(EXEEXT) layout.app/Contents/MacOS/layout @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns layout.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns layout.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@layout_bundle: $(____layout_BUNDLE_TGT_REF_DEP) diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in index 0da68502c4..a7ca6288c8 100644 --- a/samples/listctrl/Makefile.in +++ b/samples/listctrl/Makefile.in @@ -162,7 +162,7 @@ listctrl$(EXEEXT): $(LISTCTRL_OBJECTS) $(__listctrl___win32rc) $(__listctrl___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@listctrl.app/Contents/PkgInfo: listctrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@listctrl.app/Contents/PkgInfo: listctrl$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p listctrl.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p listctrl.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p listctrl.app/Contents/Resources @@ -171,7 +171,7 @@ listctrl$(EXEEXT): $(LISTCTRL_OBJECTS) $(__listctrl___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/listctrl/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >listctrl.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >listctrl.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >listctrl.app/Contents/PkgInfo @@ -180,7 +180,7 @@ listctrl$(EXEEXT): $(LISTCTRL_OBJECTS) $(__listctrl___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f listctrl$(EXEEXT) listctrl.app/Contents/MacOS/listctrl @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns listctrl.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 e953154cf6..a48b9fe84b 100644 --- a/samples/mdi/Makefile.in +++ b/samples/mdi/Makefile.in @@ -161,7 +161,7 @@ mdi$(EXEEXT): $(MDI_OBJECTS) $(__mdi___win32rc) $(__mdi___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@mdi.app/Contents/PkgInfo: mdi$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@mdi.app/Contents/PkgInfo: mdi$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p mdi.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p mdi.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p mdi.app/Contents/Resources @@ -170,7 +170,7 @@ mdi$(EXEEXT): $(MDI_OBJECTS) $(__mdi___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/mdi/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >mdi.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >mdi.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >mdi.app/Contents/PkgInfo @@ -179,7 +179,7 @@ mdi$(EXEEXT): $(MDI_OBJECTS) $(__mdi___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f mdi$(EXEEXT) mdi.app/Contents/MacOS/mdi @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mdi.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns mdi.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@mdi_bundle: $(____mdi_BUNDLE_TGT_REF_DEP) diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in index b364f187e6..581ba63af5 100644 --- a/samples/memcheck/Makefile.in +++ b/samples/memcheck/Makefile.in @@ -162,7 +162,7 @@ memcheck$(EXEEXT): $(MEMCHECK_OBJECTS) $(__memcheck___win32rc) $(__memcheck___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@memcheck.app/Contents/PkgInfo: memcheck$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@memcheck.app/Contents/PkgInfo: memcheck$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p memcheck.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p memcheck.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p memcheck.app/Contents/Resources @@ -171,7 +171,7 @@ memcheck$(EXEEXT): $(MEMCHECK_OBJECTS) $(__memcheck___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/memcheck/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >memcheck.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >memcheck.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >memcheck.app/Contents/PkgInfo @@ -180,7 +180,7 @@ memcheck$(EXEEXT): $(MEMCHECK_OBJECTS) $(__memcheck___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f memcheck$(EXEEXT) memcheck.app/Contents/MacOS/memcheck @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns memcheck.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 209e0166cd..15589b1e1b 100644 --- a/samples/menu/Makefile.in +++ b/samples/menu/Makefile.in @@ -162,7 +162,7 @@ menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc) $(__menu___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@menu.app/Contents/PkgInfo: menu$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@menu.app/Contents/PkgInfo: menu$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p menu.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p menu.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p menu.app/Contents/Resources @@ -171,7 +171,7 @@ menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/menu/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >menu.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >menu.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >menu.app/Contents/PkgInfo @@ -180,7 +180,7 @@ menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f menu$(EXEEXT) menu.app/Contents/MacOS/menu @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns menu.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 faa9b0a570..3c5095687b 100644 --- a/samples/mfc/Makefile.in +++ b/samples/mfc/Makefile.in @@ -162,7 +162,7 @@ mfctest$(EXEEXT): $(MFCTEST_OBJECTS) $(__mfctest___win32rc) $(__mfctest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@mfctest.app/Contents/PkgInfo: mfctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@mfctest.app/Contents/PkgInfo: mfctest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p mfctest.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p mfctest.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p mfctest.app/Contents/Resources @@ -171,7 +171,7 @@ mfctest$(EXEEXT): $(MFCTEST_OBJECTS) $(__mfctest___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/mfctest/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >mfctest.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >mfctest.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >mfctest.app/Contents/PkgInfo @@ -180,7 +180,7 @@ mfctest$(EXEEXT): $(MFCTEST_OBJECTS) $(__mfctest___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f mfctest$(EXEEXT) mfctest.app/Contents/MacOS/mfctest @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mfctest.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns mfctest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@mfctest_bundle: $(____mfctest_BUNDLE_TGT_REF_DEP) diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in index 494e3b0638..d81f179dd7 100644 --- a/samples/minimal/Makefile.in +++ b/samples/minimal/Makefile.in @@ -162,7 +162,7 @@ minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc) $(__minimal___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@minimal.app/Contents/PkgInfo: minimal$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@minimal.app/Contents/PkgInfo: minimal$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p minimal.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p minimal.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p minimal.app/Contents/Resources @@ -171,7 +171,7 @@ minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/minimal/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >minimal.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >minimal.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >minimal.app/Contents/PkgInfo @@ -180,7 +180,7 @@ minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f minimal$(EXEEXT) minimal.app/Contents/MacOS/minimal @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns minimal.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns minimal.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@minimal_bundle: $(____minimal_BUNDLE_TGT_REF_DEP) diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in index d4a44ed66e..0dd7039eff 100644 --- a/samples/nativdlg/Makefile.in +++ b/samples/nativdlg/Makefile.in @@ -162,7 +162,7 @@ nativdlg$(EXEEXT): $(NATIVDLG_OBJECTS) $(__nativdlg___win32rc) $(__nativdlg___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@nativdlg.app/Contents/PkgInfo: nativdlg$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@nativdlg.app/Contents/PkgInfo: nativdlg$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p nativdlg.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p nativdlg.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p nativdlg.app/Contents/Resources @@ -171,7 +171,7 @@ nativdlg$(EXEEXT): $(NATIVDLG_OBJECTS) $(__nativdlg___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/nativdlg/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >nativdlg.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >nativdlg.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >nativdlg.app/Contents/PkgInfo @@ -180,7 +180,7 @@ nativdlg$(EXEEXT): $(NATIVDLG_OBJECTS) $(__nativdlg___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f nativdlg$(EXEEXT) nativdlg.app/Contents/MacOS/nativdlg @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns nativdlg.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 61584970ad..413ca5574c 100644 --- a/samples/notebook/Makefile.in +++ b/samples/notebook/Makefile.in @@ -162,7 +162,7 @@ notebook$(EXEEXT): $(NOTEBOOK_OBJECTS) $(__notebook___win32rc) $(__notebook___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@notebook.app/Contents/PkgInfo: notebook$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@notebook.app/Contents/PkgInfo: notebook$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p notebook.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p notebook.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p notebook.app/Contents/Resources @@ -171,7 +171,7 @@ notebook$(EXEEXT): $(NOTEBOOK_OBJECTS) $(__notebook___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/notebook/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >notebook.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >notebook.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >notebook.app/Contents/PkgInfo @@ -180,7 +180,7 @@ notebook$(EXEEXT): $(NOTEBOOK_OBJECTS) $(__notebook___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f notebook$(EXEEXT) notebook.app/Contents/MacOS/notebook @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns notebook.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 ec1df869cd..1b61f0e1c4 100644 --- a/samples/oleauto/Makefile.in +++ b/samples/oleauto/Makefile.in @@ -162,7 +162,7 @@ oleauto$(EXEEXT): $(OLEAUTO_OBJECTS) $(__oleauto___win32rc) $(__oleauto___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@oleauto.app/Contents/PkgInfo: oleauto$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@oleauto.app/Contents/PkgInfo: oleauto$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p oleauto.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p oleauto.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p oleauto.app/Contents/Resources @@ -171,7 +171,7 @@ oleauto$(EXEEXT): $(OLEAUTO_OBJECTS) $(__oleauto___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/oleauto/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >oleauto.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >oleauto.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >oleauto.app/Contents/PkgInfo @@ -180,7 +180,7 @@ oleauto$(EXEEXT): $(OLEAUTO_OBJECTS) $(__oleauto___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f oleauto$(EXEEXT) oleauto.app/Contents/MacOS/oleauto @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns oleauto.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns oleauto.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@oleauto_bundle: $(____oleauto_BUNDLE_TGT_REF_DEP) diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in index 2387e3560d..d511ead995 100644 --- a/samples/ownerdrw/Makefile.in +++ b/samples/ownerdrw/Makefile.in @@ -162,7 +162,7 @@ ownerdrw$(EXEEXT): $(OWNERDRW_OBJECTS) $(__ownerdrw___win32rc) $(__ownerdrw___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@ownerdrw.app/Contents/PkgInfo: ownerdrw$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@ownerdrw.app/Contents/PkgInfo: ownerdrw$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p ownerdrw.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p ownerdrw.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p ownerdrw.app/Contents/Resources @@ -171,7 +171,7 @@ ownerdrw$(EXEEXT): $(OWNERDRW_OBJECTS) $(__ownerdrw___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/ownerdrw/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >ownerdrw.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >ownerdrw.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >ownerdrw.app/Contents/PkgInfo @@ -180,7 +180,7 @@ ownerdrw$(EXEEXT): $(OWNERDRW_OBJECTS) $(__ownerdrw___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f ownerdrw$(EXEEXT) ownerdrw.app/Contents/MacOS/ownerdrw @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns ownerdrw.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns ownerdrw.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@ownerdrw_bundle: $(____ownerdrw_BUNDLE_TGT_REF_DEP) diff --git a/samples/popup/Makefile.in b/samples/popup/Makefile.in index 4c6f8cde48..8fe5616803 100644 --- a/samples/popup/Makefile.in +++ b/samples/popup/Makefile.in @@ -162,7 +162,7 @@ popup$(EXEEXT): $(POPUP_OBJECTS) $(__popup___win32rc) $(__popup___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@popup.app/Contents/PkgInfo: popup$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@popup.app/Contents/PkgInfo: popup$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p popup.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p popup.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p popup.app/Contents/Resources @@ -171,7 +171,7 @@ popup$(EXEEXT): $(POPUP_OBJECTS) $(__popup___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/popup/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >popup.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >popup.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >popup.app/Contents/PkgInfo @@ -180,7 +180,7 @@ popup$(EXEEXT): $(POPUP_OBJECTS) $(__popup___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f popup$(EXEEXT) popup.app/Contents/MacOS/popup @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns popup.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns popup.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@popup_bundle: $(____popup_BUNDLE_TGT_REF_DEP) diff --git a/samples/power/Makefile.in b/samples/power/Makefile.in index aa6cdaa3c7..5ce6938096 100644 --- a/samples/power/Makefile.in +++ b/samples/power/Makefile.in @@ -162,7 +162,7 @@ power$(EXEEXT): $(POWER_OBJECTS) $(__power___win32rc) $(__power___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@power.app/Contents/PkgInfo: power$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@power.app/Contents/PkgInfo: power$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p power.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p power.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p power.app/Contents/Resources @@ -171,7 +171,7 @@ power$(EXEEXT): $(POWER_OBJECTS) $(__power___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/power/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >power.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >power.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >power.app/Contents/PkgInfo @@ -180,7 +180,7 @@ power$(EXEEXT): $(POWER_OBJECTS) $(__power___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f power$(EXEEXT) power.app/Contents/MacOS/power @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns power.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns power.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@power_bundle: $(____power_BUNDLE_TGT_REF_DEP) diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in index add8d40c5c..e8d5fe1fd6 100644 --- a/samples/printing/Makefile.in +++ b/samples/printing/Makefile.in @@ -162,7 +162,7 @@ printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc) $(__printing___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p printing.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p printing.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p printing.app/Contents/Resources @@ -171,7 +171,7 @@ printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/printing/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >printing.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >printing.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >printing.app/Contents/PkgInfo @@ -180,7 +180,7 @@ printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f printing$(EXEEXT) printing.app/Contents/MacOS/printing @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns printing.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns printing.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@printing_bundle: $(____printing_BUNDLE_TGT_REF_DEP) diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in index 3801217933..e646376fc7 100644 --- a/samples/regtest/Makefile.in +++ b/samples/regtest/Makefile.in @@ -162,7 +162,7 @@ regtest$(EXEEXT): $(REGTEST_OBJECTS) $(__regtest___win32rc) $(__regtest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@regtest.app/Contents/PkgInfo: regtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@regtest.app/Contents/PkgInfo: regtest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p regtest.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p regtest.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p regtest.app/Contents/Resources @@ -171,7 +171,7 @@ regtest$(EXEEXT): $(REGTEST_OBJECTS) $(__regtest___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/regtest/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >regtest.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >regtest.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >regtest.app/Contents/PkgInfo @@ -180,7 +180,7 @@ regtest$(EXEEXT): $(REGTEST_OBJECTS) $(__regtest___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f regtest$(EXEEXT) regtest.app/Contents/MacOS/regtest @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns regtest.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 20b9f9bbd6..f2ccaaf541 100644 --- a/samples/render/Makefile.in +++ b/samples/render/Makefile.in @@ -194,7 +194,7 @@ render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc) $(__render___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p render.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p render.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p render.app/Contents/Resources @@ -203,7 +203,7 @@ render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/render/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >render.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >render.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >render.app/Contents/PkgInfo @@ -212,7 +212,7 @@ render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f render$(EXEEXT) render.app/Contents/MacOS/render @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns render.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns render.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@render_bundle: $(____render_BUNDLE_TGT_REF_DEP) diff --git a/samples/richtext/Makefile.in b/samples/richtext/Makefile.in index 6cbe165280..df503d416d 100644 --- a/samples/richtext/Makefile.in +++ b/samples/richtext/Makefile.in @@ -178,7 +178,7 @@ richtext$(EXEEXT): $(RICHTEXT_OBJECTS) $(__richtext___win32rc) $(__richtext___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@richtext.app/Contents/PkgInfo: richtext$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@richtext.app/Contents/PkgInfo: richtext$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p richtext.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p richtext.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p richtext.app/Contents/Resources @@ -187,7 +187,7 @@ richtext$(EXEEXT): $(RICHTEXT_OBJECTS) $(__richtext___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/richtext/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >richtext.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >richtext.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >richtext.app/Contents/PkgInfo @@ -196,7 +196,7 @@ richtext$(EXEEXT): $(RICHTEXT_OBJECTS) $(__richtext___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f richtext$(EXEEXT) richtext.app/Contents/MacOS/richtext @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns richtext.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns richtext.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@richtext_bundle: $(____richtext_BUNDLE_TGT_REF_DEP) diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in index 9785da8733..42bac30a00 100644 --- a/samples/sashtest/Makefile.in +++ b/samples/sashtest/Makefile.in @@ -175,7 +175,7 @@ sashtest$(EXEEXT): $(SASHTEST_OBJECTS) $(__sashtest___win32rc) $(__sashtest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@sashtest.app/Contents/PkgInfo: sashtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@sashtest.app/Contents/PkgInfo: sashtest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p sashtest.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p sashtest.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p sashtest.app/Contents/Resources @@ -184,7 +184,7 @@ sashtest$(EXEEXT): $(SASHTEST_OBJECTS) $(__sashtest___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/sashtest/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >sashtest.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >sashtest.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >sashtest.app/Contents/PkgInfo @@ -193,7 +193,7 @@ sashtest$(EXEEXT): $(SASHTEST_OBJECTS) $(__sashtest___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f sashtest$(EXEEXT) sashtest.app/Contents/MacOS/sashtest @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns sashtest.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 d7148483f2..779c0a3582 100644 --- a/samples/scroll/Makefile.in +++ b/samples/scroll/Makefile.in @@ -162,7 +162,7 @@ scroll$(EXEEXT): $(SCROLL_OBJECTS) $(__scroll___win32rc) $(__scroll___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@scroll.app/Contents/PkgInfo: scroll$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@scroll.app/Contents/PkgInfo: scroll$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p scroll.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p scroll.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p scroll.app/Contents/Resources @@ -171,7 +171,7 @@ scroll$(EXEEXT): $(SCROLL_OBJECTS) $(__scroll___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/scroll/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >scroll.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >scroll.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >scroll.app/Contents/PkgInfo @@ -180,7 +180,7 @@ scroll$(EXEEXT): $(SCROLL_OBJECTS) $(__scroll___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f scroll$(EXEEXT) scroll.app/Contents/MacOS/scroll @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns scroll.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 ea065766cd..e2270d77bc 100644 --- a/samples/scrollsub/Makefile.in +++ b/samples/scrollsub/Makefile.in @@ -162,7 +162,7 @@ scrollsub$(EXEEXT): $(SCROLLSUB_OBJECTS) $(__scrollsub___win32rc) $(__scrollsub___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@scrollsub.app/Contents/PkgInfo: scrollsub$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@scrollsub.app/Contents/PkgInfo: scrollsub$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p scrollsub.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p scrollsub.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p scrollsub.app/Contents/Resources @@ -171,7 +171,7 @@ scrollsub$(EXEEXT): $(SCROLLSUB_OBJECTS) $(__scrollsub___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/scrollsub/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >scrollsub.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >scrollsub.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >scrollsub.app/Contents/PkgInfo @@ -180,7 +180,7 @@ scrollsub$(EXEEXT): $(SCROLLSUB_OBJECTS) $(__scrollsub___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f scrollsub$(EXEEXT) scrollsub.app/Contents/MacOS/scrollsub @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns scrollsub.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 8aca84af96..a2c7e06903 100644 --- a/samples/shaped/Makefile.in +++ b/samples/shaped/Makefile.in @@ -162,7 +162,7 @@ shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc) $(__shaped___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p shaped.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p shaped.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p shaped.app/Contents/Resources @@ -171,7 +171,7 @@ shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/shaped/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >shaped.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >shaped.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >shaped.app/Contents/PkgInfo @@ -180,7 +180,7 @@ shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f shaped$(EXEEXT) shaped.app/Contents/MacOS/shaped @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns shaped.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 11ab40e0bc..e58f1a837e 100644 --- a/samples/sockets/Makefile.in +++ b/samples/sockets/Makefile.in @@ -217,7 +217,7 @@ distclean: clean @COND_USE_GUI_1@ $(__client___os2_emxbindcmd) @COND_USE_GUI_1@ $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1_USE_GUI_1@client.app/Contents/PkgInfo: $(__client___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1_USE_GUI_1@client.app/Contents/PkgInfo: $(__client___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p client.app/Contents @COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p client.app/Contents/MacOS @COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p client.app/Contents/Resources @@ -226,7 +226,7 @@ distclean: clean @COND_PLATFORM_MACOSX_1_USE_GUI_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/EXECUTABLE/client/" \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >client.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >client.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1_USE_GUI_1@ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ echo -n "APPL????" >client.app/Contents/PkgInfo @@ -235,7 +235,7 @@ distclean: clean @COND_PLATFORM_MACOSX_1_USE_GUI_1@ ln -f client$(EXEEXT) client.app/Contents/MacOS/client @COND_PLATFORM_MACOSX_1_USE_GUI_1@ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ -@COND_PLATFORM_MACOSX_1_USE_GUI_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns client.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns client.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1_USE_GUI_1@client_bundle: $(____client_BUNDLE_TGT_REF_DEP) @@ -246,7 +246,7 @@ distclean: clean @COND_USE_GUI_1@ $(__server___os2_emxbindcmd) @COND_USE_GUI_1@ $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1_USE_GUI_1@server.app/Contents/PkgInfo: $(__server___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1_USE_GUI_1@server.app/Contents/PkgInfo: $(__server___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p server.app/Contents @COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p server.app/Contents/MacOS @COND_PLATFORM_MACOSX_1_USE_GUI_1@ mkdir -p server.app/Contents/Resources @@ -255,7 +255,7 @@ distclean: clean @COND_PLATFORM_MACOSX_1_USE_GUI_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/EXECUTABLE/server/" \ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >server.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >server.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1_USE_GUI_1@ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ echo -n "APPL????" >server.app/Contents/PkgInfo @@ -264,7 +264,7 @@ distclean: clean @COND_PLATFORM_MACOSX_1_USE_GUI_1@ ln -f server$(EXEEXT) server.app/Contents/MacOS/server @COND_PLATFORM_MACOSX_1_USE_GUI_1@ @COND_PLATFORM_MACOSX_1_USE_GUI_1@ -@COND_PLATFORM_MACOSX_1_USE_GUI_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns server.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1_USE_GUI_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns server.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1_USE_GUI_1@server_bundle: $(____server_BUNDLE_TGT_REF_DEP) diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in index b5eb5d1be1..7242ded355 100644 --- a/samples/sound/Makefile.in +++ b/samples/sound/Makefile.in @@ -175,7 +175,7 @@ sound$(EXEEXT): $(SOUND_OBJECTS) $(__sound___win32rc) $(__sound___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p sound.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p sound.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p sound.app/Contents/Resources @@ -184,7 +184,7 @@ sound$(EXEEXT): $(SOUND_OBJECTS) $(__sound___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/sound/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >sound.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >sound.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >sound.app/Contents/PkgInfo @@ -193,7 +193,7 @@ sound$(EXEEXT): $(SOUND_OBJECTS) $(__sound___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f sound$(EXEEXT) sound.app/Contents/MacOS/sound @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns sound.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns sound.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@sound_bundle: $(____sound_BUNDLE_TGT_REF_DEP) diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in index ddcd3ca5fd..3bce91723a 100644 --- a/samples/splitter/Makefile.in +++ b/samples/splitter/Makefile.in @@ -162,7 +162,7 @@ splitter$(EXEEXT): $(SPLITTER_OBJECTS) $(__splitter___win32rc) $(__splitter___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@splitter.app/Contents/PkgInfo: splitter$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@splitter.app/Contents/PkgInfo: splitter$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p splitter.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p splitter.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p splitter.app/Contents/Resources @@ -171,7 +171,7 @@ splitter$(EXEEXT): $(SPLITTER_OBJECTS) $(__splitter___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/splitter/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >splitter.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >splitter.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >splitter.app/Contents/PkgInfo @@ -180,7 +180,7 @@ splitter$(EXEEXT): $(SPLITTER_OBJECTS) $(__splitter___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f splitter$(EXEEXT) splitter.app/Contents/MacOS/splitter @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns splitter.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 a800e4bf61..985ced91fc 100644 --- a/samples/statbar/Makefile.in +++ b/samples/statbar/Makefile.in @@ -162,7 +162,7 @@ statbar$(EXEEXT): $(STATBAR_OBJECTS) $(__statbar___win32rc) $(__statbar___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@statbar.app/Contents/PkgInfo: statbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@statbar.app/Contents/PkgInfo: statbar$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p statbar.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p statbar.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p statbar.app/Contents/Resources @@ -171,7 +171,7 @@ statbar$(EXEEXT): $(STATBAR_OBJECTS) $(__statbar___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/statbar/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >statbar.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >statbar.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >statbar.app/Contents/PkgInfo @@ -180,7 +180,7 @@ statbar$(EXEEXT): $(STATBAR_OBJECTS) $(__statbar___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f statbar$(EXEEXT) statbar.app/Contents/MacOS/statbar @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns statbar.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 b9609252d8..fc038c3b64 100644 --- a/samples/stc/Makefile.in +++ b/samples/stc/Makefile.in @@ -167,7 +167,7 @@ stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc) $(__stctest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p stctest.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p stctest.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p stctest.app/Contents/Resources @@ -176,7 +176,7 @@ stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/stctest/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >stctest.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >stctest.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >stctest.app/Contents/PkgInfo @@ -185,7 +185,7 @@ stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f stctest$(EXEEXT) stctest.app/Contents/MacOS/stctest @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns stctest.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 9fff3b6d5f..179ce9f591 100644 --- a/samples/svg/Makefile.in +++ b/samples/svg/Makefile.in @@ -162,7 +162,7 @@ svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc) $(__svgtest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p svgtest.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p svgtest.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p svgtest.app/Contents/Resources @@ -171,7 +171,7 @@ svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/svgtest/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >svgtest.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >svgtest.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >svgtest.app/Contents/PkgInfo @@ -180,7 +180,7 @@ svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f svgtest$(EXEEXT) svgtest.app/Contents/MacOS/svgtest @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns svgtest.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns svgtest.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@svgtest_bundle: $(____svgtest_BUNDLE_TGT_REF_DEP) diff --git a/samples/taborder/Makefile.in b/samples/taborder/Makefile.in index 88b52dd3f4..13d2c77403 100644 --- a/samples/taborder/Makefile.in +++ b/samples/taborder/Makefile.in @@ -162,7 +162,7 @@ taborder$(EXEEXT): $(TABORDER_OBJECTS) $(__taborder___win32rc) $(__taborder___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@taborder.app/Contents/PkgInfo: taborder$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@taborder.app/Contents/PkgInfo: taborder$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p taborder.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p taborder.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p taborder.app/Contents/Resources @@ -171,7 +171,7 @@ taborder$(EXEEXT): $(TABORDER_OBJECTS) $(__taborder___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/taborder/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >taborder.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >taborder.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >taborder.app/Contents/PkgInfo @@ -180,7 +180,7 @@ taborder$(EXEEXT): $(TABORDER_OBJECTS) $(__taborder___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f taborder$(EXEEXT) taborder.app/Contents/MacOS/taborder @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns taborder.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns taborder.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@taborder_bundle: $(____taborder_BUNDLE_TGT_REF_DEP) diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in index ebda8a609d..c0b9239600 100644 --- a/samples/taskbar/Makefile.in +++ b/samples/taskbar/Makefile.in @@ -175,7 +175,7 @@ taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc) $(__taskbar___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p taskbar.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p taskbar.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p taskbar.app/Contents/Resources @@ -184,7 +184,7 @@ taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/taskbar/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >taskbar.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >taskbar.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >taskbar.app/Contents/PkgInfo @@ -193,7 +193,7 @@ taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f taskbar$(EXEEXT) taskbar.app/Contents/MacOS/taskbar @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns taskbar.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 f6c3ee4294..a1b2d59087 100644 --- a/samples/text/Makefile.in +++ b/samples/text/Makefile.in @@ -162,7 +162,7 @@ text$(EXEEXT): $(TEXT_OBJECTS) $(__text___win32rc) $(__text___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@text.app/Contents/PkgInfo: text$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@text.app/Contents/PkgInfo: text$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p text.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p text.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p text.app/Contents/Resources @@ -171,7 +171,7 @@ text$(EXEEXT): $(TEXT_OBJECTS) $(__text___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/text/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >text.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >text.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >text.app/Contents/PkgInfo @@ -180,7 +180,7 @@ text$(EXEEXT): $(TEXT_OBJECTS) $(__text___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f text$(EXEEXT) text.app/Contents/MacOS/text @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns text.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 b41326b1ff..30c5b00527 100644 --- a/samples/thread/Makefile.in +++ b/samples/thread/Makefile.in @@ -162,7 +162,7 @@ thread$(EXEEXT): $(THREAD_OBJECTS) $(__thread___win32rc) $(__thread___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@thread.app/Contents/PkgInfo: thread$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@thread.app/Contents/PkgInfo: thread$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p thread.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p thread.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p thread.app/Contents/Resources @@ -171,7 +171,7 @@ thread$(EXEEXT): $(THREAD_OBJECTS) $(__thread___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/thread/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >thread.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >thread.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >thread.app/Contents/PkgInfo @@ -180,7 +180,7 @@ thread$(EXEEXT): $(THREAD_OBJECTS) $(__thread___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f thread$(EXEEXT) thread.app/Contents/MacOS/thread @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns thread.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 b33b4be83a..ab8653d44b 100644 --- a/samples/toolbar/Makefile.in +++ b/samples/toolbar/Makefile.in @@ -162,7 +162,7 @@ toolbar$(EXEEXT): $(TOOLBAR_OBJECTS) $(__toolbar___win32rc) $(__toolbar___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p toolbar.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p toolbar.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p toolbar.app/Contents/Resources @@ -171,7 +171,7 @@ toolbar$(EXEEXT): $(TOOLBAR_OBJECTS) $(__toolbar___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/toolbar/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >toolbar.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >toolbar.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >toolbar.app/Contents/PkgInfo @@ -180,7 +180,7 @@ toolbar$(EXEEXT): $(TOOLBAR_OBJECTS) $(__toolbar___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f toolbar$(EXEEXT) toolbar.app/Contents/MacOS/toolbar @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns toolbar.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 d4180bc89b..e4ffe589cc 100644 --- a/samples/treectrl/Makefile.in +++ b/samples/treectrl/Makefile.in @@ -162,7 +162,7 @@ treectrl$(EXEEXT): $(TREECTRL_OBJECTS) $(__treectrl___win32rc) $(__treectrl___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p treectrl.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p treectrl.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p treectrl.app/Contents/Resources @@ -171,7 +171,7 @@ treectrl$(EXEEXT): $(TREECTRL_OBJECTS) $(__treectrl___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/treectrl/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >treectrl.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >treectrl.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >treectrl.app/Contents/PkgInfo @@ -180,7 +180,7 @@ treectrl$(EXEEXT): $(TREECTRL_OBJECTS) $(__treectrl___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f treectrl$(EXEEXT) treectrl.app/Contents/MacOS/treectrl @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns treectrl.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 541dc2de00..373681d53b 100644 --- a/samples/typetest/Makefile.in +++ b/samples/typetest/Makefile.in @@ -162,7 +162,7 @@ typetest$(EXEEXT): $(TYPETEST_OBJECTS) $(__typetest___win32rc) $(__typetest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@typetest.app/Contents/PkgInfo: typetest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@typetest.app/Contents/PkgInfo: typetest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p typetest.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p typetest.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p typetest.app/Contents/Resources @@ -171,7 +171,7 @@ typetest$(EXEEXT): $(TYPETEST_OBJECTS) $(__typetest___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/typetest/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >typetest.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >typetest.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >typetest.app/Contents/PkgInfo @@ -180,7 +180,7 @@ typetest$(EXEEXT): $(TYPETEST_OBJECTS) $(__typetest___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f typetest$(EXEEXT) typetest.app/Contents/MacOS/typetest @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns typetest.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 56271fe93b..2708cf9102 100644 --- a/samples/validate/Makefile.in +++ b/samples/validate/Makefile.in @@ -162,7 +162,7 @@ validate$(EXEEXT): $(VALIDATE_OBJECTS) $(__validate___win32rc) $(__validate___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@validate.app/Contents/PkgInfo: validate$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@validate.app/Contents/PkgInfo: validate$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p validate.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p validate.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p validate.app/Contents/Resources @@ -171,7 +171,7 @@ validate$(EXEEXT): $(VALIDATE_OBJECTS) $(__validate___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/validate/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >validate.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >validate.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >validate.app/Contents/PkgInfo @@ -180,7 +180,7 @@ validate$(EXEEXT): $(VALIDATE_OBJECTS) $(__validate___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f validate$(EXEEXT) validate.app/Contents/MacOS/validate @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns validate.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 a0d07584b5..fffec4b01d 100644 --- a/samples/vscroll/Makefile.in +++ b/samples/vscroll/Makefile.in @@ -162,7 +162,7 @@ vstest$(EXEEXT): $(VSTEST_OBJECTS) $(__vstest___win32rc) $(__vstest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@vstest.app/Contents/PkgInfo: vstest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@vstest.app/Contents/PkgInfo: vstest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p vstest.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p vstest.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p vstest.app/Contents/Resources @@ -171,7 +171,7 @@ vstest$(EXEEXT): $(VSTEST_OBJECTS) $(__vstest___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/vstest/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >vstest.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >vstest.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >vstest.app/Contents/PkgInfo @@ -180,7 +180,7 @@ vstest$(EXEEXT): $(VSTEST_OBJECTS) $(__vstest___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f vstest$(EXEEXT) vstest.app/Contents/MacOS/vstest @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns vstest.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 3f6a9179b5..13f0369b76 100644 --- a/samples/widgets/Makefile.in +++ b/samples/widgets/Makefile.in @@ -200,7 +200,7 @@ widgets$(EXEEXT): $(WIDGETS_OBJECTS) $(__widgets___win32rc) $(__widgets___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@widgets.app/Contents/PkgInfo: widgets$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@widgets.app/Contents/PkgInfo: widgets$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p widgets.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p widgets.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p widgets.app/Contents/Resources @@ -209,7 +209,7 @@ widgets$(EXEEXT): $(WIDGETS_OBJECTS) $(__widgets___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/widgets/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >widgets.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >widgets.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >widgets.app/Contents/PkgInfo @@ -218,7 +218,7 @@ widgets$(EXEEXT): $(WIDGETS_OBJECTS) $(__widgets___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f widgets$(EXEEXT) widgets.app/Contents/MacOS/widgets @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns widgets.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/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 a5c4926bf8..256266244c 100644 --- a/samples/wizard/Makefile.in +++ b/samples/wizard/Makefile.in @@ -175,7 +175,7 @@ wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc) $(__wizard___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@wizard.app/Contents/PkgInfo: wizard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@wizard.app/Contents/PkgInfo: wizard$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p wizard.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p wizard.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p wizard.app/Contents/Resources @@ -184,7 +184,7 @@ wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/wizard/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >wizard.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >wizard.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >wizard.app/Contents/PkgInfo @@ -193,7 +193,7 @@ wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f wizard$(EXEEXT) wizard.app/Contents/MacOS/wizard @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns wizard.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns wizard.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@wizard_bundle: $(____wizard_BUNDLE_TGT_REF_DEP) diff --git a/samples/wrapsizer/Makefile.in b/samples/wrapsizer/Makefile.in index bedfe10d8e..b2102159bc 100644 --- a/samples/wrapsizer/Makefile.in +++ b/samples/wrapsizer/Makefile.in @@ -162,7 +162,7 @@ wrapsizer$(EXEEXT): $(WRAPSIZER_OBJECTS) $(__wrapsizer___win32rc) $(__wrapsizer___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@wrapsizer.app/Contents/PkgInfo: wrapsizer$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@wrapsizer.app/Contents/PkgInfo: wrapsizer$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p wrapsizer.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p wrapsizer.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p wrapsizer.app/Contents/Resources @@ -171,7 +171,7 @@ wrapsizer$(EXEEXT): $(WRAPSIZER_OBJECTS) $(__wrapsizer___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/wrapsizer/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >wrapsizer.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >wrapsizer.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >wrapsizer.app/Contents/PkgInfo @@ -180,7 +180,7 @@ wrapsizer$(EXEEXT): $(WRAPSIZER_OBJECTS) $(__wrapsizer___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f wrapsizer$(EXEEXT) wrapsizer.app/Contents/MacOS/wrapsizer @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns wrapsizer.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns wrapsizer.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@wrapsizer_bundle: $(____wrapsizer_BUNDLE_TGT_REF_DEP) diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in index 43b4f567f3..f53e41b749 100644 --- a/samples/xrc/Makefile.in +++ b/samples/xrc/Makefile.in @@ -181,7 +181,7 @@ xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc) $(__xrcdemo___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -@COND_PLATFORM_MACOSX_1@xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +@COND_PLATFORM_MACOSX_1@xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns @COND_PLATFORM_MACOSX_1@ mkdir -p xrcdemo.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p xrcdemo.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p xrcdemo.app/Contents/Resources @@ -190,7 +190,7 @@ xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc) @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/xrcdemo/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ -@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >xrcdemo.app/Contents/Info.plist +@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >xrcdemo.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >xrcdemo.app/Contents/PkgInfo @@ -199,7 +199,7 @@ xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc) @COND_PLATFORM_MACOSX_1@ ln -f xrcdemo$(EXEEXT) xrcdemo.app/Contents/MacOS/xrcdemo @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns xrcdemo.app/Contents/Resources/wxmac.icns +@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns xrcdemo.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@xrcdemo_bundle: $(____xrcdemo_BUNDLE_TGT_REF_DEP) -- 2.45.2