new path organisation for mac

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

diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in
index 8d8ad0f784f52c9f5b60c15753aac0731a23d66c..8e8cd0718179ef28ae4fa25659d6c556545f8480 100644 (file)
--- a/samples/html/about/Makefile.in
+++ b/samples/html/about/Makefile.in
@@ -166,7 +166,7 @@ about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc)
        $(__about___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__about___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-@COND_PLATFORM_MACOSX_1@about.app/Contents/PkgInfo: about$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@about.app/Contents/PkgInfo: about$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns

 @COND_PLATFORM_MACOSX_1@       mkdir -p about.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p about.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p about.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@       mkdir -p about.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p about.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p about.app/Contents/Resources


@@ -175,7 +175,7 @@ about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc)
 @COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/about/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
 @COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/about/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \

-@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/mac/carbon/Info.plist.in >about.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >about.app/Contents/Info.plist

 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >about.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >about.app/Contents/PkgInfo


@@ -184,7 +184,7 @@ about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc)
 @COND_PLATFORM_MACOSX_1@       ln -f about$(EXEEXT) about.app/Contents/MacOS/about
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       ln -f about$(EXEEXT) about.app/Contents/MacOS/about
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       

-@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns about.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns about.app/Contents/Resources/wxmac.icns

 
 @COND_PLATFORM_MACOSX_1@about_bundle: $(____about_BUNDLE_TGT_REF_DEP)
 
 
 @COND_PLATFORM_MACOSX_1@about_bundle: $(____about_BUNDLE_TGT_REF_DEP)
 

diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in
index a47b837a2ce7b214b9f387b69e8f7dca33cf9e6e..92c9ce5d3c1c27ce1135df929c3d8a0ae24d6d8a 100644 (file)
--- a/samples/html/help/Makefile.in
+++ b/samples/html/help/Makefile.in
@@ -166,7 +166,7 @@ htmlhelp$(EXEEXT): $(HTMLHELP_OBJECTS) $(__htmlhelp___win32rc)
        $(__htmlhelp___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__htmlhelp___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-@COND_PLATFORM_MACOSX_1@htmlhelp.app/Contents/PkgInfo: htmlhelp$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@htmlhelp.app/Contents/PkgInfo: htmlhelp$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns

 @COND_PLATFORM_MACOSX_1@       mkdir -p htmlhelp.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p htmlhelp.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p htmlhelp.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@       mkdir -p htmlhelp.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p htmlhelp.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p htmlhelp.app/Contents/Resources


@@ -175,7 +175,7 @@ htmlhelp$(EXEEXT): $(HTMLHELP_OBJECTS) $(__htmlhelp___win32rc)
 @COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/htmlhelp/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
 @COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/htmlhelp/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \

-@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/mac/carbon/Info.plist.in >htmlhelp.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >htmlhelp.app/Contents/Info.plist

 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >htmlhelp.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >htmlhelp.app/Contents/PkgInfo


@@ -184,7 +184,7 @@ htmlhelp$(EXEEXT): $(HTMLHELP_OBJECTS) $(__htmlhelp___win32rc)
 @COND_PLATFORM_MACOSX_1@       ln -f htmlhelp$(EXEEXT) htmlhelp.app/Contents/MacOS/htmlhelp
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       ln -f htmlhelp$(EXEEXT) htmlhelp.app/Contents/MacOS/htmlhelp
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       

-@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns htmlhelp.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns htmlhelp.app/Contents/Resources/wxmac.icns

 
 @COND_PLATFORM_MACOSX_1@htmlhelp_bundle: $(____htmlhelp_BUNDLE_TGT_REF_DEP)
 
 
 @COND_PLATFORM_MACOSX_1@htmlhelp_bundle: $(____htmlhelp_BUNDLE_TGT_REF_DEP)
 

diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in
index da5c6eaaa673cf1fcc2cf5873e3e0874468c8ef2..3fdad62730eebe38af72105868cabd421e69222b 100644 (file)
--- a/samples/html/helpview/Makefile.in
+++ b/samples/html/helpview/Makefile.in
@@ -166,7 +166,7 @@ helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
        $(__helpview___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__helpview___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-@COND_PLATFORM_MACOSX_1@helpview.app/Contents/PkgInfo: helpview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@helpview.app/Contents/PkgInfo: helpview$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns

 @COND_PLATFORM_MACOSX_1@       mkdir -p helpview.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p helpview.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p helpview.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@       mkdir -p helpview.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p helpview.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p helpview.app/Contents/Resources


@@ -175,7 +175,7 @@ helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
 @COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/helpview/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
 @COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/helpview/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \

-@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/mac/carbon/Info.plist.in >helpview.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >helpview.app/Contents/Info.plist

 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >helpview.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >helpview.app/Contents/PkgInfo


@@ -184,7 +184,7 @@ helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
 @COND_PLATFORM_MACOSX_1@       ln -f helpview$(EXEEXT) helpview.app/Contents/MacOS/helpview
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       ln -f helpview$(EXEEXT) helpview.app/Contents/MacOS/helpview
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       

-@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns helpview.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns helpview.app/Contents/Resources/wxmac.icns

 
 @COND_PLATFORM_MACOSX_1@helpview_bundle: $(____helpview_BUNDLE_TGT_REF_DEP)
 
 
 @COND_PLATFORM_MACOSX_1@helpview_bundle: $(____helpview_BUNDLE_TGT_REF_DEP)
 

diff --git a/samples/html/htmlctrl/Makefile.in b/samples/html/htmlctrl/Makefile.in
index 6535fda27ba625089d3a8fdca7f3f8095e1110dd..f8f8ea45ba7806598feda0af2c42a064b5a590c1 100644 (file)
--- a/samples/html/htmlctrl/Makefile.in
+++ b/samples/html/htmlctrl/Makefile.in
@@ -162,7 +162,7 @@ htmlctrl$(EXEEXT): $(HTMLCTRL_OBJECTS) $(__htmlctrl___win32rc)
        $(__htmlctrl___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__htmlctrl___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-@COND_PLATFORM_MACOSX_1@htmlctrl.app/Contents/PkgInfo: htmlctrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@htmlctrl.app/Contents/PkgInfo: htmlctrl$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns

 @COND_PLATFORM_MACOSX_1@       mkdir -p htmlctrl.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p htmlctrl.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p htmlctrl.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@       mkdir -p htmlctrl.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p htmlctrl.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p htmlctrl.app/Contents/Resources


@@ -171,7 +171,7 @@ htmlctrl$(EXEEXT): $(HTMLCTRL_OBJECTS) $(__htmlctrl___win32rc)
 @COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/htmlctrl/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
 @COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/htmlctrl/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \

-@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/mac/carbon/Info.plist.in >htmlctrl.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >htmlctrl.app/Contents/Info.plist

 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >htmlctrl.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >htmlctrl.app/Contents/PkgInfo


@@ -180,7 +180,7 @@ htmlctrl$(EXEEXT): $(HTMLCTRL_OBJECTS) $(__htmlctrl___win32rc)
 @COND_PLATFORM_MACOSX_1@       ln -f htmlctrl$(EXEEXT) htmlctrl.app/Contents/MacOS/htmlctrl
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       ln -f htmlctrl$(EXEEXT) htmlctrl.app/Contents/MacOS/htmlctrl
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       

-@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns htmlctrl.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns htmlctrl.app/Contents/Resources/wxmac.icns

 
 @COND_PLATFORM_MACOSX_1@htmlctrl_bundle: $(____htmlctrl_BUNDLE_TGT_REF_DEP)
 
 
 @COND_PLATFORM_MACOSX_1@htmlctrl_bundle: $(____htmlctrl_BUNDLE_TGT_REF_DEP)
 

diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in
index 3038ebd9a7f2f85e03341dbe2b143bab234e86f9..534d2d837b11025e0850bc07ac3b3c93b478c974 100644 (file)
--- a/samples/html/printing/Makefile.in
+++ b/samples/html/printing/Makefile.in
@@ -170,7 +170,7 @@ htmlprinting$(EXEEXT): $(HTMLPRINTING_OBJECTS) $(__htmlprinting___win32rc)
        $(__htmlprinting___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__htmlprinting___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-@COND_PLATFORM_MACOSX_1@htmlprinting.app/Contents/PkgInfo: htmlprinting$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@htmlprinting.app/Contents/PkgInfo: htmlprinting$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns

 @COND_PLATFORM_MACOSX_1@       mkdir -p htmlprinting.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p htmlprinting.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p htmlprinting.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@       mkdir -p htmlprinting.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p htmlprinting.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p htmlprinting.app/Contents/Resources


@@ -179,7 +179,7 @@ htmlprinting$(EXEEXT): $(HTMLPRINTING_OBJECTS) $(__htmlprinting___win32rc)
 @COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/htmlprinting/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
 @COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/htmlprinting/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \

-@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/mac/carbon/Info.plist.in >htmlprinting.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >htmlprinting.app/Contents/Info.plist

 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >htmlprinting.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >htmlprinting.app/Contents/PkgInfo


@@ -188,7 +188,7 @@ htmlprinting$(EXEEXT): $(HTMLPRINTING_OBJECTS) $(__htmlprinting___win32rc)
 @COND_PLATFORM_MACOSX_1@       ln -f htmlprinting$(EXEEXT) htmlprinting.app/Contents/MacOS/htmlprinting
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       ln -f htmlprinting$(EXEEXT) htmlprinting.app/Contents/MacOS/htmlprinting
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       

-@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns htmlprinting.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns htmlprinting.app/Contents/Resources/wxmac.icns

 
 @COND_PLATFORM_MACOSX_1@htmlprinting_bundle: $(____htmlprinting_BUNDLE_TGT_REF_DEP)
 
 
 @COND_PLATFORM_MACOSX_1@htmlprinting_bundle: $(____htmlprinting_BUNDLE_TGT_REF_DEP)
 

diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in
index bdb1e654da1fd57d5cafd38b2ec45b8524bdc669..2aff096a9e12aa0a180b2f3e15a76c82eeb3cf07 100644 (file)
--- a/samples/html/test/Makefile.in
+++ b/samples/html/test/Makefile.in
@@ -169,7 +169,7 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
        $(__test___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__test___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-@COND_PLATFORM_MACOSX_1@test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns

 @COND_PLATFORM_MACOSX_1@       mkdir -p test.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p test.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p test.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@       mkdir -p test.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p test.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p test.app/Contents/Resources


@@ -178,7 +178,7 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
 @COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/test/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
 @COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/test/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \

-@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/mac/carbon/Info.plist.in >test.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >test.app/Contents/Info.plist

 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >test.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >test.app/Contents/PkgInfo


@@ -187,7 +187,7 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
 @COND_PLATFORM_MACOSX_1@       ln -f test$(EXEEXT) test.app/Contents/MacOS/test
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       ln -f test$(EXEEXT) test.app/Contents/MacOS/test
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       

-@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns test.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns test.app/Contents/Resources/wxmac.icns

 
 @COND_PLATFORM_MACOSX_1@test_bundle: $(____test_BUNDLE_TGT_REF_DEP)
 
 
 @COND_PLATFORM_MACOSX_1@test_bundle: $(____test_BUNDLE_TGT_REF_DEP)
 

diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in
index 554599841ed439a8a54e0bd9fa97c04648ecdfcc..f2c8277aa652d11dadce5b9f065a1c14f2e574e4 100644 (file)
--- a/samples/html/virtual/Makefile.in
+++ b/samples/html/virtual/Makefile.in
@@ -166,7 +166,7 @@ virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc)
        $(__virtual___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__virtual___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-@COND_PLATFORM_MACOSX_1@virtual.app/Contents/PkgInfo: virtual$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@virtual.app/Contents/PkgInfo: virtual$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns

 @COND_PLATFORM_MACOSX_1@       mkdir -p virtual.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p virtual.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p virtual.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@       mkdir -p virtual.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p virtual.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p virtual.app/Contents/Resources


@@ -175,7 +175,7 @@ virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc)
 @COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/virtual/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
 @COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/virtual/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \

-@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/mac/carbon/Info.plist.in >virtual.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >virtual.app/Contents/Info.plist

 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >virtual.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >virtual.app/Contents/PkgInfo


@@ -184,7 +184,7 @@ virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc)
 @COND_PLATFORM_MACOSX_1@       ln -f virtual$(EXEEXT) virtual.app/Contents/MacOS/virtual
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       ln -f virtual$(EXEEXT) virtual.app/Contents/MacOS/virtual
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       

-@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns virtual.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns virtual.app/Contents/Resources/wxmac.icns

 
 @COND_PLATFORM_MACOSX_1@virtual_bundle: $(____virtual_BUNDLE_TGT_REF_DEP)
 
 
 @COND_PLATFORM_MACOSX_1@virtual_bundle: $(____virtual_BUNDLE_TGT_REF_DEP)
 

diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in
index 53cd21e9c9774496881f92e2e7f362e530330bce..9aaf28b9bb335ecedee9d7288d9500256d998b12 100644 (file)
--- a/samples/html/widget/Makefile.in
+++ b/samples/html/widget/Makefile.in
@@ -166,7 +166,7 @@ widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc)
        $(__widget___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__widget___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-@COND_PLATFORM_MACOSX_1@widget.app/Contents/PkgInfo: widget$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@widget.app/Contents/PkgInfo: widget$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns

 @COND_PLATFORM_MACOSX_1@       mkdir -p widget.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p widget.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p widget.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@       mkdir -p widget.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p widget.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p widget.app/Contents/Resources


@@ -175,7 +175,7 @@ widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc)
 @COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/widget/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
 @COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/widget/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \

-@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/mac/carbon/Info.plist.in >widget.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >widget.app/Contents/Info.plist

 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >widget.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >widget.app/Contents/PkgInfo


@@ -184,7 +184,7 @@ widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc)
 @COND_PLATFORM_MACOSX_1@       ln -f widget$(EXEEXT) widget.app/Contents/MacOS/widget
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       ln -f widget$(EXEEXT) widget.app/Contents/MacOS/widget
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       

-@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns widget.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns widget.app/Contents/Resources/wxmac.icns

 
 @COND_PLATFORM_MACOSX_1@widget_bundle: $(____widget_BUNDLE_TGT_REF_DEP)
 
 
 @COND_PLATFORM_MACOSX_1@widget_bundle: $(____widget_BUNDLE_TGT_REF_DEP)
 

diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in
index 5f4e05c2356bce53ec998bbf78bdbabb440fa011..dd1fed064c939699e5de6a7d304351c85bb72919 100644 (file)
--- a/samples/html/zip/Makefile.in
+++ b/samples/html/zip/Makefile.in
@@ -165,7 +165,7 @@ zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc)
        $(__zip___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__zip___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-@COND_PLATFORM_MACOSX_1@zip.app/Contents/PkgInfo: zip$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@zip.app/Contents/PkgInfo: zip$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns

 @COND_PLATFORM_MACOSX_1@       mkdir -p zip.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p zip.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p zip.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@       mkdir -p zip.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p zip.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p zip.app/Contents/Resources


@@ -174,7 +174,7 @@ zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc)
 @COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/zip/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
 @COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/zip/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \

-@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/mac/carbon/Info.plist.in >zip.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >zip.app/Contents/Info.plist

 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >zip.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >zip.app/Contents/PkgInfo


@@ -183,7 +183,7 @@ zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc)
 @COND_PLATFORM_MACOSX_1@       ln -f zip$(EXEEXT) zip.app/Contents/MacOS/zip
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       ln -f zip$(EXEEXT) zip.app/Contents/MacOS/zip
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       

-@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns zip.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns zip.app/Contents/Resources/wxmac.icns

 
 @COND_PLATFORM_MACOSX_1@zip_bundle: $(____zip_BUNDLE_TGT_REF_DEP)
 
 
 @COND_PLATFORM_MACOSX_1@zip_bundle: $(____zip_BUNDLE_TGT_REF_DEP)