corrected Info.plist.in location

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/samples/animate/Makefile.in b/contrib/samples/animate/Makefile.in
index e540ff0d8477323d6d999cad2b9f078ba86c3df3..13d1ee217c90f9762a4f6f95c46871e19b4c4980 100644 (file)
--- a/contrib/samples/animate/Makefile.in
+++ b/contrib/samples/animate/Makefile.in
@@ -130,7 +130,7 @@ anitest$(EXEEXT): $(ANITEST_OBJECTS) $(__anitest___win32rc)
        $(__anitest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__anitest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-anitest.app/Contents/PkgInfo: anitest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+anitest.app/Contents/PkgInfo: anitest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p anitest.app/Contents
        mkdir -p anitest.app/Contents/MacOS
        mkdir -p anitest.app/Contents/Resources
        mkdir -p anitest.app/Contents
        mkdir -p anitest.app/Contents/MacOS
        mkdir -p anitest.app/Contents/Resources


@@ -139,7 +139,7 @@ anitest.app/Contents/PkgInfo: anitest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/anitest/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/anitest/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >anitest.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >anitest.app/Contents/Info.plist

        
        
        echo -n "APPL????" >anitest.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >anitest.app/Contents/PkgInfo

diff --git a/contrib/samples/deprecated/proplist/Makefile.in b/contrib/samples/deprecated/proplist/Makefile.in
index 7f231554e472dc68e892afebdd3873a9f339b4d6..34247d87a047d9e1bae7954b4fc00aaf0d19c02f 100644 (file)
--- a/contrib/samples/deprecated/proplist/Makefile.in
+++ b/contrib/samples/deprecated/proplist/Makefile.in
@@ -130,7 +130,7 @@ proplist$(EXEEXT): $(PROPLIST_OBJECTS) $(__proplist___win32rc)
        $(__proplist___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__proplist___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-proplist.app/Contents/PkgInfo: proplist$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+proplist.app/Contents/PkgInfo: proplist$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p proplist.app/Contents
        mkdir -p proplist.app/Contents/MacOS
        mkdir -p proplist.app/Contents/Resources
        mkdir -p proplist.app/Contents
        mkdir -p proplist.app/Contents/MacOS
        mkdir -p proplist.app/Contents/Resources


@@ -139,7 +139,7 @@ proplist.app/Contents/PkgInfo: proplist$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/proplist/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/proplist/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >proplist.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >proplist.app/Contents/Info.plist

        
        
        echo -n "APPL????" >proplist.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >proplist.app/Contents/PkgInfo

diff --git a/contrib/samples/deprecated/resource/Makefile.in b/contrib/samples/deprecated/resource/Makefile.in
index b6ad327b80c10448b87d2d5c3549a05105395035..c61405a5e751c98fea882b84a7f3d4843444ea61 100644 (file)
--- a/contrib/samples/deprecated/resource/Makefile.in
+++ b/contrib/samples/deprecated/resource/Makefile.in
@@ -130,7 +130,7 @@ resource$(EXEEXT): $(RESOURCE_OBJECTS) $(__resource___win32rc)
        $(__resource___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__resource___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-resource.app/Contents/PkgInfo: resource$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+resource.app/Contents/PkgInfo: resource$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p resource.app/Contents
        mkdir -p resource.app/Contents/MacOS
        mkdir -p resource.app/Contents/Resources
        mkdir -p resource.app/Contents
        mkdir -p resource.app/Contents/MacOS
        mkdir -p resource.app/Contents/Resources


@@ -139,7 +139,7 @@ resource.app/Contents/PkgInfo: resource$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/resource/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/resource/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >resource.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >resource.app/Contents/Info.plist

        
        
        echo -n "APPL????" >resource.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >resource.app/Contents/PkgInfo

diff --git a/contrib/samples/deprecated/treelay/Makefile.in b/contrib/samples/deprecated/treelay/Makefile.in
index ad6699753f6552cfe9fa8b94ca0b15df7e66d276..0c38607aa15a58cd9e41da3833a0d7973c60836a 100644 (file)
--- a/contrib/samples/deprecated/treelay/Makefile.in
+++ b/contrib/samples/deprecated/treelay/Makefile.in
@@ -130,7 +130,7 @@ treelay$(EXEEXT): $(TREELAY_OBJECTS) $(__treelay___win32rc)
        $(__treelay___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__treelay___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-treelay.app/Contents/PkgInfo: treelay$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+treelay.app/Contents/PkgInfo: treelay$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p treelay.app/Contents
        mkdir -p treelay.app/Contents/MacOS
        mkdir -p treelay.app/Contents/Resources
        mkdir -p treelay.app/Contents
        mkdir -p treelay.app/Contents/MacOS
        mkdir -p treelay.app/Contents/Resources


@@ -139,7 +139,7 @@ treelay.app/Contents/PkgInfo: treelay$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/treelay/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/treelay/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >treelay.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >treelay.app/Contents/Info.plist

        
        
        echo -n "APPL????" >treelay.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >treelay.app/Contents/PkgInfo

diff --git a/contrib/samples/fl/Makefile.in b/contrib/samples/fl/Makefile.in
index 5deb766cfbaa60ec1b4650ba525f1e1db9779ff6..f91e9a0306ff84d160a8087e703bc81139da6919 100644 (file)
--- a/contrib/samples/fl/Makefile.in
+++ b/contrib/samples/fl/Makefile.in
@@ -221,7 +221,7 @@ fl_demo1$(EXEEXT): $(FL_DEMO1_OBJECTS) $(__fl_demo1___win32rc)
        $(__fl_demo1___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__fl_demo1___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-fl_demo1.app/Contents/PkgInfo: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+fl_demo1.app/Contents/PkgInfo: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p fl_demo1.app/Contents
        mkdir -p fl_demo1.app/Contents/MacOS
        mkdir -p fl_demo1.app/Contents/Resources
        mkdir -p fl_demo1.app/Contents
        mkdir -p fl_demo1.app/Contents/MacOS
        mkdir -p fl_demo1.app/Contents/Resources


@@ -230,7 +230,7 @@ fl_demo1.app/Contents/PkgInfo: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/fl_demo1/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/fl_demo1/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >fl_demo1.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >fl_demo1.app/Contents/Info.plist

        
        
        echo -n "APPL????" >fl_demo1.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >fl_demo1.app/Contents/PkgInfo


@@ -251,7 +251,7 @@ fl_demo2$(EXEEXT): $(FL_DEMO2_OBJECTS) $(__fl_demo2___win32rc)
        $(__fl_demo2___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__fl_demo2___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-fl_demo2.app/Contents/PkgInfo: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+fl_demo2.app/Contents/PkgInfo: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p fl_demo2.app/Contents
        mkdir -p fl_demo2.app/Contents/MacOS
        mkdir -p fl_demo2.app/Contents/Resources
        mkdir -p fl_demo2.app/Contents
        mkdir -p fl_demo2.app/Contents/MacOS
        mkdir -p fl_demo2.app/Contents/Resources


@@ -260,7 +260,7 @@ fl_demo2.app/Contents/PkgInfo: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/fl_demo2/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/fl_demo2/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >fl_demo2.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >fl_demo2.app/Contents/Info.plist

        
        
        echo -n "APPL????" >fl_demo2.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >fl_demo2.app/Contents/PkgInfo


@@ -281,7 +281,7 @@ fl_sample1$(EXEEXT): $(FL_SAMPLE1_OBJECTS) $(__fl_sample1___win32rc)
        $(__fl_sample1___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__fl_sample1___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-fl_sample1.app/Contents/PkgInfo: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+fl_sample1.app/Contents/PkgInfo: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p fl_sample1.app/Contents
        mkdir -p fl_sample1.app/Contents/MacOS
        mkdir -p fl_sample1.app/Contents/Resources
        mkdir -p fl_sample1.app/Contents
        mkdir -p fl_sample1.app/Contents/MacOS
        mkdir -p fl_sample1.app/Contents/Resources


@@ -290,7 +290,7 @@ fl_sample1.app/Contents/PkgInfo: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/Info.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/fl_sample1/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/fl_sample1/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >fl_sample1.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >fl_sample1.app/Contents/Info.plist

        
        
        echo -n "APPL????" >fl_sample1.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >fl_sample1.app/Contents/PkgInfo


@@ -311,7 +311,7 @@ fl_sample2$(EXEEXT): $(FL_SAMPLE2_OBJECTS) $(__fl_sample2___win32rc)
        $(__fl_sample2___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__fl_sample2___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-fl_sample2.app/Contents/PkgInfo: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+fl_sample2.app/Contents/PkgInfo: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p fl_sample2.app/Contents
        mkdir -p fl_sample2.app/Contents/MacOS
        mkdir -p fl_sample2.app/Contents/Resources
        mkdir -p fl_sample2.app/Contents
        mkdir -p fl_sample2.app/Contents/MacOS
        mkdir -p fl_sample2.app/Contents/Resources


@@ -320,7 +320,7 @@ fl_sample2.app/Contents/PkgInfo: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/Info.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/fl_sample2/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/fl_sample2/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >fl_sample2.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >fl_sample2.app/Contents/Info.plist

        
        
        echo -n "APPL????" >fl_sample2.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >fl_sample2.app/Contents/PkgInfo


@@ -341,7 +341,7 @@ fl_sample3$(EXEEXT): $(FL_SAMPLE3_OBJECTS) $(__fl_sample3___win32rc)
        $(__fl_sample3___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__fl_sample3___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-fl_sample3.app/Contents/PkgInfo: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+fl_sample3.app/Contents/PkgInfo: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p fl_sample3.app/Contents
        mkdir -p fl_sample3.app/Contents/MacOS
        mkdir -p fl_sample3.app/Contents/Resources
        mkdir -p fl_sample3.app/Contents
        mkdir -p fl_sample3.app/Contents/MacOS
        mkdir -p fl_sample3.app/Contents/Resources


@@ -350,7 +350,7 @@ fl_sample3.app/Contents/PkgInfo: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/Info.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/fl_sample3/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/fl_sample3/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >fl_sample3.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >fl_sample3.app/Contents/Info.plist

        
        
        echo -n "APPL????" >fl_sample3.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >fl_sample3.app/Contents/PkgInfo

diff --git a/contrib/samples/gizmos/dynsash/Makefile.in b/contrib/samples/gizmos/dynsash/Makefile.in
index aa6a59756dca462d529326897108b5cb014af331..db278e2643e1e44c9b1788eedf8aca64e509c00b 100644 (file)
--- a/contrib/samples/gizmos/dynsash/Makefile.in
+++ b/contrib/samples/gizmos/dynsash/Makefile.in
@@ -134,7 +134,7 @@ dynsash$(EXEEXT): $(DYNSASH_OBJECTS) $(__dynsash___win32rc)
        $(__dynsash___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__dynsash___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-dynsash.app/Contents/PkgInfo: dynsash$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+dynsash.app/Contents/PkgInfo: dynsash$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p dynsash.app/Contents
        mkdir -p dynsash.app/Contents/MacOS
        mkdir -p dynsash.app/Contents/Resources
        mkdir -p dynsash.app/Contents
        mkdir -p dynsash.app/Contents/MacOS
        mkdir -p dynsash.app/Contents/Resources


@@ -143,7 +143,7 @@ dynsash.app/Contents/PkgInfo: dynsash$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/dynsash/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/dynsash/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >dynsash.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >dynsash.app/Contents/Info.plist

        
        
        echo -n "APPL????" >dynsash.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >dynsash.app/Contents/PkgInfo

diff --git a/contrib/samples/gizmos/dynsash_switch/Makefile.in b/contrib/samples/gizmos/dynsash_switch/Makefile.in
index 73a5e35d1c5dd2ef546c2641bb37d34a47856b9d..cc140839e638b174a8c547b1589e47ba7d33ce15 100644 (file)
--- a/contrib/samples/gizmos/dynsash_switch/Makefile.in
+++ b/contrib/samples/gizmos/dynsash_switch/Makefile.in
@@ -134,7 +134,7 @@ dynsash_switch$(EXEEXT): $(DYNSASH_SWITCH_OBJECTS) $(__dynsash_switch___win32rc)
        $(__dynsash_switch___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__dynsash_switch___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-dynsash_switch.app/Contents/PkgInfo: dynsash_switch$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+dynsash_switch.app/Contents/PkgInfo: dynsash_switch$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p dynsash_switch.app/Contents
        mkdir -p dynsash_switch.app/Contents/MacOS
        mkdir -p dynsash_switch.app/Contents/Resources
        mkdir -p dynsash_switch.app/Contents
        mkdir -p dynsash_switch.app/Contents/MacOS
        mkdir -p dynsash_switch.app/Contents/Resources


@@ -143,7 +143,7 @@ dynsash_switch.app/Contents/PkgInfo: dynsash_switch$(EXEEXT) $(top_srcdir)/src/m
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/dynsash_switch/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/dynsash_switch/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >dynsash_switch.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >dynsash_switch.app/Contents/Info.plist

        
        
        echo -n "APPL????" >dynsash_switch.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >dynsash_switch.app/Contents/PkgInfo

diff --git a/contrib/samples/gizmos/editlbox/Makefile.in b/contrib/samples/gizmos/editlbox/Makefile.in
index c449d973412339bea2fffeeb2da4cf94c5260b93..5071460ebca143d15f9e44422badf040f15ffc54 100644 (file)
--- a/contrib/samples/gizmos/editlbox/Makefile.in
+++ b/contrib/samples/gizmos/editlbox/Makefile.in
@@ -130,7 +130,7 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
        $(__test___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__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
        mkdir -p test.app/Contents
        mkdir -p test.app/Contents/MacOS
        mkdir -p test.app/Contents/Resources


@@ -139,7 +139,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)/" \
        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
        
        
        echo -n "APPL????" >test.app/Contents/PkgInfo

diff --git a/contrib/samples/gizmos/led/Makefile.in b/contrib/samples/gizmos/led/Makefile.in
index e0e35cfa605d551886456553fa97ecc30d0abfeb..75babfc1833d908562d7caf34a995feaa66a224b 100644 (file)
--- a/contrib/samples/gizmos/led/Makefile.in
+++ b/contrib/samples/gizmos/led/Makefile.in
@@ -129,7 +129,7 @@ led$(EXEEXT): $(LED_OBJECTS) $(__led___win32rc)
        $(__led___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__led___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-led.app/Contents/PkgInfo: led$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+led.app/Contents/PkgInfo: led$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p led.app/Contents
        mkdir -p led.app/Contents/MacOS
        mkdir -p led.app/Contents/Resources
        mkdir -p led.app/Contents
        mkdir -p led.app/Contents/MacOS
        mkdir -p led.app/Contents/Resources


@@ -138,7 +138,7 @@ led.app/Contents/PkgInfo: led$(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/led/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/led/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >led.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >led.app/Contents/Info.plist

        
        
        echo -n "APPL????" >led.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >led.app/Contents/PkgInfo

diff --git a/contrib/samples/gizmos/multicell/Makefile.in b/contrib/samples/gizmos/multicell/Makefile.in
index 6746374db5aaf0252de4466514738c1958cb6349..92264283dd00c50c2d72a5aeb074623be42cb0bc 100644 (file)
--- a/contrib/samples/gizmos/multicell/Makefile.in
+++ b/contrib/samples/gizmos/multicell/Makefile.in
@@ -130,7 +130,7 @@ mtest$(EXEEXT): $(MTEST_OBJECTS) $(__mtest___win32rc)
        $(__mtest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__mtest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-mtest.app/Contents/PkgInfo: mtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+mtest.app/Contents/PkgInfo: mtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p mtest.app/Contents
        mkdir -p mtest.app/Contents/MacOS
        mkdir -p mtest.app/Contents/Resources
        mkdir -p mtest.app/Contents
        mkdir -p mtest.app/Contents/MacOS
        mkdir -p mtest.app/Contents/Resources


@@ -139,7 +139,7 @@ mtest.app/Contents/PkgInfo: mtest$(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/mtest/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/mtest/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >mtest.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >mtest.app/Contents/Info.plist

        
        
        echo -n "APPL????" >mtest.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >mtest.app/Contents/PkgInfo

diff --git a/contrib/samples/gizmos/splittree/Makefile.in b/contrib/samples/gizmos/splittree/Makefile.in
index ea6ee0a6685913d4be36db3c77e25e1b1df90383..cd53fbf07b01559bff4269ecaf9735f6170cacd0 100644 (file)
--- a/contrib/samples/gizmos/splittree/Makefile.in
+++ b/contrib/samples/gizmos/splittree/Makefile.in
@@ -130,7 +130,7 @@ splittree$(EXEEXT): $(SPLITTREE_OBJECTS) $(__splittree___win32rc)
        $(__splittree___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__splittree___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-splittree.app/Contents/PkgInfo: splittree$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+splittree.app/Contents/PkgInfo: splittree$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p splittree.app/Contents
        mkdir -p splittree.app/Contents/MacOS
        mkdir -p splittree.app/Contents/Resources
        mkdir -p splittree.app/Contents
        mkdir -p splittree.app/Contents/MacOS
        mkdir -p splittree.app/Contents/Resources


@@ -139,7 +139,7 @@ splittree.app/Contents/PkgInfo: splittree$(EXEEXT) $(top_srcdir)/src/mac/Info.pl
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/splittree/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/splittree/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >splittree.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >splittree.app/Contents/Info.plist

        
        
        echo -n "APPL????" >splittree.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >splittree.app/Contents/PkgInfo

diff --git a/contrib/samples/mmedia/Makefile.in b/contrib/samples/mmedia/Makefile.in
index aa8eefd8ec74f0f3d320d0cb9af2b44b3280fc45..af3210a8397e17ee6d12ddea007084f3872f1618 100644 (file)
--- a/contrib/samples/mmedia/Makefile.in
+++ b/contrib/samples/mmedia/Makefile.in
@@ -132,7 +132,7 @@ mmboard$(EXEEXT): $(MMBOARD_OBJECTS) $(__mmboard___win32rc)
        $(__mmboard___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__mmboard___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-mmboard.app/Contents/PkgInfo: mmboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+mmboard.app/Contents/PkgInfo: mmboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p mmboard.app/Contents
        mkdir -p mmboard.app/Contents/MacOS
        mkdir -p mmboard.app/Contents/Resources
        mkdir -p mmboard.app/Contents
        mkdir -p mmboard.app/Contents/MacOS
        mkdir -p mmboard.app/Contents/Resources


@@ -141,7 +141,7 @@ mmboard.app/Contents/PkgInfo: mmboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/mmboard/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/mmboard/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >mmboard.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >mmboard.app/Contents/Info.plist

        
        
        echo -n "APPL????" >mmboard.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >mmboard.app/Contents/PkgInfo

diff --git a/contrib/samples/ogl/ogledit/Makefile.in b/contrib/samples/ogl/ogledit/Makefile.in
index 645bd00058256845575fb3ce625575d969ae794f..1a8f414008ad32aaf7c148181c423a44a3f17a1f 100644 (file)
--- a/contrib/samples/ogl/ogledit/Makefile.in
+++ b/contrib/samples/ogl/ogledit/Makefile.in
@@ -133,7 +133,7 @@ ogledit$(EXEEXT): $(OGLEDIT_OBJECTS) $(__ogledit___win32rc)
        $(__ogledit___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__ogledit___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-ogledit.app/Contents/PkgInfo: ogledit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+ogledit.app/Contents/PkgInfo: ogledit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p ogledit.app/Contents
        mkdir -p ogledit.app/Contents/MacOS
        mkdir -p ogledit.app/Contents/Resources
        mkdir -p ogledit.app/Contents
        mkdir -p ogledit.app/Contents/MacOS
        mkdir -p ogledit.app/Contents/Resources


@@ -142,7 +142,7 @@ ogledit.app/Contents/PkgInfo: ogledit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/ogledit/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/ogledit/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >ogledit.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >ogledit.app/Contents/Info.plist

        
        
        echo -n "APPL????" >ogledit.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >ogledit.app/Contents/PkgInfo

diff --git a/contrib/samples/ogl/studio/Makefile.in b/contrib/samples/ogl/studio/Makefile.in
index c806db3239057c31e9349a00b7595e7cde817f22..0c14496e861373467cc0ca381fd96f2ecff41269 100644 (file)
--- a/contrib/samples/ogl/studio/Makefile.in
+++ b/contrib/samples/ogl/studio/Makefile.in
@@ -148,7 +148,7 @@ studio$(EXEEXT): $(STUDIO_OBJECTS) $(__studio___win32rc)
        $(__studio___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__studio___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p studio.app/Contents
        mkdir -p studio.app/Contents/MacOS
        mkdir -p studio.app/Contents/Resources
        mkdir -p studio.app/Contents
        mkdir -p studio.app/Contents/MacOS
        mkdir -p studio.app/Contents/Resources


@@ -157,7 +157,7 @@ studio.app/Contents/PkgInfo: studio$(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/studio/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/studio/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >studio.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >studio.app/Contents/Info.plist

        
        
        echo -n "APPL????" >studio.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >studio.app/Contents/PkgInfo

diff --git a/contrib/samples/plot/Makefile.in b/contrib/samples/plot/Makefile.in
index 8eb4c0d38d299fe2e596fe79881ed2f60e0136bf..4677eb836ca60dc5aa41f369dc803679c96ff476 100644 (file)
--- a/contrib/samples/plot/Makefile.in
+++ b/contrib/samples/plot/Makefile.in
@@ -130,7 +130,7 @@ plot$(EXEEXT): $(PLOT_OBJECTS) $(__plot___win32rc)
        $(__plot___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__plot___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-plot.app/Contents/PkgInfo: plot$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+plot.app/Contents/PkgInfo: plot$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p plot.app/Contents
        mkdir -p plot.app/Contents/MacOS
        mkdir -p plot.app/Contents/Resources
        mkdir -p plot.app/Contents
        mkdir -p plot.app/Contents/MacOS
        mkdir -p plot.app/Contents/Resources


@@ -139,7 +139,7 @@ plot.app/Contents/PkgInfo: plot$(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/plot/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/plot/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >plot.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >plot.app/Contents/Info.plist

        
        
        echo -n "APPL????" >plot.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >plot.app/Contents/PkgInfo

diff --git a/contrib/samples/stc/Makefile.in b/contrib/samples/stc/Makefile.in
index e11d5e00fa7ed6d7e1e460eaa8bfe86e0a1e08e7..4c3e321f7e18e6a00b4d9fcd8db8b46e62822180 100644 (file)
--- a/contrib/samples/stc/Makefile.in
+++ b/contrib/samples/stc/Makefile.in
@@ -132,7 +132,7 @@ stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc)
        $(__stctest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__stctest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p stctest.app/Contents
        mkdir -p stctest.app/Contents/MacOS
        mkdir -p stctest.app/Contents/Resources
        mkdir -p stctest.app/Contents
        mkdir -p stctest.app/Contents/MacOS
        mkdir -p stctest.app/Contents/Resources


@@ -141,7 +141,7 @@ stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/stctest/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/stctest/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >stctest.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >stctest.app/Contents/Info.plist

        
        
        echo -n "APPL????" >stctest.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >stctest.app/Contents/PkgInfo

diff --git a/contrib/samples/svg/Makefile.in b/contrib/samples/svg/Makefile.in
index 71c55318fe912d85aa8704c8ec084d6441eb3953..bd0acf8f0fcfbc21d5048e84f5a60965bf0f62ef 100644 (file)
--- a/contrib/samples/svg/Makefile.in
+++ b/contrib/samples/svg/Makefile.in
@@ -130,7 +130,7 @@ svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc)
        $(__svgtest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__svgtest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p svgtest.app/Contents
        mkdir -p svgtest.app/Contents/MacOS
        mkdir -p svgtest.app/Contents/Resources
        mkdir -p svgtest.app/Contents
        mkdir -p svgtest.app/Contents/MacOS
        mkdir -p svgtest.app/Contents/Resources


@@ -139,7 +139,7 @@ svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/svgtest/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/svgtest/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >svgtest.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >svgtest.app/Contents/Info.plist

        
        
        echo -n "APPL????" >svgtest.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >svgtest.app/Contents/PkgInfo

diff --git a/contrib/samples/xrc/Makefile.in b/contrib/samples/xrc/Makefile.in
index 9ee982e7de0372059a4c6b7032ba0d0dca0fb252..29cafa2b6637386ca354c572b98ca0364975c6b4 100644 (file)
--- a/contrib/samples/xrc/Makefile.in
+++ b/contrib/samples/xrc/Makefile.in
@@ -145,7 +145,7 @@ xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc)
        $(__xrcdemo___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__xrcdemo___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p xrcdemo.app/Contents
        mkdir -p xrcdemo.app/Contents/MacOS
        mkdir -p xrcdemo.app/Contents/Resources
        mkdir -p xrcdemo.app/Contents
        mkdir -p xrcdemo.app/Contents/MacOS
        mkdir -p xrcdemo.app/Contents/Resources


@@ -154,7 +154,7 @@ xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/xrcdemo/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/xrcdemo/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >xrcdemo.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >xrcdemo.app/Contents/Info.plist

        
        
        echo -n "APPL????" >xrcdemo.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >xrcdemo.app/Contents/PkgInfo

diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in
index e11d5e00fa7ed6d7e1e460eaa8bfe86e0a1e08e7..4c3e321f7e18e6a00b4d9fcd8db8b46e62822180 100644 (file)
--- a/samples/stc/Makefile.in
+++ b/samples/stc/Makefile.in
@@ -132,7 +132,7 @@ stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc)
        $(__stctest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__stctest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p stctest.app/Contents
        mkdir -p stctest.app/Contents/MacOS
        mkdir -p stctest.app/Contents/Resources
        mkdir -p stctest.app/Contents
        mkdir -p stctest.app/Contents/MacOS
        mkdir -p stctest.app/Contents/Resources


@@ -141,7 +141,7 @@ stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/stctest/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/stctest/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >stctest.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >stctest.app/Contents/Info.plist

        
        
        echo -n "APPL????" >stctest.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >stctest.app/Contents/PkgInfo

diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in
index 71c55318fe912d85aa8704c8ec084d6441eb3953..bd0acf8f0fcfbc21d5048e84f5a60965bf0f62ef 100644 (file)
--- a/samples/svg/Makefile.in
+++ b/samples/svg/Makefile.in
@@ -130,7 +130,7 @@ svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc)
        $(__svgtest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__svgtest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p svgtest.app/Contents
        mkdir -p svgtest.app/Contents/MacOS
        mkdir -p svgtest.app/Contents/Resources
        mkdir -p svgtest.app/Contents
        mkdir -p svgtest.app/Contents/MacOS
        mkdir -p svgtest.app/Contents/Resources


@@ -139,7 +139,7 @@ svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/svgtest/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/svgtest/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >svgtest.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >svgtest.app/Contents/Info.plist

        
        
        echo -n "APPL????" >svgtest.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >svgtest.app/Contents/PkgInfo

diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in
index bc28339287fe34c0dd4f6d1540cc4d9d9d6e107a..c88ceed1d2f9669f9714ee7f05d1cead1d9998ed 100644 (file)
--- a/samples/widgets/Makefile.in
+++ b/samples/widgets/Makefile.in
@@ -139,7 +139,7 @@ widgets$(EXEEXT): $(WIDGETS_OBJECTS) $(__widgets___win32rc)
        $(__widgets___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__widgets___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-widgets.app/Contents/PkgInfo: widgets$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+widgets.app/Contents/PkgInfo: widgets$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p widgets.app/Contents
        mkdir -p widgets.app/Contents/MacOS
        mkdir -p widgets.app/Contents/Resources
        mkdir -p widgets.app/Contents
        mkdir -p widgets.app/Contents/MacOS
        mkdir -p widgets.app/Contents/Resources


@@ -148,7 +148,7 @@ widgets.app/Contents/PkgInfo: widgets$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/widgets/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/widgets/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >widgets.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >widgets.app/Contents/Info.plist

        
        
        echo -n "APPL????" >widgets.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >widgets.app/Contents/PkgInfo

diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in
index 9ee982e7de0372059a4c6b7032ba0d0dca0fb252..29cafa2b6637386ca354c572b98ca0364975c6b4 100644 (file)
--- a/samples/xrc/Makefile.in
+++ b/samples/xrc/Makefile.in
@@ -145,7 +145,7 @@ xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc)
        $(__xrcdemo___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__xrcdemo___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns

        mkdir -p xrcdemo.app/Contents
        mkdir -p xrcdemo.app/Contents/MacOS
        mkdir -p xrcdemo.app/Contents/Resources
        mkdir -p xrcdemo.app/Contents
        mkdir -p xrcdemo.app/Contents/MacOS
        mkdir -p xrcdemo.app/Contents/Resources


@@ -154,7 +154,7 @@ xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/xrcdemo/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/xrcdemo/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >xrcdemo.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >xrcdemo.app/Contents/Info.plist

        
        
        echo -n "APPL????" >xrcdemo.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >xrcdemo.app/Contents/PkgInfo