From 0b0efa9a672287c89dc19c345ecf840f15c484c6 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 27 Mar 2004 12:14:34 +0000 Subject: [PATCH] corrected Info.plist.in location git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/access/Makefile.in | 4 ++-- samples/artprov/Makefile.in | 4 ++-- samples/calendar/Makefile.in | 4 ++-- samples/caret/Makefile.in | 4 ++-- samples/checklst/Makefile.in | 4 ++-- samples/config/Makefile.in | 4 ++-- samples/controls/Makefile.in | 4 ++-- samples/db/Makefile.in | 4 ++-- samples/dialogs/Makefile.in | 4 ++-- samples/dialup/Makefile.in | 4 ++-- samples/display/Makefile.in | 4 ++-- samples/dnd/Makefile.in | 4 ++-- samples/docview/Makefile.in | 4 ++-- samples/docvwmdi/Makefile.in | 4 ++-- samples/dragimag/Makefile.in | 4 ++-- samples/drawing/Makefile.in | 4 ++-- samples/dynamic/Makefile.in | 4 ++-- samples/erase/Makefile.in | 4 ++-- samples/event/Makefile.in | 4 ++-- samples/except/Makefile.in | 4 ++-- samples/exec/Makefile.in | 4 ++-- samples/font/Makefile.in | 4 ++-- samples/grid/Makefile.in | 4 ++-- samples/help/Makefile.in | 4 ++-- samples/htlbox/Makefile.in | 4 ++-- samples/html/about/Makefile.in | 4 ++-- samples/html/help/Makefile.in | 4 ++-- samples/html/helpview/Makefile.in | 4 ++-- samples/html/printing/Makefile.in | 4 ++-- samples/html/test/Makefile.in | 4 ++-- samples/html/virtual/Makefile.in | 4 ++-- samples/html/widget/Makefile.in | 4 ++-- samples/html/zip/Makefile.in | 4 ++-- samples/image/Makefile.in | 4 ++-- samples/internat/Makefile.in | 4 ++-- samples/ipc/Makefile.in | 8 ++++---- samples/joytest/Makefile.in | 4 ++-- samples/keyboard/Makefile.in | 4 ++-- samples/layout/Makefile.in | 4 ++-- samples/listbox/Makefile.in | 4 ++-- samples/listctrl/Makefile.in | 4 ++-- samples/mdi/Makefile.in | 4 ++-- samples/memcheck/Makefile.in | 4 ++-- samples/menu/Makefile.in | 4 ++-- samples/mfc/Makefile.in | 4 ++-- samples/minifram/Makefile.in | 4 ++-- samples/minimal/Makefile.in | 4 ++-- samples/mobile/styles/Makefile.in | 4 ++-- samples/mobile/wxedit/Makefile.in | 4 ++-- samples/multimon/Makefile.in | 4 ++-- samples/nativdlg/Makefile.in | 4 ++-- samples/notebook/Makefile.in | 4 ++-- samples/oleauto/Makefile.in | 4 ++-- samples/opengl/cube/Makefile.in | 4 ++-- samples/opengl/isosurf/Makefile.in | 4 ++-- samples/opengl/penguin/Makefile.in | 4 ++-- samples/ownerdrw/Makefile.in | 4 ++-- samples/png/Makefile.in | 4 ++-- samples/printing/Makefile.in | 4 ++-- samples/propsize/Makefile.in | 4 ++-- samples/regtest/Makefile.in | 4 ++-- samples/render/Makefile.in | 4 ++-- samples/richedit/Makefile.in | 4 ++-- samples/rotate/Makefile.in | 4 ++-- samples/sashtest/Makefile.in | 4 ++-- samples/scroll/Makefile.in | 4 ++-- samples/scrollsub/Makefile.in | 4 ++-- samples/shaped/Makefile.in | 4 ++-- samples/sockets/Makefile.in | 8 ++++---- samples/sound/Makefile.in | 4 ++-- samples/splitter/Makefile.in | 4 ++-- samples/statbar/Makefile.in | 4 ++-- samples/tab/Makefile.in | 4 ++-- samples/taskbar/Makefile.in | 4 ++-- samples/text/Makefile.in | 4 ++-- samples/thread/Makefile.in | 4 ++-- samples/toolbar/Makefile.in | 4 ++-- samples/treectrl/Makefile.in | 4 ++-- samples/typetest/Makefile.in | 4 ++-- samples/validate/Makefile.in | 4 ++-- samples/vscroll/Makefile.in | 4 ++-- samples/wizard/Makefile.in | 4 ++-- samples/wxtest/Makefile.in | 4 ++-- 83 files changed, 170 insertions(+), 170 deletions(-) diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in index b569274f7a..8975f86459 100644 --- a/samples/access/Makefile.in +++ b/samples/access/Makefile.in @@ -128,7 +128,7 @@ accesstest$(EXEEXT): $(ACCESSTEST_OBJECTS) $(__accesstest___win32rc) $(__accesstest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -accesstest.app/Contents/PkgInfo: accesstest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +accesstest.app/Contents/PkgInfo: accesstest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p accesstest.app/Contents mkdir -p accesstest.app/Contents/MacOS mkdir -p accesstest.app/Contents/Resources @@ -137,7 +137,7 @@ accesstest.app/Contents/PkgInfo: accesstest$(EXEEXT) $(top_srcdir)/src/mac/Info. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/accesstest/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >accesstest.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >accesstest.app/Contents/Info.plist echo -n "APPL????" >accesstest.app/Contents/PkgInfo diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in index b1a628bd7c..b9d7dc294f 100644 --- a/samples/artprov/Makefile.in +++ b/samples/artprov/Makefile.in @@ -129,7 +129,7 @@ arttest$(EXEEXT): $(ARTTEST_OBJECTS) $(__arttest___win32rc) $(__arttest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -arttest.app/Contents/PkgInfo: arttest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +arttest.app/Contents/PkgInfo: arttest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p arttest.app/Contents mkdir -p arttest.app/Contents/MacOS mkdir -p arttest.app/Contents/Resources @@ -138,7 +138,7 @@ arttest.app/Contents/PkgInfo: arttest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/arttest/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >arttest.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >arttest.app/Contents/Info.plist echo -n "APPL????" >arttest.app/Contents/PkgInfo diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in index 35d1c1c48c..e6a04f7b4f 100644 --- a/samples/calendar/Makefile.in +++ b/samples/calendar/Makefile.in @@ -133,7 +133,7 @@ calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___win32rc) $(__calendar___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -calendar.app/Contents/PkgInfo: calendar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +calendar.app/Contents/PkgInfo: calendar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p calendar.app/Contents mkdir -p calendar.app/Contents/MacOS mkdir -p calendar.app/Contents/Resources @@ -142,7 +142,7 @@ calendar.app/Contents/PkgInfo: calendar$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/calendar/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >calendar.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >calendar.app/Contents/Info.plist echo -n "APPL????" >calendar.app/Contents/PkgInfo diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in index 0650ed892f..1056527147 100644 --- a/samples/caret/Makefile.in +++ b/samples/caret/Makefile.in @@ -128,7 +128,7 @@ caret$(EXEEXT): $(CARET_OBJECTS) $(__caret___win32rc) $(__caret___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -caret.app/Contents/PkgInfo: caret$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +caret.app/Contents/PkgInfo: caret$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p caret.app/Contents mkdir -p caret.app/Contents/MacOS mkdir -p caret.app/Contents/Resources @@ -137,7 +137,7 @@ caret.app/Contents/PkgInfo: caret$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/caret/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >caret.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >caret.app/Contents/Info.plist echo -n "APPL????" >caret.app/Contents/PkgInfo diff --git a/samples/checklst/Makefile.in b/samples/checklst/Makefile.in index 87e651bb77..735f0c180b 100644 --- a/samples/checklst/Makefile.in +++ b/samples/checklst/Makefile.in @@ -128,7 +128,7 @@ checklst$(EXEEXT): $(CHECKLST_OBJECTS) $(__checklst___win32rc) $(__checklst___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -checklst.app/Contents/PkgInfo: checklst$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +checklst.app/Contents/PkgInfo: checklst$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p checklst.app/Contents mkdir -p checklst.app/Contents/MacOS mkdir -p checklst.app/Contents/Resources @@ -137,7 +137,7 @@ checklst.app/Contents/PkgInfo: checklst$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/checklst/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >checklst.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >checklst.app/Contents/Info.plist echo -n "APPL????" >checklst.app/Contents/PkgInfo diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in index 9c6a40b89d..ed99188052 100644 --- a/samples/config/Makefile.in +++ b/samples/config/Makefile.in @@ -128,7 +128,7 @@ conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc) $(__conftest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -conftest.app/Contents/PkgInfo: conftest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +conftest.app/Contents/PkgInfo: conftest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p conftest.app/Contents mkdir -p conftest.app/Contents/MacOS mkdir -p conftest.app/Contents/Resources @@ -137,7 +137,7 @@ conftest.app/Contents/PkgInfo: conftest$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/conftest/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >conftest.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >conftest.app/Contents/Info.plist echo -n "APPL????" >conftest.app/Contents/PkgInfo diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in index 1d424d48d9..a1c13002cc 100644 --- a/samples/controls/Makefile.in +++ b/samples/controls/Makefile.in @@ -128,7 +128,7 @@ controls$(EXEEXT): $(CONTROLS_OBJECTS) $(__controls___win32rc) $(__controls___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -controls.app/Contents/PkgInfo: controls$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +controls.app/Contents/PkgInfo: controls$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p controls.app/Contents mkdir -p controls.app/Contents/MacOS mkdir -p controls.app/Contents/Resources @@ -137,7 +137,7 @@ controls.app/Contents/PkgInfo: controls$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/controls/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >controls.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >controls.app/Contents/Info.plist echo -n "APPL????" >controls.app/Contents/PkgInfo diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in index 03cf185b54..9bb81efba5 100644 --- a/samples/db/Makefile.in +++ b/samples/db/Makefile.in @@ -134,7 +134,7 @@ distclean: clean @COND_USE_ODBC_1@ $(__dbtest___os2_emxbindcmd) @COND_USE_ODBC_1@ $(SAMPLES_RPATH_POSTLINK) -dbtest.app/Contents/PkgInfo: $(__dbtest___depname) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +dbtest.app/Contents/PkgInfo: $(__dbtest___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p dbtest.app/Contents mkdir -p dbtest.app/Contents/MacOS mkdir -p dbtest.app/Contents/Resources @@ -143,7 +143,7 @@ dbtest.app/Contents/PkgInfo: $(__dbtest___depname) $(top_srcdir)/src/mac/Info.pl sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/dbtest/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >dbtest.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >dbtest.app/Contents/Info.plist echo -n "APPL????" >dbtest.app/Contents/PkgInfo diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index e79f34a380..eabf698862 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/Makefile.in @@ -133,7 +133,7 @@ dialogs$(EXEEXT): $(DIALOGS_OBJECTS) $(__dialogs___win32rc) $(__dialogs___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -dialogs.app/Contents/PkgInfo: dialogs$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +dialogs.app/Contents/PkgInfo: dialogs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p dialogs.app/Contents mkdir -p dialogs.app/Contents/MacOS mkdir -p dialogs.app/Contents/Resources @@ -142,7 +142,7 @@ dialogs.app/Contents/PkgInfo: dialogs$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/dialogs/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >dialogs.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >dialogs.app/Contents/Info.plist echo -n "APPL????" >dialogs.app/Contents/PkgInfo diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in index 66a1c1f41a..6b7a83d47f 100644 --- a/samples/dialup/Makefile.in +++ b/samples/dialup/Makefile.in @@ -128,7 +128,7 @@ nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc) $(__nettest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -nettest.app/Contents/PkgInfo: nettest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +nettest.app/Contents/PkgInfo: nettest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p nettest.app/Contents mkdir -p nettest.app/Contents/MacOS mkdir -p nettest.app/Contents/Resources @@ -137,7 +137,7 @@ nettest.app/Contents/PkgInfo: nettest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/nettest/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >nettest.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >nettest.app/Contents/Info.plist echo -n "APPL????" >nettest.app/Contents/PkgInfo diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in index 11647b4829..eb6b0887d1 100644 --- a/samples/display/Makefile.in +++ b/samples/display/Makefile.in @@ -128,7 +128,7 @@ display$(EXEEXT): $(DISPLAY_OBJECTS) $(__display___win32rc) $(__display___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -display.app/Contents/PkgInfo: display$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +display.app/Contents/PkgInfo: display$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p display.app/Contents mkdir -p display.app/Contents/MacOS mkdir -p display.app/Contents/Resources @@ -137,7 +137,7 @@ display.app/Contents/PkgInfo: display$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/display/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >display.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >display.app/Contents/Info.plist echo -n "APPL????" >display.app/Contents/PkgInfo diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in index 2951181b9c..375e626e72 100644 --- a/samples/dnd/Makefile.in +++ b/samples/dnd/Makefile.in @@ -127,7 +127,7 @@ dnd$(EXEEXT): $(DND_OBJECTS) $(__dnd___win32rc) $(__dnd___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -dnd.app/Contents/PkgInfo: dnd$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +dnd.app/Contents/PkgInfo: dnd$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p dnd.app/Contents mkdir -p dnd.app/Contents/MacOS mkdir -p dnd.app/Contents/Resources @@ -136,7 +136,7 @@ dnd.app/Contents/PkgInfo: dnd$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/dnd/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >dnd.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >dnd.app/Contents/Info.plist echo -n "APPL????" >dnd.app/Contents/PkgInfo diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in index f6f53ef324..c1ce8ba178 100644 --- a/samples/docview/Makefile.in +++ b/samples/docview/Makefile.in @@ -131,7 +131,7 @@ docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc) $(__docview___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -docview.app/Contents/PkgInfo: docview$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +docview.app/Contents/PkgInfo: docview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p docview.app/Contents mkdir -p docview.app/Contents/MacOS mkdir -p docview.app/Contents/Resources @@ -140,7 +140,7 @@ docview.app/Contents/PkgInfo: docview$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/docview/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >docview.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >docview.app/Contents/Info.plist echo -n "APPL????" >docview.app/Contents/PkgInfo diff --git a/samples/docvwmdi/Makefile.in b/samples/docvwmdi/Makefile.in index 742c9db30e..68d172c48c 100644 --- a/samples/docvwmdi/Makefile.in +++ b/samples/docvwmdi/Makefile.in @@ -130,7 +130,7 @@ docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc) $(__docview___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -docview.app/Contents/PkgInfo: docview$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +docview.app/Contents/PkgInfo: docview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p docview.app/Contents mkdir -p docview.app/Contents/MacOS mkdir -p docview.app/Contents/Resources @@ -139,7 +139,7 @@ docview.app/Contents/PkgInfo: docview$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/docview/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >docview.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >docview.app/Contents/Info.plist echo -n "APPL????" >docview.app/Contents/PkgInfo diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in index 1eb369adae..f049949573 100644 --- a/samples/dragimag/Makefile.in +++ b/samples/dragimag/Makefile.in @@ -128,7 +128,7 @@ dragimag$(EXEEXT): $(DRAGIMAG_OBJECTS) $(__dragimag___win32rc) $(__dragimag___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -dragimag.app/Contents/PkgInfo: dragimag$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +dragimag.app/Contents/PkgInfo: dragimag$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p dragimag.app/Contents mkdir -p dragimag.app/Contents/MacOS mkdir -p dragimag.app/Contents/Resources @@ -137,7 +137,7 @@ dragimag.app/Contents/PkgInfo: dragimag$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/dragimag/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >dragimag.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >dragimag.app/Contents/Info.plist echo -n "APPL????" >dragimag.app/Contents/PkgInfo diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in index 9193aff252..3bb6c16a95 100644 --- a/samples/drawing/Makefile.in +++ b/samples/drawing/Makefile.in @@ -128,7 +128,7 @@ drawing$(EXEEXT): $(DRAWING_OBJECTS) $(__drawing___win32rc) $(__drawing___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -drawing.app/Contents/PkgInfo: drawing$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +drawing.app/Contents/PkgInfo: drawing$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p drawing.app/Contents mkdir -p drawing.app/Contents/MacOS mkdir -p drawing.app/Contents/Resources @@ -137,7 +137,7 @@ drawing.app/Contents/PkgInfo: drawing$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/drawing/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >drawing.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >drawing.app/Contents/Info.plist echo -n "APPL????" >drawing.app/Contents/PkgInfo diff --git a/samples/dynamic/Makefile.in b/samples/dynamic/Makefile.in index 0534e30fe7..e528a9c068 100644 --- a/samples/dynamic/Makefile.in +++ b/samples/dynamic/Makefile.in @@ -128,7 +128,7 @@ dynamic$(EXEEXT): $(DYNAMIC_OBJECTS) $(__dynamic___win32rc) $(__dynamic___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -dynamic.app/Contents/PkgInfo: dynamic$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +dynamic.app/Contents/PkgInfo: dynamic$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p dynamic.app/Contents mkdir -p dynamic.app/Contents/MacOS mkdir -p dynamic.app/Contents/Resources @@ -137,7 +137,7 @@ dynamic.app/Contents/PkgInfo: dynamic$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/dynamic/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >dynamic.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >dynamic.app/Contents/Info.plist echo -n "APPL????" >dynamic.app/Contents/PkgInfo diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in index 718f34ffa4..46d326ae04 100644 --- a/samples/erase/Makefile.in +++ b/samples/erase/Makefile.in @@ -128,7 +128,7 @@ erase$(EXEEXT): $(ERASE_OBJECTS) $(__erase___win32rc) $(__erase___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -erase.app/Contents/PkgInfo: erase$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +erase.app/Contents/PkgInfo: erase$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p erase.app/Contents mkdir -p erase.app/Contents/MacOS mkdir -p erase.app/Contents/Resources @@ -137,7 +137,7 @@ erase.app/Contents/PkgInfo: erase$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/erase/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >erase.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >erase.app/Contents/Info.plist echo -n "APPL????" >erase.app/Contents/PkgInfo diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in index c6c71239d8..c1938eb87f 100644 --- a/samples/event/Makefile.in +++ b/samples/event/Makefile.in @@ -128,7 +128,7 @@ event$(EXEEXT): $(EVENT_OBJECTS) $(__event___win32rc) $(__event___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -event.app/Contents/PkgInfo: event$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +event.app/Contents/PkgInfo: event$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p event.app/Contents mkdir -p event.app/Contents/MacOS mkdir -p event.app/Contents/Resources @@ -137,7 +137,7 @@ event.app/Contents/PkgInfo: event$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/event/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >event.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >event.app/Contents/Info.plist echo -n "APPL????" >event.app/Contents/PkgInfo diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in index 0959b87123..82097b580f 100644 --- a/samples/except/Makefile.in +++ b/samples/except/Makefile.in @@ -128,7 +128,7 @@ except$(EXEEXT): $(EXCEPT_OBJECTS) $(__except___win32rc) $(__except___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -except.app/Contents/PkgInfo: except$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +except.app/Contents/PkgInfo: except$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p except.app/Contents mkdir -p except.app/Contents/MacOS mkdir -p except.app/Contents/Resources @@ -137,7 +137,7 @@ except.app/Contents/PkgInfo: except$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/except/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >except.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >except.app/Contents/Info.plist echo -n "APPL????" >except.app/Contents/PkgInfo diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in index 28230fa1d5..e5b47bf90c 100644 --- a/samples/exec/Makefile.in +++ b/samples/exec/Makefile.in @@ -128,7 +128,7 @@ exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc) $(__exec___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -exec.app/Contents/PkgInfo: exec$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +exec.app/Contents/PkgInfo: exec$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p exec.app/Contents mkdir -p exec.app/Contents/MacOS mkdir -p exec.app/Contents/Resources @@ -137,7 +137,7 @@ exec.app/Contents/PkgInfo: exec$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/exec/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >exec.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >exec.app/Contents/Info.plist echo -n "APPL????" >exec.app/Contents/PkgInfo diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in index 25b597bf30..906cb9ffdc 100644 --- a/samples/font/Makefile.in +++ b/samples/font/Makefile.in @@ -128,7 +128,7 @@ font$(EXEEXT): $(FONT_OBJECTS) $(__font___win32rc) $(__font___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -font.app/Contents/PkgInfo: font$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +font.app/Contents/PkgInfo: font$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p font.app/Contents mkdir -p font.app/Contents/MacOS mkdir -p font.app/Contents/Resources @@ -137,7 +137,7 @@ font.app/Contents/PkgInfo: font$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/font/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >font.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >font.app/Contents/Info.plist echo -n "APPL????" >font.app/Contents/PkgInfo diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in index b6fdda2b10..71affd704f 100644 --- a/samples/grid/Makefile.in +++ b/samples/grid/Makefile.in @@ -133,7 +133,7 @@ grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc) $(__grid___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -grid.app/Contents/PkgInfo: grid$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +grid.app/Contents/PkgInfo: grid$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p grid.app/Contents mkdir -p grid.app/Contents/MacOS mkdir -p grid.app/Contents/Resources @@ -142,7 +142,7 @@ grid.app/Contents/PkgInfo: grid$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/grid/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >grid.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >grid.app/Contents/Info.plist echo -n "APPL????" >grid.app/Contents/PkgInfo diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in index f03f46fe30..a16af99d86 100644 --- a/samples/help/Makefile.in +++ b/samples/help/Makefile.in @@ -132,7 +132,7 @@ help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc) $(__help___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p help.app/Contents mkdir -p help.app/Contents/MacOS mkdir -p help.app/Contents/Resources @@ -141,7 +141,7 @@ help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/help/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >help.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >help.app/Contents/Info.plist echo -n "APPL????" >help.app/Contents/PkgInfo diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in index 7a37ac56d3..b6b0c5a553 100644 --- a/samples/htlbox/Makefile.in +++ b/samples/htlbox/Makefile.in @@ -132,7 +132,7 @@ htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc) $(__htlbox___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p htlbox.app/Contents mkdir -p htlbox.app/Contents/MacOS mkdir -p htlbox.app/Contents/Resources @@ -141,7 +141,7 @@ htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/htlbox/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >htlbox.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >htlbox.app/Contents/Info.plist echo -n "APPL????" >htlbox.app/Contents/PkgInfo diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in index 32ca75b436..b4ac9aaa0a 100644 --- a/samples/html/about/Makefile.in +++ b/samples/html/about/Makefile.in @@ -132,7 +132,7 @@ about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc) $(__about___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -about.app/Contents/PkgInfo: about$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +about.app/Contents/PkgInfo: about$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p about.app/Contents mkdir -p about.app/Contents/MacOS mkdir -p about.app/Contents/Resources @@ -141,7 +141,7 @@ about.app/Contents/PkgInfo: about$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/about/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >about.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >about.app/Contents/Info.plist echo -n "APPL????" >about.app/Contents/PkgInfo diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in index 169a0c1847..476c977a64 100644 --- a/samples/html/help/Makefile.in +++ b/samples/html/help/Makefile.in @@ -132,7 +132,7 @@ help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc) $(__help___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p help.app/Contents mkdir -p help.app/Contents/MacOS mkdir -p help.app/Contents/Resources @@ -141,7 +141,7 @@ help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/help/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >help.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >help.app/Contents/Info.plist echo -n "APPL????" >help.app/Contents/PkgInfo diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in index 1103ac6599..d6f485b466 100644 --- a/samples/html/helpview/Makefile.in +++ b/samples/html/helpview/Makefile.in @@ -132,7 +132,7 @@ helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc) $(__helpview___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -helpview.app/Contents/PkgInfo: helpview$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +helpview.app/Contents/PkgInfo: helpview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p helpview.app/Contents mkdir -p helpview.app/Contents/MacOS mkdir -p helpview.app/Contents/Resources @@ -141,7 +141,7 @@ helpview.app/Contents/PkgInfo: helpview$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/helpview/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >helpview.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >helpview.app/Contents/Info.plist echo -n "APPL????" >helpview.app/Contents/PkgInfo diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in index 9c960a9811..4b37f73d0f 100644 --- a/samples/html/printing/Makefile.in +++ b/samples/html/printing/Makefile.in @@ -132,7 +132,7 @@ printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc) $(__printing___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p printing.app/Contents mkdir -p printing.app/Contents/MacOS mkdir -p printing.app/Contents/Resources @@ -141,7 +141,7 @@ printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/printing/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >printing.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >printing.app/Contents/Info.plist echo -n "APPL????" >printing.app/Contents/PkgInfo diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in index 7c4bc56cef..e19b8b7530 100644 --- a/samples/html/test/Makefile.in +++ b/samples/html/test/Makefile.in @@ -134,7 +134,7 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc) $(__test___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p test.app/Contents mkdir -p test.app/Contents/MacOS mkdir -p test.app/Contents/Resources @@ -143,7 +143,7 @@ test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/test/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >test.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >test.app/Contents/Info.plist echo -n "APPL????" >test.app/Contents/PkgInfo diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in index 87ed0d1989..6d8e305b8e 100644 --- a/samples/html/virtual/Makefile.in +++ b/samples/html/virtual/Makefile.in @@ -132,7 +132,7 @@ virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc) $(__virtual___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -virtual.app/Contents/PkgInfo: virtual$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +virtual.app/Contents/PkgInfo: virtual$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p virtual.app/Contents mkdir -p virtual.app/Contents/MacOS mkdir -p virtual.app/Contents/Resources @@ -141,7 +141,7 @@ virtual.app/Contents/PkgInfo: virtual$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/virtual/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >virtual.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >virtual.app/Contents/Info.plist echo -n "APPL????" >virtual.app/Contents/PkgInfo diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in index c85529d056..a1843ea449 100644 --- a/samples/html/widget/Makefile.in +++ b/samples/html/widget/Makefile.in @@ -132,7 +132,7 @@ widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc) $(__widget___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -widget.app/Contents/PkgInfo: widget$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +widget.app/Contents/PkgInfo: widget$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p widget.app/Contents mkdir -p widget.app/Contents/MacOS mkdir -p widget.app/Contents/Resources @@ -141,7 +141,7 @@ widget.app/Contents/PkgInfo: widget$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/widget/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >widget.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >widget.app/Contents/Info.plist echo -n "APPL????" >widget.app/Contents/PkgInfo diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in index 7a8668b22c..9b77bbe15b 100644 --- a/samples/html/zip/Makefile.in +++ b/samples/html/zip/Makefile.in @@ -131,7 +131,7 @@ zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc) $(__zip___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -zip.app/Contents/PkgInfo: zip$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +zip.app/Contents/PkgInfo: zip$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p zip.app/Contents mkdir -p zip.app/Contents/MacOS mkdir -p zip.app/Contents/Resources @@ -140,7 +140,7 @@ zip.app/Contents/PkgInfo: zip$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/zip/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >zip.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >zip.app/Contents/Info.plist echo -n "APPL????" >zip.app/Contents/PkgInfo diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in index 36d89ffcd5..5b43debd31 100644 --- a/samples/image/Makefile.in +++ b/samples/image/Makefile.in @@ -128,7 +128,7 @@ image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc) $(__image___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p image.app/Contents mkdir -p image.app/Contents/MacOS mkdir -p image.app/Contents/Resources @@ -137,7 +137,7 @@ image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/image/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >image.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >image.app/Contents/Info.plist echo -n "APPL????" >image.app/Contents/PkgInfo diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in index d9f0b46066..3ee30902dc 100644 --- a/samples/internat/Makefile.in +++ b/samples/internat/Makefile.in @@ -128,7 +128,7 @@ internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc) $(__internat___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p internat.app/Contents mkdir -p internat.app/Contents/MacOS mkdir -p internat.app/Contents/Resources @@ -137,7 +137,7 @@ internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/internat/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >internat.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >internat.app/Contents/Info.plist echo -n "APPL????" >internat.app/Contents/PkgInfo diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in index 68c13f64f2..637da5ec17 100644 --- a/samples/ipc/Makefile.in +++ b/samples/ipc/Makefile.in @@ -150,7 +150,7 @@ client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc) $(__client___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p client.app/Contents mkdir -p client.app/Contents/MacOS mkdir -p client.app/Contents/Resources @@ -159,7 +159,7 @@ client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/client/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >client.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >client.app/Contents/Info.plist echo -n "APPL????" >client.app/Contents/PkgInfo @@ -180,7 +180,7 @@ server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc) $(__server___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p server.app/Contents mkdir -p server.app/Contents/MacOS mkdir -p server.app/Contents/Resources @@ -189,7 +189,7 @@ server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/server/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >server.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >server.app/Contents/Info.plist echo -n "APPL????" >server.app/Contents/PkgInfo diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in index 86d7039958..3ddb310ce2 100644 --- a/samples/joytest/Makefile.in +++ b/samples/joytest/Makefile.in @@ -133,7 +133,7 @@ joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc) $(__joytest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p joytest.app/Contents mkdir -p joytest.app/Contents/MacOS mkdir -p joytest.app/Contents/Resources @@ -142,7 +142,7 @@ joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/joytest/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >joytest.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >joytest.app/Contents/Info.plist echo -n "APPL????" >joytest.app/Contents/PkgInfo diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in index 8348dc9da5..478e18628c 100644 --- a/samples/keyboard/Makefile.in +++ b/samples/keyboard/Makefile.in @@ -128,7 +128,7 @@ keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc) $(__keyboard___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p keyboard.app/Contents mkdir -p keyboard.app/Contents/MacOS mkdir -p keyboard.app/Contents/Resources @@ -137,7 +137,7 @@ keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/keyboard/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >keyboard.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >keyboard.app/Contents/Info.plist echo -n "APPL????" >keyboard.app/Contents/PkgInfo diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in index 50c0ace481..c695630629 100644 --- a/samples/layout/Makefile.in +++ b/samples/layout/Makefile.in @@ -128,7 +128,7 @@ layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc) $(__layout___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -layout.app/Contents/PkgInfo: layout$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +layout.app/Contents/PkgInfo: layout$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p layout.app/Contents mkdir -p layout.app/Contents/MacOS mkdir -p layout.app/Contents/Resources @@ -137,7 +137,7 @@ layout.app/Contents/PkgInfo: layout$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/layout/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >layout.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >layout.app/Contents/Info.plist echo -n "APPL????" >layout.app/Contents/PkgInfo diff --git a/samples/listbox/Makefile.in b/samples/listbox/Makefile.in index bc26fda3f9..aaeba601d6 100644 --- a/samples/listbox/Makefile.in +++ b/samples/listbox/Makefile.in @@ -128,7 +128,7 @@ listbox$(EXEEXT): $(LISTBOX_OBJECTS) $(__listbox___win32rc) $(__listbox___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -listbox.app/Contents/PkgInfo: listbox$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +listbox.app/Contents/PkgInfo: listbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p listbox.app/Contents mkdir -p listbox.app/Contents/MacOS mkdir -p listbox.app/Contents/Resources @@ -137,7 +137,7 @@ listbox.app/Contents/PkgInfo: listbox$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/listbox/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >listbox.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >listbox.app/Contents/Info.plist echo -n "APPL????" >listbox.app/Contents/PkgInfo diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in index 1a02e8813c..6360ac293e 100644 --- a/samples/listctrl/Makefile.in +++ b/samples/listctrl/Makefile.in @@ -128,7 +128,7 @@ listctrl$(EXEEXT): $(LISTCTRL_OBJECTS) $(__listctrl___win32rc) $(__listctrl___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -listctrl.app/Contents/PkgInfo: listctrl$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +listctrl.app/Contents/PkgInfo: listctrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p listctrl.app/Contents mkdir -p listctrl.app/Contents/MacOS mkdir -p listctrl.app/Contents/Resources @@ -137,7 +137,7 @@ listctrl.app/Contents/PkgInfo: listctrl$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/listctrl/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >listctrl.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >listctrl.app/Contents/Info.plist echo -n "APPL????" >listctrl.app/Contents/PkgInfo diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in index 4db5529699..d800751f6d 100644 --- a/samples/mdi/Makefile.in +++ b/samples/mdi/Makefile.in @@ -127,7 +127,7 @@ mdi$(EXEEXT): $(MDI_OBJECTS) $(__mdi___win32rc) $(__mdi___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -mdi.app/Contents/PkgInfo: mdi$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +mdi.app/Contents/PkgInfo: mdi$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p mdi.app/Contents mkdir -p mdi.app/Contents/MacOS mkdir -p mdi.app/Contents/Resources @@ -136,7 +136,7 @@ mdi.app/Contents/PkgInfo: mdi$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/mdi/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >mdi.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >mdi.app/Contents/Info.plist echo -n "APPL????" >mdi.app/Contents/PkgInfo diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in index 7ac80a376d..b2285427e5 100644 --- a/samples/memcheck/Makefile.in +++ b/samples/memcheck/Makefile.in @@ -128,7 +128,7 @@ memcheck$(EXEEXT): $(MEMCHECK_OBJECTS) $(__memcheck___win32rc) $(__memcheck___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -memcheck.app/Contents/PkgInfo: memcheck$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +memcheck.app/Contents/PkgInfo: memcheck$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p memcheck.app/Contents mkdir -p memcheck.app/Contents/MacOS mkdir -p memcheck.app/Contents/Resources @@ -137,7 +137,7 @@ memcheck.app/Contents/PkgInfo: memcheck$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/memcheck/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >memcheck.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >memcheck.app/Contents/Info.plist echo -n "APPL????" >memcheck.app/Contents/PkgInfo diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in index 3d7a18c96a..50dcc38ed3 100644 --- a/samples/menu/Makefile.in +++ b/samples/menu/Makefile.in @@ -128,7 +128,7 @@ menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc) $(__menu___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -menu.app/Contents/PkgInfo: menu$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +menu.app/Contents/PkgInfo: menu$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p menu.app/Contents mkdir -p menu.app/Contents/MacOS mkdir -p menu.app/Contents/Resources @@ -137,7 +137,7 @@ menu.app/Contents/PkgInfo: menu$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/menu/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >menu.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >menu.app/Contents/Info.plist echo -n "APPL????" >menu.app/Contents/PkgInfo diff --git a/samples/mfc/Makefile.in b/samples/mfc/Makefile.in index 19e50adf71..a762d2ddc3 100644 --- a/samples/mfc/Makefile.in +++ b/samples/mfc/Makefile.in @@ -128,7 +128,7 @@ mfctest$(EXEEXT): $(MFCTEST_OBJECTS) $(__mfctest___win32rc) $(__mfctest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -mfctest.app/Contents/PkgInfo: mfctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +mfctest.app/Contents/PkgInfo: mfctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p mfctest.app/Contents mkdir -p mfctest.app/Contents/MacOS mkdir -p mfctest.app/Contents/Resources @@ -137,7 +137,7 @@ mfctest.app/Contents/PkgInfo: mfctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/mfctest/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >mfctest.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >mfctest.app/Contents/Info.plist echo -n "APPL????" >mfctest.app/Contents/PkgInfo diff --git a/samples/minifram/Makefile.in b/samples/minifram/Makefile.in index 0efd2c4796..2e0645a13a 100644 --- a/samples/minifram/Makefile.in +++ b/samples/minifram/Makefile.in @@ -128,7 +128,7 @@ minifram$(EXEEXT): $(MINIFRAM_OBJECTS) $(__minifram___win32rc) $(__minifram___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -minifram.app/Contents/PkgInfo: minifram$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +minifram.app/Contents/PkgInfo: minifram$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p minifram.app/Contents mkdir -p minifram.app/Contents/MacOS mkdir -p minifram.app/Contents/Resources @@ -137,7 +137,7 @@ minifram.app/Contents/PkgInfo: minifram$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/minifram/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >minifram.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >minifram.app/Contents/Info.plist echo -n "APPL????" >minifram.app/Contents/PkgInfo diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in index 209c3f4597..dbe2425c63 100644 --- a/samples/minimal/Makefile.in +++ b/samples/minimal/Makefile.in @@ -128,7 +128,7 @@ minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc) $(__minimal___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -minimal.app/Contents/PkgInfo: minimal$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +minimal.app/Contents/PkgInfo: minimal$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p minimal.app/Contents mkdir -p minimal.app/Contents/MacOS mkdir -p minimal.app/Contents/Resources @@ -137,7 +137,7 @@ minimal.app/Contents/PkgInfo: minimal$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/minimal/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >minimal.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >minimal.app/Contents/Info.plist echo -n "APPL????" >minimal.app/Contents/PkgInfo diff --git a/samples/mobile/styles/Makefile.in b/samples/mobile/styles/Makefile.in index c7ee6f05d5..75f3ba05ea 100644 --- a/samples/mobile/styles/Makefile.in +++ b/samples/mobile/styles/Makefile.in @@ -128,7 +128,7 @@ styles$(EXEEXT): $(STYLES_OBJECTS) $(__styles___win32rc) $(__styles___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -styles.app/Contents/PkgInfo: styles$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +styles.app/Contents/PkgInfo: styles$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p styles.app/Contents mkdir -p styles.app/Contents/MacOS mkdir -p styles.app/Contents/Resources @@ -137,7 +137,7 @@ styles.app/Contents/PkgInfo: styles$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/styles/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >styles.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >styles.app/Contents/Info.plist echo -n "APPL????" >styles.app/Contents/PkgInfo diff --git a/samples/mobile/wxedit/Makefile.in b/samples/mobile/wxedit/Makefile.in index cc2a15782b..ed6b62bf63 100644 --- a/samples/mobile/wxedit/Makefile.in +++ b/samples/mobile/wxedit/Makefile.in @@ -128,7 +128,7 @@ wxedit$(EXEEXT): $(WXEDIT_OBJECTS) $(__wxedit___win32rc) $(__wxedit___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -wxedit.app/Contents/PkgInfo: wxedit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +wxedit.app/Contents/PkgInfo: wxedit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p wxedit.app/Contents mkdir -p wxedit.app/Contents/MacOS mkdir -p wxedit.app/Contents/Resources @@ -137,7 +137,7 @@ wxedit.app/Contents/PkgInfo: wxedit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/wxedit/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >wxedit.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >wxedit.app/Contents/Info.plist echo -n "APPL????" >wxedit.app/Contents/PkgInfo diff --git a/samples/multimon/Makefile.in b/samples/multimon/Makefile.in index 88a988e496..daf21eccca 100644 --- a/samples/multimon/Makefile.in +++ b/samples/multimon/Makefile.in @@ -132,7 +132,7 @@ multimon_test$(EXEEXT): $(MULTIMON_TEST_OBJECTS) $(__multimon_test___win32rc) $(__multimon_test___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -multimon_test.app/Contents/PkgInfo: multimon_test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +multimon_test.app/Contents/PkgInfo: multimon_test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p multimon_test.app/Contents mkdir -p multimon_test.app/Contents/MacOS mkdir -p multimon_test.app/Contents/Resources @@ -141,7 +141,7 @@ multimon_test.app/Contents/PkgInfo: multimon_test$(EXEEXT) $(top_srcdir)/src/mac sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/multimon_test/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >multimon_test.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >multimon_test.app/Contents/Info.plist echo -n "APPL????" >multimon_test.app/Contents/PkgInfo diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in index 748316fd8f..9a04eb957b 100644 --- a/samples/nativdlg/Makefile.in +++ b/samples/nativdlg/Makefile.in @@ -128,7 +128,7 @@ nativdlg$(EXEEXT): $(NATIVDLG_OBJECTS) $(__nativdlg___win32rc) $(__nativdlg___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -nativdlg.app/Contents/PkgInfo: nativdlg$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +nativdlg.app/Contents/PkgInfo: nativdlg$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p nativdlg.app/Contents mkdir -p nativdlg.app/Contents/MacOS mkdir -p nativdlg.app/Contents/Resources @@ -137,7 +137,7 @@ nativdlg.app/Contents/PkgInfo: nativdlg$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/nativdlg/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >nativdlg.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >nativdlg.app/Contents/Info.plist echo -n "APPL????" >nativdlg.app/Contents/PkgInfo diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in index eb296b3985..6535ad3e56 100644 --- a/samples/notebook/Makefile.in +++ b/samples/notebook/Makefile.in @@ -128,7 +128,7 @@ notebook$(EXEEXT): $(NOTEBOOK_OBJECTS) $(__notebook___win32rc) $(__notebook___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -notebook.app/Contents/PkgInfo: notebook$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +notebook.app/Contents/PkgInfo: notebook$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p notebook.app/Contents mkdir -p notebook.app/Contents/MacOS mkdir -p notebook.app/Contents/Resources @@ -137,7 +137,7 @@ notebook.app/Contents/PkgInfo: notebook$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/notebook/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >notebook.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >notebook.app/Contents/Info.plist echo -n "APPL????" >notebook.app/Contents/PkgInfo diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in index 4b5e83e596..4ce3a3d13c 100644 --- a/samples/oleauto/Makefile.in +++ b/samples/oleauto/Makefile.in @@ -128,7 +128,7 @@ oleauto$(EXEEXT): $(OLEAUTO_OBJECTS) $(__oleauto___win32rc) $(__oleauto___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -oleauto.app/Contents/PkgInfo: oleauto$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +oleauto.app/Contents/PkgInfo: oleauto$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p oleauto.app/Contents mkdir -p oleauto.app/Contents/MacOS mkdir -p oleauto.app/Contents/Resources @@ -137,7 +137,7 @@ oleauto.app/Contents/PkgInfo: oleauto$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/oleauto/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >oleauto.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >oleauto.app/Contents/Info.plist echo -n "APPL????" >oleauto.app/Contents/PkgInfo diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in index f4fa8cb449..161d9cdeff 100644 --- a/samples/opengl/cube/Makefile.in +++ b/samples/opengl/cube/Makefile.in @@ -129,7 +129,7 @@ cube$(EXEEXT): $(CUBE_OBJECTS) $(__cube___win32rc) $(__cube___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -cube.app/Contents/PkgInfo: cube$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +cube.app/Contents/PkgInfo: cube$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p cube.app/Contents mkdir -p cube.app/Contents/MacOS mkdir -p cube.app/Contents/Resources @@ -138,7 +138,7 @@ cube.app/Contents/PkgInfo: cube$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/cube/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >cube.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >cube.app/Contents/Info.plist echo -n "APPL????" >cube.app/Contents/PkgInfo diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in index 2968b1f06d..e3ec6b4cdd 100644 --- a/samples/opengl/isosurf/Makefile.in +++ b/samples/opengl/isosurf/Makefile.in @@ -129,7 +129,7 @@ isosurf$(EXEEXT): $(ISOSURF_OBJECTS) $(__isosurf___win32rc) $(__isosurf___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -isosurf.app/Contents/PkgInfo: isosurf$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +isosurf.app/Contents/PkgInfo: isosurf$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p isosurf.app/Contents mkdir -p isosurf.app/Contents/MacOS mkdir -p isosurf.app/Contents/Resources @@ -138,7 +138,7 @@ isosurf.app/Contents/PkgInfo: isosurf$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/isosurf/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >isosurf.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >isosurf.app/Contents/Info.plist echo -n "APPL????" >isosurf.app/Contents/PkgInfo diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in index 243968690f..9722fd5b83 100644 --- a/samples/opengl/penguin/Makefile.in +++ b/samples/opengl/penguin/Makefile.in @@ -137,7 +137,7 @@ penguin$(EXEEXT): $(PENGUIN_OBJECTS) $(__penguin___win32rc) $(__penguin___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -penguin.app/Contents/PkgInfo: penguin$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +penguin.app/Contents/PkgInfo: penguin$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p penguin.app/Contents mkdir -p penguin.app/Contents/MacOS mkdir -p penguin.app/Contents/Resources @@ -146,7 +146,7 @@ penguin.app/Contents/PkgInfo: penguin$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/penguin/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >penguin.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >penguin.app/Contents/Info.plist echo -n "APPL????" >penguin.app/Contents/PkgInfo diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in index 80971772a1..00fb25c925 100644 --- a/samples/ownerdrw/Makefile.in +++ b/samples/ownerdrw/Makefile.in @@ -128,7 +128,7 @@ ownerdrw$(EXEEXT): $(OWNERDRW_OBJECTS) $(__ownerdrw___win32rc) $(__ownerdrw___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -ownerdrw.app/Contents/PkgInfo: ownerdrw$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +ownerdrw.app/Contents/PkgInfo: ownerdrw$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p ownerdrw.app/Contents mkdir -p ownerdrw.app/Contents/MacOS mkdir -p ownerdrw.app/Contents/Resources @@ -137,7 +137,7 @@ ownerdrw.app/Contents/PkgInfo: ownerdrw$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/ownerdrw/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >ownerdrw.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >ownerdrw.app/Contents/Info.plist echo -n "APPL????" >ownerdrw.app/Contents/PkgInfo diff --git a/samples/png/Makefile.in b/samples/png/Makefile.in index 9a80e998d1..39bb0f81ca 100644 --- a/samples/png/Makefile.in +++ b/samples/png/Makefile.in @@ -127,7 +127,7 @@ png$(EXEEXT): $(PNG_OBJECTS) $(__png___win32rc) $(__png___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -png.app/Contents/PkgInfo: png$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +png.app/Contents/PkgInfo: png$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p png.app/Contents mkdir -p png.app/Contents/MacOS mkdir -p png.app/Contents/Resources @@ -136,7 +136,7 @@ png.app/Contents/PkgInfo: png$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/png/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >png.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >png.app/Contents/Info.plist echo -n "APPL????" >png.app/Contents/PkgInfo diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in index 92de24a287..f8e6fb03e1 100644 --- a/samples/printing/Makefile.in +++ b/samples/printing/Makefile.in @@ -128,7 +128,7 @@ printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc) $(__printing___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p printing.app/Contents mkdir -p printing.app/Contents/MacOS mkdir -p printing.app/Contents/Resources @@ -137,7 +137,7 @@ printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/printing/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >printing.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >printing.app/Contents/Info.plist echo -n "APPL????" >printing.app/Contents/PkgInfo diff --git a/samples/propsize/Makefile.in b/samples/propsize/Makefile.in index 834ade3d28..935c225b32 100644 --- a/samples/propsize/Makefile.in +++ b/samples/propsize/Makefile.in @@ -128,7 +128,7 @@ propsize$(EXEEXT): $(PROPSIZE_OBJECTS) $(__propsize___win32rc) $(__propsize___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -propsize.app/Contents/PkgInfo: propsize$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +propsize.app/Contents/PkgInfo: propsize$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p propsize.app/Contents mkdir -p propsize.app/Contents/MacOS mkdir -p propsize.app/Contents/Resources @@ -137,7 +137,7 @@ propsize.app/Contents/PkgInfo: propsize$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/propsize/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >propsize.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >propsize.app/Contents/Info.plist echo -n "APPL????" >propsize.app/Contents/PkgInfo diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in index 6ee504106a..721318a662 100644 --- a/samples/regtest/Makefile.in +++ b/samples/regtest/Makefile.in @@ -128,7 +128,7 @@ regtest$(EXEEXT): $(REGTEST_OBJECTS) $(__regtest___win32rc) $(__regtest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -regtest.app/Contents/PkgInfo: regtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +regtest.app/Contents/PkgInfo: regtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p regtest.app/Contents mkdir -p regtest.app/Contents/MacOS mkdir -p regtest.app/Contents/Resources @@ -137,7 +137,7 @@ regtest.app/Contents/PkgInfo: regtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/regtest/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >regtest.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >regtest.app/Contents/Info.plist echo -n "APPL????" >regtest.app/Contents/PkgInfo diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in index 5e11fa7978..9aec88a148 100644 --- a/samples/render/Makefile.in +++ b/samples/render/Makefile.in @@ -156,7 +156,7 @@ render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc) $(__render___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p render.app/Contents mkdir -p render.app/Contents/MacOS mkdir -p render.app/Contents/Resources @@ -165,7 +165,7 @@ render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/render/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >render.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >render.app/Contents/Info.plist echo -n "APPL????" >render.app/Contents/PkgInfo diff --git a/samples/richedit/Makefile.in b/samples/richedit/Makefile.in index 370f424814..5b35c09712 100644 --- a/samples/richedit/Makefile.in +++ b/samples/richedit/Makefile.in @@ -132,7 +132,7 @@ richedit$(EXEEXT): $(RICHEDIT_OBJECTS) $(__richedit___win32rc) $(__richedit___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -richedit.app/Contents/PkgInfo: richedit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +richedit.app/Contents/PkgInfo: richedit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p richedit.app/Contents mkdir -p richedit.app/Contents/MacOS mkdir -p richedit.app/Contents/Resources @@ -141,7 +141,7 @@ richedit.app/Contents/PkgInfo: richedit$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/richedit/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >richedit.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >richedit.app/Contents/Info.plist echo -n "APPL????" >richedit.app/Contents/PkgInfo diff --git a/samples/rotate/Makefile.in b/samples/rotate/Makefile.in index af0593b2d9..be020528d4 100644 --- a/samples/rotate/Makefile.in +++ b/samples/rotate/Makefile.in @@ -128,7 +128,7 @@ rotate$(EXEEXT): $(ROTATE_OBJECTS) $(__rotate___win32rc) $(__rotate___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -rotate.app/Contents/PkgInfo: rotate$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +rotate.app/Contents/PkgInfo: rotate$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p rotate.app/Contents mkdir -p rotate.app/Contents/MacOS mkdir -p rotate.app/Contents/Resources @@ -137,7 +137,7 @@ rotate.app/Contents/PkgInfo: rotate$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/rotate/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >rotate.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >rotate.app/Contents/Info.plist echo -n "APPL????" >rotate.app/Contents/PkgInfo diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in index f2111ada65..b13bde5865 100644 --- a/samples/sashtest/Makefile.in +++ b/samples/sashtest/Makefile.in @@ -133,7 +133,7 @@ sashtest$(EXEEXT): $(SASHTEST_OBJECTS) $(__sashtest___win32rc) $(__sashtest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -sashtest.app/Contents/PkgInfo: sashtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +sashtest.app/Contents/PkgInfo: sashtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p sashtest.app/Contents mkdir -p sashtest.app/Contents/MacOS mkdir -p sashtest.app/Contents/Resources @@ -142,7 +142,7 @@ sashtest.app/Contents/PkgInfo: sashtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/sashtest/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >sashtest.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >sashtest.app/Contents/Info.plist echo -n "APPL????" >sashtest.app/Contents/PkgInfo diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in index eff9281dfa..5488f4557d 100644 --- a/samples/scroll/Makefile.in +++ b/samples/scroll/Makefile.in @@ -128,7 +128,7 @@ scroll$(EXEEXT): $(SCROLL_OBJECTS) $(__scroll___win32rc) $(__scroll___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -scroll.app/Contents/PkgInfo: scroll$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +scroll.app/Contents/PkgInfo: scroll$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p scroll.app/Contents mkdir -p scroll.app/Contents/MacOS mkdir -p scroll.app/Contents/Resources @@ -137,7 +137,7 @@ scroll.app/Contents/PkgInfo: scroll$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/scroll/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >scroll.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >scroll.app/Contents/Info.plist echo -n "APPL????" >scroll.app/Contents/PkgInfo diff --git a/samples/scrollsub/Makefile.in b/samples/scrollsub/Makefile.in index a7f6e19859..1d4cc01db4 100644 --- a/samples/scrollsub/Makefile.in +++ b/samples/scrollsub/Makefile.in @@ -128,7 +128,7 @@ scrollsub$(EXEEXT): $(SCROLLSUB_OBJECTS) $(__scrollsub___win32rc) $(__scrollsub___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -scrollsub.app/Contents/PkgInfo: scrollsub$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +scrollsub.app/Contents/PkgInfo: scrollsub$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p scrollsub.app/Contents mkdir -p scrollsub.app/Contents/MacOS mkdir -p scrollsub.app/Contents/Resources @@ -137,7 +137,7 @@ scrollsub.app/Contents/PkgInfo: scrollsub$(EXEEXT) $(top_srcdir)/src/mac/Info.pl sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/scrollsub/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >scrollsub.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >scrollsub.app/Contents/Info.plist echo -n "APPL????" >scrollsub.app/Contents/PkgInfo diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in index a9d31e7491..d8b7b2b81c 100644 --- a/samples/shaped/Makefile.in +++ b/samples/shaped/Makefile.in @@ -128,7 +128,7 @@ shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc) $(__shaped___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p shaped.app/Contents mkdir -p shaped.app/Contents/MacOS mkdir -p shaped.app/Contents/Resources @@ -137,7 +137,7 @@ shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/shaped/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >shaped.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >shaped.app/Contents/Info.plist echo -n "APPL????" >shaped.app/Contents/PkgInfo diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in index cec9e621ae..dfe6152211 100644 --- a/samples/sockets/Makefile.in +++ b/samples/sockets/Makefile.in @@ -150,7 +150,7 @@ client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc) $(__client___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p client.app/Contents mkdir -p client.app/Contents/MacOS mkdir -p client.app/Contents/Resources @@ -159,7 +159,7 @@ client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/client/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >client.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >client.app/Contents/Info.plist echo -n "APPL????" >client.app/Contents/PkgInfo @@ -180,7 +180,7 @@ server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc) $(__server___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p server.app/Contents mkdir -p server.app/Contents/MacOS mkdir -p server.app/Contents/Resources @@ -189,7 +189,7 @@ server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/server/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >server.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >server.app/Contents/Info.plist echo -n "APPL????" >server.app/Contents/PkgInfo diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in index 630c3edf80..0e9902e24c 100644 --- a/samples/sound/Makefile.in +++ b/samples/sound/Makefile.in @@ -133,7 +133,7 @@ sound$(EXEEXT): $(SOUND_OBJECTS) $(__sound___win32rc) $(__sound___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p sound.app/Contents mkdir -p sound.app/Contents/MacOS mkdir -p sound.app/Contents/Resources @@ -142,7 +142,7 @@ sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/sound/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >sound.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >sound.app/Contents/Info.plist echo -n "APPL????" >sound.app/Contents/PkgInfo diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in index a982a8fa4d..40cfefdc77 100644 --- a/samples/splitter/Makefile.in +++ b/samples/splitter/Makefile.in @@ -128,7 +128,7 @@ splitter$(EXEEXT): $(SPLITTER_OBJECTS) $(__splitter___win32rc) $(__splitter___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -splitter.app/Contents/PkgInfo: splitter$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +splitter.app/Contents/PkgInfo: splitter$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p splitter.app/Contents mkdir -p splitter.app/Contents/MacOS mkdir -p splitter.app/Contents/Resources @@ -137,7 +137,7 @@ splitter.app/Contents/PkgInfo: splitter$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/splitter/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >splitter.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >splitter.app/Contents/Info.plist echo -n "APPL????" >splitter.app/Contents/PkgInfo diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in index 9857fab8bc..2818add9b0 100644 --- a/samples/statbar/Makefile.in +++ b/samples/statbar/Makefile.in @@ -128,7 +128,7 @@ statbar$(EXEEXT): $(STATBAR_OBJECTS) $(__statbar___win32rc) $(__statbar___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -statbar.app/Contents/PkgInfo: statbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +statbar.app/Contents/PkgInfo: statbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p statbar.app/Contents mkdir -p statbar.app/Contents/MacOS mkdir -p statbar.app/Contents/Resources @@ -137,7 +137,7 @@ statbar.app/Contents/PkgInfo: statbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/statbar/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >statbar.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >statbar.app/Contents/Info.plist echo -n "APPL????" >statbar.app/Contents/PkgInfo diff --git a/samples/tab/Makefile.in b/samples/tab/Makefile.in index 2df71ae0b1..40f36a8bb7 100644 --- a/samples/tab/Makefile.in +++ b/samples/tab/Makefile.in @@ -127,7 +127,7 @@ tab$(EXEEXT): $(TAB_OBJECTS) $(__tab___win32rc) $(__tab___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -tab.app/Contents/PkgInfo: tab$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +tab.app/Contents/PkgInfo: tab$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p tab.app/Contents mkdir -p tab.app/Contents/MacOS mkdir -p tab.app/Contents/Resources @@ -136,7 +136,7 @@ tab.app/Contents/PkgInfo: tab$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/tab/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >tab.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >tab.app/Contents/Info.plist echo -n "APPL????" >tab.app/Contents/PkgInfo diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in index f7a4f13ab0..3b2243b6e6 100644 --- a/samples/taskbar/Makefile.in +++ b/samples/taskbar/Makefile.in @@ -133,7 +133,7 @@ taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc) $(__taskbar___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p taskbar.app/Contents mkdir -p taskbar.app/Contents/MacOS mkdir -p taskbar.app/Contents/Resources @@ -142,7 +142,7 @@ taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/taskbar/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >taskbar.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >taskbar.app/Contents/Info.plist echo -n "APPL????" >taskbar.app/Contents/PkgInfo diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in index 94fa4837df..b114e652b8 100644 --- a/samples/text/Makefile.in +++ b/samples/text/Makefile.in @@ -128,7 +128,7 @@ text$(EXEEXT): $(TEXT_OBJECTS) $(__text___win32rc) $(__text___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -text.app/Contents/PkgInfo: text$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +text.app/Contents/PkgInfo: text$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p text.app/Contents mkdir -p text.app/Contents/MacOS mkdir -p text.app/Contents/Resources @@ -137,7 +137,7 @@ text.app/Contents/PkgInfo: text$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/text/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >text.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >text.app/Contents/Info.plist echo -n "APPL????" >text.app/Contents/PkgInfo diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in index e5e9b9f3f4..23927bf2ff 100644 --- a/samples/thread/Makefile.in +++ b/samples/thread/Makefile.in @@ -128,7 +128,7 @@ thread$(EXEEXT): $(THREAD_OBJECTS) $(__thread___win32rc) $(__thread___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -thread.app/Contents/PkgInfo: thread$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +thread.app/Contents/PkgInfo: thread$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p thread.app/Contents mkdir -p thread.app/Contents/MacOS mkdir -p thread.app/Contents/Resources @@ -137,7 +137,7 @@ thread.app/Contents/PkgInfo: thread$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/thread/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >thread.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >thread.app/Contents/Info.plist echo -n "APPL????" >thread.app/Contents/PkgInfo diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in index 33a0c6c61f..4a159916d0 100644 --- a/samples/toolbar/Makefile.in +++ b/samples/toolbar/Makefile.in @@ -128,7 +128,7 @@ toolbar$(EXEEXT): $(TOOLBAR_OBJECTS) $(__toolbar___win32rc) $(__toolbar___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p toolbar.app/Contents mkdir -p toolbar.app/Contents/MacOS mkdir -p toolbar.app/Contents/Resources @@ -137,7 +137,7 @@ toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/toolbar/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >toolbar.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >toolbar.app/Contents/Info.plist echo -n "APPL????" >toolbar.app/Contents/PkgInfo diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in index cffb0fcc1d..4aa8c06d92 100644 --- a/samples/treectrl/Makefile.in +++ b/samples/treectrl/Makefile.in @@ -128,7 +128,7 @@ treectrl$(EXEEXT): $(TREECTRL_OBJECTS) $(__treectrl___win32rc) $(__treectrl___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p treectrl.app/Contents mkdir -p treectrl.app/Contents/MacOS mkdir -p treectrl.app/Contents/Resources @@ -137,7 +137,7 @@ treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/treectrl/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >treectrl.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >treectrl.app/Contents/Info.plist echo -n "APPL????" >treectrl.app/Contents/PkgInfo diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in index 0dfdd72673..5959f47db1 100644 --- a/samples/typetest/Makefile.in +++ b/samples/typetest/Makefile.in @@ -128,7 +128,7 @@ typetest$(EXEEXT): $(TYPETEST_OBJECTS) $(__typetest___win32rc) $(__typetest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -typetest.app/Contents/PkgInfo: typetest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +typetest.app/Contents/PkgInfo: typetest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p typetest.app/Contents mkdir -p typetest.app/Contents/MacOS mkdir -p typetest.app/Contents/Resources @@ -137,7 +137,7 @@ typetest.app/Contents/PkgInfo: typetest$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/typetest/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >typetest.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >typetest.app/Contents/Info.plist echo -n "APPL????" >typetest.app/Contents/PkgInfo diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in index c30b93e0bb..2fb1f05cd6 100644 --- a/samples/validate/Makefile.in +++ b/samples/validate/Makefile.in @@ -128,7 +128,7 @@ validate$(EXEEXT): $(VALIDATE_OBJECTS) $(__validate___win32rc) $(__validate___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -validate.app/Contents/PkgInfo: validate$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +validate.app/Contents/PkgInfo: validate$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p validate.app/Contents mkdir -p validate.app/Contents/MacOS mkdir -p validate.app/Contents/Resources @@ -137,7 +137,7 @@ validate.app/Contents/PkgInfo: validate$(EXEEXT) $(top_srcdir)/src/mac/Info.plis sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/validate/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >validate.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >validate.app/Contents/Info.plist echo -n "APPL????" >validate.app/Contents/PkgInfo diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in index 88f8c115a2..f2e2d0dfa9 100644 --- a/samples/vscroll/Makefile.in +++ b/samples/vscroll/Makefile.in @@ -128,7 +128,7 @@ vstest$(EXEEXT): $(VSTEST_OBJECTS) $(__vstest___win32rc) $(__vstest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -vstest.app/Contents/PkgInfo: vstest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +vstest.app/Contents/PkgInfo: vstest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p vstest.app/Contents mkdir -p vstest.app/Contents/MacOS mkdir -p vstest.app/Contents/Resources @@ -137,7 +137,7 @@ vstest.app/Contents/PkgInfo: vstest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/vstest/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >vstest.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >vstest.app/Contents/Info.plist echo -n "APPL????" >vstest.app/Contents/PkgInfo diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in index a4d73de7d3..9db12c1d6c 100644 --- a/samples/wizard/Makefile.in +++ b/samples/wizard/Makefile.in @@ -133,7 +133,7 @@ wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc) $(__wizard___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -wizard.app/Contents/PkgInfo: wizard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +wizard.app/Contents/PkgInfo: wizard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p wizard.app/Contents mkdir -p wizard.app/Contents/MacOS mkdir -p wizard.app/Contents/Resources @@ -142,7 +142,7 @@ wizard.app/Contents/PkgInfo: wizard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/wizard/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >wizard.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >wizard.app/Contents/Info.plist echo -n "APPL????" >wizard.app/Contents/PkgInfo diff --git a/samples/wxtest/Makefile.in b/samples/wxtest/Makefile.in index e4ce61b102..7896d1322a 100644 --- a/samples/wxtest/Makefile.in +++ b/samples/wxtest/Makefile.in @@ -129,7 +129,7 @@ wxtest$(EXEEXT): $(WXTEST_OBJECTS) $(__wxtest___win32rc) $(__wxtest___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -wxtest.app/Contents/PkgInfo: wxtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +wxtest.app/Contents/PkgInfo: wxtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p wxtest.app/Contents mkdir -p wxtest.app/Contents/MacOS mkdir -p wxtest.app/Contents/Resources @@ -138,7 +138,7 @@ wxtest.app/Contents/PkgInfo: wxtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/wxtest/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >wxtest.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >wxtest.app/Contents/Info.plist echo -n "APPL????" >wxtest.app/Contents/PkgInfo -- 2.45.2