regenerated all trunk makefiles with bakefile-0.2.3

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

autoconf_inc.m4

@@ -320,6 +320,12 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../demos/bombs/bombs.bkl,../../
         COND_PLATFORM_MACOSX_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_1)
+dnl ### begin block 20_COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0[../../samples/dialup/dialup.bkl] ###
+    COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$PLATFORM_MSDOS" = "x0" ; then
+        COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0)
 dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_[wx.bkl] ###
     COND_PLATFORM_MACOSX_1_TOOLKIT_="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "x" ; then
@@ -362,12 +368,18 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_X11[wx.bkl] ###
         COND_PLATFORM_MACOSX_1_TOOLKIT_X11=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_X11)
-dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_GUI_1[wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_GUI_1[../../samples/ipc/ipc.bkl,../../samples/sockets/sockets.bkl,../../tests/test.bkl,wx.bkl] ###
     COND_PLATFORM_MACOSX_1_USE_GUI_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_GUI" = "x1" ; then
         COND_PLATFORM_MACOSX_1_USE_GUI_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_1_USE_GUI_1)
+dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_OPENGL_1[../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl] ###
+    COND_PLATFORM_MACOSX_1_USE_OPENGL_1="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_OPENGL" = "x1" ; then
+        COND_PLATFORM_MACOSX_1_USE_OPENGL_1=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX_1_USE_OPENGL_1)
 dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_SOVERSION_1[wx.bkl] ###
     COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then

demos/bombs/Makefile.in

@@ -98,10 +98,13 @@ COND_PLATFORM_OS2_1___bombs___os2_emxbindcmd = $(NM) bombs$(EXEEXT) | if grep -q
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__bombs_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__bombs_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= bombs.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__bombs_bundle___depname = bombs_bundle
 @COND_TOOLKIT_COCOA@____bombs_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	bombs.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__bombs_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____bombs_BUNDLE_TGT_REF_DEP = bombs.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____bombs_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__bombs_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -161,25 +164,25 @@ bombs$(EXEEXT): $(BOMBS_OBJECTS) $(__bombs___win32rc)
 	$(__bombs___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-bombs.app/Contents/PkgInfo: bombs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@bombs.app/Contents/PkgInfo: bombs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p bombs.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p bombs.app/Contents
-	mkdir -p bombs.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p bombs.app/Contents/MacOS
-	mkdir -p bombs.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p bombs.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/bombs/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/bombs/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >bombs.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >bombs.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >bombs.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >bombs.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f bombs$(EXEEXT) bombs.app/Contents/MacOS/bombs
+@COND_PLATFORM_MACOSX_1@	ln -f bombs$(EXEEXT) bombs.app/Contents/MacOS/bombs
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns bombs.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns bombs.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@bombs_bundle: $(____bombs_BUNDLE_TGT_REF_DEP)
 

demos/forty/Makefile.in

@@ -107,10 +107,13 @@ COND_PLATFORM_OS2_1___forty___os2_emxbindcmd = $(NM) forty$(EXEEXT) | if grep -q
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__forty_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__forty_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= forty.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__forty_bundle___depname = forty_bundle
 @COND_TOOLKIT_COCOA@____forty_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	forty.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__forty_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____forty_BUNDLE_TGT_REF_DEP = forty.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____forty_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__forty_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_HTML_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
@@ -179,25 +182,25 @@ forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc)
 	$(__forty___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-forty.app/Contents/PkgInfo: forty$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@forty.app/Contents/PkgInfo: forty$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p forty.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p forty.app/Contents
-	mkdir -p forty.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p forty.app/Contents/MacOS
-	mkdir -p forty.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p forty.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/forty/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/forty/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >forty.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >forty.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >forty.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >forty.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f forty$(EXEEXT) forty.app/Contents/MacOS/forty
+@COND_PLATFORM_MACOSX_1@	ln -f forty$(EXEEXT) forty.app/Contents/MacOS/forty
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns forty.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns forty.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@forty_bundle: $(____forty_BUNDLE_TGT_REF_DEP)
 

demos/fractal/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___fractal___os2_emxbindcmd = $(NM) fractal$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__fractal_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__fractal_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= fractal.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__fractal_bundle___depname = fractal_bundle
 @COND_TOOLKIT_COCOA@____fractal_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	fractal.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__fractal_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____fractal_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	fractal.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__fractal_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc)
 	$(__fractal___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-fractal.app/Contents/PkgInfo: fractal$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@fractal.app/Contents/PkgInfo: fractal$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p fractal.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p fractal.app/Contents
-	mkdir -p fractal.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p fractal.app/Contents/MacOS
-	mkdir -p fractal.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p fractal.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/fractal/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/fractal/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >fractal.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >fractal.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >fractal.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >fractal.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f fractal$(EXEEXT) fractal.app/Contents/MacOS/fractal
+@COND_PLATFORM_MACOSX_1@	ln -f fractal$(EXEEXT) fractal.app/Contents/MacOS/fractal
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fractal.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fractal.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@fractal_bundle: $(____fractal_BUNDLE_TGT_REF_DEP)
 

demos/life/Makefile.in

@@ -99,9 +99,13 @@ COND_PLATFORM_OS2_1___life___os2_emxbindcmd = $(NM) life$(EXEEXT) | if grep -q \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__life_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__life_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= life.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__life_bundle___depname = life_bundle
-@COND_TOOLKIT_COCOA@____life_BUNDLE_TGT_REF_DEP = life.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@____life_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@____life_BUNDLE_TGT_REF_DEP = life.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__life_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_MAC@____life_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__life_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -161,25 +165,25 @@ life$(EXEEXT): $(LIFE_OBJECTS) $(__life___win32rc)
 	$(__life___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-life.app/Contents/PkgInfo: life$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@life.app/Contents/PkgInfo: life$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p life.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p life.app/Contents
-	mkdir -p life.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p life.app/Contents/MacOS
-	mkdir -p life.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p life.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/life/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/life/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >life.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >life.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >life.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >life.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f life$(EXEEXT) life.app/Contents/MacOS/life
+@COND_PLATFORM_MACOSX_1@	ln -f life$(EXEEXT) life.app/Contents/MacOS/life
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns life.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns life.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@life_bundle: $(____life_BUNDLE_TGT_REF_DEP)
 

demos/poem/Makefile.in

@@ -97,11 +97,13 @@ COND_PLATFORM_OS2_1___wxpoem___os2_emxbindcmd = $(NM) wxpoem$(EXEEXT) | if grep
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__wxpoem_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__wxpoem_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= wxpoem.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__wxpoem_bundle___depname = wxpoem_bundle
 @COND_TOOLKIT_COCOA@____wxpoem_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	wxpoem.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__wxpoem_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____wxpoem_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	wxpoem.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__wxpoem_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_HTML_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
@@ -164,25 +166,25 @@ wxpoem$(EXEEXT): $(WXPOEM_OBJECTS) $(__wxpoem___win32rc)
 	$(__wxpoem___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-wxpoem.app/Contents/PkgInfo: wxpoem$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@wxpoem.app/Contents/PkgInfo: wxpoem$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p wxpoem.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p wxpoem.app/Contents
-	mkdir -p wxpoem.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p wxpoem.app/Contents/MacOS
-	mkdir -p wxpoem.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p wxpoem.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/wxpoem/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/wxpoem/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >wxpoem.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >wxpoem.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >wxpoem.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >wxpoem.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f wxpoem$(EXEEXT) wxpoem.app/Contents/MacOS/wxpoem
+@COND_PLATFORM_MACOSX_1@	ln -f wxpoem$(EXEEXT) wxpoem.app/Contents/MacOS/wxpoem
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns wxpoem.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns wxpoem.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@wxpoem_bundle: $(____wxpoem_BUNDLE_TGT_REF_DEP)
 

samples/access/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___accesstest___os2_emxbindcmd = $(NM) accesstest$(EXEEXT) \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__accesstest_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__accesstest_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= accesstest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__accesstest_bundle___depname = accesstest_bundle
 @COND_TOOLKIT_COCOA@____accesstest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	accesstest.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__accesstest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____accesstest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	accesstest.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__accesstest_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ accesstest$(EXEEXT): $(ACCESSTEST_OBJECTS) $(__accesstest___win32rc)
 	$(__accesstest___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-accesstest.app/Contents/PkgInfo: accesstest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@accesstest.app/Contents/PkgInfo: accesstest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p accesstest.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p accesstest.app/Contents
-	mkdir -p accesstest.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p accesstest.app/Contents/MacOS
-	mkdir -p accesstest.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p accesstest.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/accesstest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/accesstest/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >accesstest.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >accesstest.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >accesstest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >accesstest.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f accesstest$(EXEEXT) accesstest.app/Contents/MacOS/accesstest
+@COND_PLATFORM_MACOSX_1@	ln -f accesstest$(EXEEXT) accesstest.app/Contents/MacOS/accesstest
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns accesstest.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns accesstest.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@accesstest_bundle: $(____accesstest_BUNDLE_TGT_REF_DEP)
 

samples/animate/Makefile.in

@@ -98,11 +98,13 @@ COND_PLATFORM_OS2_1___anitest___os2_emxbindcmd = $(NM) anitest$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__anitest_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__anitest_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= anitest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__anitest_bundle___depname = anitest_bundle
 @COND_TOOLKIT_COCOA@____anitest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	anitest.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__anitest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____anitest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	anitest.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__anitest_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -165,25 +167,25 @@ anitest$(EXEEXT): $(ANITEST_OBJECTS) $(__anitest___win32rc)
 	$(__anitest___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-anitest.app/Contents/PkgInfo: anitest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@anitest.app/Contents/PkgInfo: anitest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p anitest.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p anitest.app/Contents
-	mkdir -p anitest.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p anitest.app/Contents/MacOS
-	mkdir -p anitest.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p anitest.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/anitest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/anitest/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >anitest.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >anitest.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >anitest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >anitest.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f anitest$(EXEEXT) anitest.app/Contents/MacOS/anitest
+@COND_PLATFORM_MACOSX_1@	ln -f anitest$(EXEEXT) anitest.app/Contents/MacOS/anitest
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns anitest.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns anitest.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@anitest_bundle: $(____anitest_BUNDLE_TGT_REF_DEP)
 

samples/artprov/Makefile.in

@@ -97,11 +97,13 @@ COND_PLATFORM_OS2_1___arttest___os2_emxbindcmd = $(NM) arttest$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__arttest_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__arttest_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= arttest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__arttest_bundle___depname = arttest_bundle
 @COND_TOOLKIT_COCOA@____arttest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	arttest.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__arttest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____arttest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	arttest.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__arttest_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -161,25 +163,25 @@ arttest$(EXEEXT): $(ARTTEST_OBJECTS) $(__arttest___win32rc)
 	$(__arttest___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-arttest.app/Contents/PkgInfo: arttest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@arttest.app/Contents/PkgInfo: arttest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p arttest.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p arttest.app/Contents
-	mkdir -p arttest.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p arttest.app/Contents/MacOS
-	mkdir -p arttest.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p arttest.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/arttest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/arttest/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >arttest.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >arttest.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >arttest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >arttest.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f arttest$(EXEEXT) arttest.app/Contents/MacOS/arttest
+@COND_PLATFORM_MACOSX_1@	ln -f arttest$(EXEEXT) arttest.app/Contents/MacOS/arttest
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns arttest.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns arttest.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@arttest_bundle: $(____arttest_BUNDLE_TGT_REF_DEP)
 

samples/aui/Makefile.in

@@ -101,11 +101,13 @@ COND_PLATFORM_OS2_1___auidemo___os2_emxbindcmd = $(NM) auidemo$(EXEEXT) | if \
 @COND_PLATFORM_WIN32_1@__auidemo___win32rc = auidemo_sample_rc.o
 @COND_PLATFORM_OS2_1@__auidemo_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__auidemo_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= auidemo.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__auidemo_bundle___depname = auidemo_bundle
 @COND_TOOLKIT_COCOA@____auidemo_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	auidemo.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__auidemo_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____auidemo_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	auidemo.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__auidemo_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_AUI_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_AUI_p = $(COND_MONOLITHIC_0___WXLIB_AUI_p)
@@ -176,25 +178,25 @@ auidemo$(EXEEXT): $(AUIDEMO_OBJECTS) $(__auidemo___win32rc)
 	$(__auidemo___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-auidemo.app/Contents/PkgInfo: auidemo$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@auidemo.app/Contents/PkgInfo: auidemo$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p auidemo.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p auidemo.app/Contents
-	mkdir -p auidemo.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p auidemo.app/Contents/MacOS
-	mkdir -p auidemo.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p auidemo.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/auidemo/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/auidemo/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >auidemo.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >auidemo.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >auidemo.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >auidemo.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f auidemo$(EXEEXT) auidemo.app/Contents/MacOS/auidemo
+@COND_PLATFORM_MACOSX_1@	ln -f auidemo$(EXEEXT) auidemo.app/Contents/MacOS/auidemo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns auidemo.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns auidemo.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@auidemo_bundle: $(____auidemo_BUNDLE_TGT_REF_DEP)
 

samples/calendar/Makefile.in

@@ -100,11 +100,13 @@ COND_PLATFORM_OS2_1___calendar___os2_emxbindcmd = $(NM) calendar$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__calendar_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__calendar_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= calendar.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__calendar_bundle___depname = calendar_bundle
 @COND_TOOLKIT_COCOA@____calendar_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	calendar.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__calendar_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____calendar_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	calendar.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__calendar_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -173,25 +175,25 @@ calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___win32rc)
 	$(__calendar___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-calendar.app/Contents/PkgInfo: calendar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@calendar.app/Contents/PkgInfo: calendar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p calendar.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p calendar.app/Contents
-	mkdir -p calendar.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p calendar.app/Contents/MacOS
-	mkdir -p calendar.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p calendar.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/calendar/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/calendar/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >calendar.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >calendar.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >calendar.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >calendar.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f calendar$(EXEEXT) calendar.app/Contents/MacOS/calendar
+@COND_PLATFORM_MACOSX_1@	ln -f calendar$(EXEEXT) calendar.app/Contents/MacOS/calendar
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns calendar.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns calendar.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@calendar_bundle: $(____calendar_BUNDLE_TGT_REF_DEP)
 

samples/caret/Makefile.in

@@ -96,10 +96,13 @@ COND_PLATFORM_OS2_1___caret___os2_emxbindcmd = $(NM) caret$(EXEEXT) | if grep -q
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__caret_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__caret_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= caret.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__caret_bundle___depname = caret_bundle
 @COND_TOOLKIT_COCOA@____caret_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	caret.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__caret_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____caret_BUNDLE_TGT_REF_DEP = caret.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____caret_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__caret_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -159,25 +162,25 @@ caret$(EXEEXT): $(CARET_OBJECTS) $(__caret___win32rc)
 	$(__caret___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-caret.app/Contents/PkgInfo: caret$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@caret.app/Contents/PkgInfo: caret$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p caret.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p caret.app/Contents
-	mkdir -p caret.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p caret.app/Contents/MacOS
-	mkdir -p caret.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p caret.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/caret/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/caret/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >caret.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >caret.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >caret.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >caret.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f caret$(EXEEXT) caret.app/Contents/MacOS/caret
+@COND_PLATFORM_MACOSX_1@	ln -f caret$(EXEEXT) caret.app/Contents/MacOS/caret
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns caret.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns caret.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@caret_bundle: $(____caret_BUNDLE_TGT_REF_DEP)
 

samples/collpane/Makefile.in

@@ -98,11 +98,13 @@ COND_PLATFORM_OS2_1___collpane___os2_emxbindcmd = $(NM) collpane$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__collpane_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__collpane_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= collpane.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__collpane_bundle___depname = collpane_bundle
 @COND_TOOLKIT_COCOA@____collpane_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	collpane.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__collpane_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____collpane_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	collpane.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__collpane_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -165,25 +167,25 @@ collpane$(EXEEXT): $(COLLPANE_OBJECTS) $(__collpane___win32rc)
 	$(__collpane___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-collpane.app/Contents/PkgInfo: collpane$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@collpane.app/Contents/PkgInfo: collpane$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p collpane.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p collpane.app/Contents
-	mkdir -p collpane.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p collpane.app/Contents/MacOS
-	mkdir -p collpane.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p collpane.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/collpane/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/collpane/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >collpane.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >collpane.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >collpane.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >collpane.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f collpane$(EXEEXT) collpane.app/Contents/MacOS/collpane
+@COND_PLATFORM_MACOSX_1@	ln -f collpane$(EXEEXT) collpane.app/Contents/MacOS/collpane
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns collpane.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns collpane.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@collpane_bundle: $(____collpane_BUNDLE_TGT_REF_DEP)
 

samples/combo/Makefile.in

@@ -99,10 +99,13 @@ COND_PLATFORM_OS2_1___combo___os2_emxbindcmd = $(NM) combo$(EXEEXT) | if grep -q
 @COND_PLATFORM_WIN32_1@__combo___win32rc = combo_sample_rc.o
 @COND_PLATFORM_OS2_1@__combo_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__combo_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= combo.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__combo_bundle___depname = combo_bundle
 @COND_TOOLKIT_COCOA@____combo_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	combo.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__combo_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____combo_BUNDLE_TGT_REF_DEP = combo.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____combo_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__combo_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -164,25 +167,25 @@ combo$(EXEEXT): $(COMBO_OBJECTS) $(__combo___win32rc)
 	$(__combo___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-combo.app/Contents/PkgInfo: combo$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@combo.app/Contents/PkgInfo: combo$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p combo.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p combo.app/Contents
-	mkdir -p combo.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p combo.app/Contents/MacOS
-	mkdir -p combo.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p combo.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/combo/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/combo/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >combo.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >combo.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >combo.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >combo.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f combo$(EXEEXT) combo.app/Contents/MacOS/combo
+@COND_PLATFORM_MACOSX_1@	ln -f combo$(EXEEXT) combo.app/Contents/MacOS/combo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns combo.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns combo.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@combo_bundle: $(____combo_BUNDLE_TGT_REF_DEP)
 

samples/config/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___conftest___os2_emxbindcmd = $(NM) conftest$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__conftest_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__conftest_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= conftest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__conftest_bundle___depname = conftest_bundle
 @COND_TOOLKIT_COCOA@____conftest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	conftest.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__conftest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____conftest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	conftest.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__conftest_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc)
 	$(__conftest___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-conftest.app/Contents/PkgInfo: conftest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@conftest.app/Contents/PkgInfo: conftest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p conftest.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p conftest.app/Contents
-	mkdir -p conftest.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p conftest.app/Contents/MacOS
-	mkdir -p conftest.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p conftest.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/conftest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/conftest/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >conftest.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >conftest.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >conftest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >conftest.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f conftest$(EXEEXT) conftest.app/Contents/MacOS/conftest
+@COND_PLATFORM_MACOSX_1@	ln -f conftest$(EXEEXT) conftest.app/Contents/MacOS/conftest
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns conftest.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns conftest.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@conftest_bundle: $(____conftest_BUNDLE_TGT_REF_DEP)
 

samples/controls/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___controls___os2_emxbindcmd = $(NM) controls$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__controls_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__controls_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= controls.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__controls_bundle___depname = controls_bundle
 @COND_TOOLKIT_COCOA@____controls_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	controls.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__controls_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____controls_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	controls.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__controls_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ controls$(EXEEXT): $(CONTROLS_OBJECTS) $(__controls___win32rc)
 	$(__controls___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-controls.app/Contents/PkgInfo: controls$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@controls.app/Contents/PkgInfo: controls$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p controls.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p controls.app/Contents
-	mkdir -p controls.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p controls.app/Contents/MacOS
-	mkdir -p controls.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p controls.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/controls/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/controls/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >controls.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >controls.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >controls.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >controls.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f controls$(EXEEXT) controls.app/Contents/MacOS/controls
+@COND_PLATFORM_MACOSX_1@	ln -f controls$(EXEEXT) controls.app/Contents/MacOS/controls
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns controls.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns controls.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@controls_bundle: $(____controls_BUNDLE_TGT_REF_DEP)
 

samples/dataview/Makefile.in

@@ -98,11 +98,13 @@ COND_PLATFORM_OS2_1___dataview___os2_emxbindcmd = $(NM) dataview$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__dataview_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__dataview_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= dataview.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__dataview_bundle___depname = dataview_bundle
 @COND_TOOLKIT_COCOA@____dataview_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	dataview.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__dataview_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____dataview_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	dataview.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__dataview_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -165,25 +167,25 @@ dataview$(EXEEXT): $(DATAVIEW_OBJECTS) $(__dataview___win32rc)
 	$(__dataview___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-dataview.app/Contents/PkgInfo: dataview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@dataview.app/Contents/PkgInfo: dataview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p dataview.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p dataview.app/Contents
-	mkdir -p dataview.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p dataview.app/Contents/MacOS
-	mkdir -p dataview.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p dataview.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/dataview/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/dataview/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >dataview.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >dataview.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >dataview.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >dataview.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f dataview$(EXEEXT) dataview.app/Contents/MacOS/dataview
+@COND_PLATFORM_MACOSX_1@	ln -f dataview$(EXEEXT) dataview.app/Contents/MacOS/dataview
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dataview.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dataview.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@dataview_bundle: $(____dataview_BUNDLE_TGT_REF_DEP)
 

samples/debugrpt/Makefile.in

@@ -98,11 +98,13 @@ COND_PLATFORM_OS2_1___debugrpt___os2_emxbindcmd = $(NM) debugrpt$(EXEEXT) | if \
 @COND_PLATFORM_WIN32_1@__debugrpt___win32rc = debugrpt_sample_rc.o
 @COND_PLATFORM_OS2_1@__debugrpt_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__debugrpt_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= debugrpt.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__debugrpt_bundle___depname = debugrpt_bundle
 @COND_TOOLKIT_COCOA@____debugrpt_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	debugrpt.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__debugrpt_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____debugrpt_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	debugrpt.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__debugrpt_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_QA_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_QA_p = $(COND_MONOLITHIC_0___WXLIB_QA_p)
@@ -167,25 +169,25 @@ debugrpt$(EXEEXT): $(DEBUGRPT_OBJECTS) $(__debugrpt___win32rc)
 	$(__debugrpt___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-debugrpt.app/Contents/PkgInfo: debugrpt$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@debugrpt.app/Contents/PkgInfo: debugrpt$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p debugrpt.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p debugrpt.app/Contents
-	mkdir -p debugrpt.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p debugrpt.app/Contents/MacOS
-	mkdir -p debugrpt.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p debugrpt.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/debugrpt/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/debugrpt/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >debugrpt.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >debugrpt.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >debugrpt.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >debugrpt.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f debugrpt$(EXEEXT) debugrpt.app/Contents/MacOS/debugrpt
+@COND_PLATFORM_MACOSX_1@	ln -f debugrpt$(EXEEXT) debugrpt.app/Contents/MacOS/debugrpt
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns debugrpt.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns debugrpt.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@debugrpt_bundle: $(____debugrpt_BUNDLE_TGT_REF_DEP)
 

samples/dialogs/Makefile.in

@@ -101,11 +101,13 @@ COND_PLATFORM_OS2_1___dialogs___os2_emxbindcmd = $(NM) dialogs$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__dialogs_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__dialogs_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= dialogs.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__dialogs_bundle___depname = dialogs_bundle
 @COND_TOOLKIT_COCOA@____dialogs_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	dialogs.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__dialogs_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____dialogs_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	dialogs.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__dialogs_app_Contents_PkgInfo___depname)
 @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS \
 @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@	= dialogs_colrdlgg.o dialogs_dirdlgg.o \
 @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@	dialogs_filedlgg.o dialogs_fontdlgg.o
@@ -184,25 +186,25 @@ dialogs$(EXEEXT): $(DIALOGS_OBJECTS) $(__dialogs___win32rc)
 	$(__dialogs___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-dialogs.app/Contents/PkgInfo: dialogs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@dialogs.app/Contents/PkgInfo: dialogs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p dialogs.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p dialogs.app/Contents
-	mkdir -p dialogs.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p dialogs.app/Contents/MacOS
-	mkdir -p dialogs.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p dialogs.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/dialogs/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/dialogs/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >dialogs.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >dialogs.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >dialogs.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >dialogs.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f dialogs$(EXEEXT) dialogs.app/Contents/MacOS/dialogs
+@COND_PLATFORM_MACOSX_1@	ln -f dialogs$(EXEEXT) dialogs.app/Contents/MacOS/dialogs
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dialogs.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dialogs.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@dialogs_bundle: $(____dialogs_BUNDLE_TGT_REF_DEP)
 

samples/dialup/Makefile.in

@@ -97,11 +97,14 @@ COND_PLATFORM_OS2_1___nettest___os2_emxbindcmd = $(NM) nettest$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__nettest_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__nettest_bundle___depname = nettest_bundle
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@__nettest_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	= nettest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@__nettest_bundle___depname \
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	= nettest_bundle
 @COND_TOOLKIT_COCOA@____nettest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	nettest.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__nettest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____nettest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	nettest.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__nettest_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -161,27 +164,27 @@ distclean: clean
 @COND_PLATFORM_MSDOS_0@	$(__nettest___os2_emxbindcmd)
 @COND_PLATFORM_MSDOS_0@	$(SAMPLES_RPATH_POSTLINK)
 
-nettest.app/Contents/PkgInfo: $(__nettest___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@nettest.app/Contents/PkgInfo: $(__nettest___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p nettest.app/Contents
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	mkdir -p nettest.app/Contents
-	mkdir -p nettest.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	mkdir -p nettest.app/Contents/MacOS
-	mkdir -p nettest.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	mkdir -p nettest.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	-e "s/EXECUTABLE/nettest/" \
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	$(top_srcdir)/src/mac/carbon/Info.plist.in >nettest.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	echo -n "APPL????" >nettest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	ln -f nettest$(EXEEXT) nettest.app/Contents/MacOS/nettest
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns nettest.app/Contents/Resources/wxmac.icns
 
-	
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@nettest_bundle: $(____nettest_BUNDLE_TGT_REF_DEP)
-	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/carbon/Info.plist.in >nettest.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >nettest.app/Contents/PkgInfo
-	
-	
-	ln -f nettest$(EXEEXT) nettest.app/Contents/MacOS/nettest
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns nettest.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@nettest_bundle: $(____nettest_BUNDLE_TGT_REF_DEP)
 
 nettest_nettest.o: $(srcdir)/nettest.cpp
 	$(CXXC) -c -o $@ $(NETTEST_CXXFLAGS) $(srcdir)/nettest.cpp

samples/display/Makefile.in

@@ -97,11 +97,13 @@ COND_PLATFORM_OS2_1___display___os2_emxbindcmd = $(NM) display$(EXEEXT) | if \
 @COND_PLATFORM_WIN32_1@__display___win32rc = display_sample_rc.o
 @COND_PLATFORM_OS2_1@__display_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__display_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= display.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__display_bundle___depname = display_bundle
 @COND_TOOLKIT_COCOA@____display_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	display.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__display_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____display_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	display.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__display_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ display$(EXEEXT): $(DISPLAY_OBJECTS) $(__display___win32rc)
 	$(__display___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-display.app/Contents/PkgInfo: display$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@display.app/Contents/PkgInfo: display$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p display.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p display.app/Contents
-	mkdir -p display.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p display.app/Contents/MacOS
-	mkdir -p display.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p display.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/display/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/display/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >display.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >display.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >display.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >display.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f display$(EXEEXT) display.app/Contents/MacOS/display
+@COND_PLATFORM_MACOSX_1@	ln -f display$(EXEEXT) display.app/Contents/MacOS/display
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns display.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns display.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@display_bundle: $(____display_BUNDLE_TGT_REF_DEP)
 

samples/dnd/Makefile.in

@@ -95,9 +95,13 @@ COND_PLATFORM_OS2_1___dnd___os2_emxbindcmd = $(NM) dnd$(EXEEXT) | if grep -q \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__dnd_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__dnd_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= dnd.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__dnd_bundle___depname = dnd_bundle
-@COND_TOOLKIT_COCOA@____dnd_BUNDLE_TGT_REF_DEP = dnd.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@____dnd_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@____dnd_BUNDLE_TGT_REF_DEP = dnd.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__dnd_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_MAC@____dnd_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__dnd_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -157,25 +161,25 @@ dnd$(EXEEXT): $(DND_OBJECTS) $(__dnd___win32rc)
 	$(__dnd___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-dnd.app/Contents/PkgInfo: dnd$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@dnd.app/Contents/PkgInfo: dnd$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p dnd.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p dnd.app/Contents
-	mkdir -p dnd.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p dnd.app/Contents/MacOS
-	mkdir -p dnd.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p dnd.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/dnd/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/dnd/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >dnd.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >dnd.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >dnd.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >dnd.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f dnd$(EXEEXT) dnd.app/Contents/MacOS/dnd
+@COND_PLATFORM_MACOSX_1@	ln -f dnd$(EXEEXT) dnd.app/Contents/MacOS/dnd
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dnd.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dnd.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@dnd_bundle: $(____dnd_BUNDLE_TGT_REF_DEP)
 

samples/docview/Makefile.in

@@ -103,11 +103,13 @@ COND_PLATFORM_OS2_1___docview___os2_emxbindcmd = $(NM) docview$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__docview_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__docview_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= docview.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__docview_bundle___depname = docview_bundle
 @COND_TOOLKIT_COCOA@____docview_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	docview.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__docview_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____docview_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	docview.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__docview_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -161,25 +163,25 @@ docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc)
 	$(__docview___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-docview.app/Contents/PkgInfo: docview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@docview.app/Contents/PkgInfo: docview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p docview.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p docview.app/Contents
-	mkdir -p docview.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p docview.app/Contents/MacOS
-	mkdir -p docview.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p docview.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/docview/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/docview/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >docview.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >docview.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >docview.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >docview.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f docview$(EXEEXT) docview.app/Contents/MacOS/docview
+@COND_PLATFORM_MACOSX_1@	ln -f docview$(EXEEXT) docview.app/Contents/MacOS/docview
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns docview.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns docview.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@docview_bundle: $(____docview_BUNDLE_TGT_REF_DEP)
 

samples/docvwmdi/Makefile.in

@@ -98,11 +98,13 @@ COND_PLATFORM_OS2_1___docvwmdi___os2_emxbindcmd = $(NM) docvwmdi$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__docvwmdi_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__docvwmdi_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= docvwmdi.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__docvwmdi_bundle___depname = docvwmdi_bundle
 @COND_TOOLKIT_COCOA@____docvwmdi_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	docvwmdi.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__docvwmdi_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____docvwmdi_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	docvwmdi.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__docvwmdi_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -162,25 +164,25 @@ docvwmdi$(EXEEXT): $(DOCVWMDI_OBJECTS) $(__docvwmdi___win32rc)
 	$(__docvwmdi___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-docvwmdi.app/Contents/PkgInfo: docvwmdi$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@docvwmdi.app/Contents/PkgInfo: docvwmdi$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p docvwmdi.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p docvwmdi.app/Contents
-	mkdir -p docvwmdi.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p docvwmdi.app/Contents/MacOS
-	mkdir -p docvwmdi.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p docvwmdi.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/docvwmdi/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/docvwmdi/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >docvwmdi.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >docvwmdi.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >docvwmdi.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >docvwmdi.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f docvwmdi$(EXEEXT) docvwmdi.app/Contents/MacOS/docvwmdi
+@COND_PLATFORM_MACOSX_1@	ln -f docvwmdi$(EXEEXT) docvwmdi.app/Contents/MacOS/docvwmdi
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns docvwmdi.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns docvwmdi.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@docvwmdi_bundle: $(____docvwmdi_BUNDLE_TGT_REF_DEP)
 

samples/dragimag/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___dragimag___os2_emxbindcmd = $(NM) dragimag$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__dragimag_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__dragimag_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= dragimag.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__dragimag_bundle___depname = dragimag_bundle
 @COND_TOOLKIT_COCOA@____dragimag_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	dragimag.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__dragimag_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____dragimag_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	dragimag.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__dragimag_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ dragimag$(EXEEXT): $(DRAGIMAG_OBJECTS) $(__dragimag___win32rc)
 	$(__dragimag___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-dragimag.app/Contents/PkgInfo: dragimag$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@dragimag.app/Contents/PkgInfo: dragimag$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p dragimag.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p dragimag.app/Contents
-	mkdir -p dragimag.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p dragimag.app/Contents/MacOS
-	mkdir -p dragimag.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p dragimag.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/dragimag/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/dragimag/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >dragimag.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >dragimag.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >dragimag.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >dragimag.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f dragimag$(EXEEXT) dragimag.app/Contents/MacOS/dragimag
+@COND_PLATFORM_MACOSX_1@	ln -f dragimag$(EXEEXT) dragimag.app/Contents/MacOS/dragimag
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dragimag.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dragimag.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@dragimag_bundle: $(____dragimag_BUNDLE_TGT_REF_DEP)
 

samples/drawing/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___drawing___os2_emxbindcmd = $(NM) drawing$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__drawing_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__drawing_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= drawing.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__drawing_bundle___depname = drawing_bundle
 @COND_TOOLKIT_COCOA@____drawing_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	drawing.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__drawing_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____drawing_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	drawing.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__drawing_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ drawing$(EXEEXT): $(DRAWING_OBJECTS) $(__drawing___win32rc)
 	$(__drawing___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-drawing.app/Contents/PkgInfo: drawing$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@drawing.app/Contents/PkgInfo: drawing$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p drawing.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p drawing.app/Contents
-	mkdir -p drawing.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p drawing.app/Contents/MacOS
-	mkdir -p drawing.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p drawing.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/drawing/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/drawing/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >drawing.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >drawing.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >drawing.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >drawing.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f drawing$(EXEEXT) drawing.app/Contents/MacOS/drawing
+@COND_PLATFORM_MACOSX_1@	ln -f drawing$(EXEEXT) drawing.app/Contents/MacOS/drawing
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns drawing.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns drawing.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@drawing_bundle: $(____drawing_BUNDLE_TGT_REF_DEP)
 

samples/editlbox/Makefile.in

@@ -99,11 +99,13 @@ COND_PLATFORM_OS2_1___editlbox___os2_emxbindcmd = $(NM) editlbox$(EXEEXT) | if \
 @COND_PLATFORM_WIN32_1@__editlbox___win32rc = editlbox_sample_rc.o
 @COND_PLATFORM_OS2_1@__editlbox_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__editlbox_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= editlbox.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__editlbox_bundle___depname = editlbox_bundle
 @COND_TOOLKIT_COCOA@____editlbox_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	editlbox.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__editlbox_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____editlbox_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	editlbox.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__editlbox_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -165,25 +167,25 @@ editlbox$(EXEEXT): $(EDITLBOX_OBJECTS) $(__editlbox___win32rc)
 	$(__editlbox___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-editlbox.app/Contents/PkgInfo: editlbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@editlbox.app/Contents/PkgInfo: editlbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p editlbox.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p editlbox.app/Contents
-	mkdir -p editlbox.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p editlbox.app/Contents/MacOS
-	mkdir -p editlbox.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p editlbox.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/editlbox/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/editlbox/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >editlbox.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >editlbox.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >editlbox.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >editlbox.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f editlbox$(EXEEXT) editlbox.app/Contents/MacOS/editlbox
+@COND_PLATFORM_MACOSX_1@	ln -f editlbox$(EXEEXT) editlbox.app/Contents/MacOS/editlbox
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns editlbox.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns editlbox.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@editlbox_bundle: $(____editlbox_BUNDLE_TGT_REF_DEP)
 

samples/erase/Makefile.in

@@ -96,10 +96,13 @@ COND_PLATFORM_OS2_1___erase___os2_emxbindcmd = $(NM) erase$(EXEEXT) | if grep -q
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__erase_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__erase_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= erase.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__erase_bundle___depname = erase_bundle
 @COND_TOOLKIT_COCOA@____erase_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	erase.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__erase_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____erase_BUNDLE_TGT_REF_DEP = erase.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____erase_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__erase_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -159,25 +162,25 @@ erase$(EXEEXT): $(ERASE_OBJECTS) $(__erase___win32rc)
 	$(__erase___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-erase.app/Contents/PkgInfo: erase$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@erase.app/Contents/PkgInfo: erase$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p erase.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p erase.app/Contents
-	mkdir -p erase.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p erase.app/Contents/MacOS
-	mkdir -p erase.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p erase.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/erase/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/erase/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >erase.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >erase.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >erase.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >erase.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f erase$(EXEEXT) erase.app/Contents/MacOS/erase
+@COND_PLATFORM_MACOSX_1@	ln -f erase$(EXEEXT) erase.app/Contents/MacOS/erase
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns erase.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns erase.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@erase_bundle: $(____erase_BUNDLE_TGT_REF_DEP)
 

samples/event/Makefile.in

@@ -96,10 +96,13 @@ COND_PLATFORM_OS2_1___event___os2_emxbindcmd = $(NM) event$(EXEEXT) | if grep -q
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__event_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__event_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= event.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__event_bundle___depname = event_bundle
 @COND_TOOLKIT_COCOA@____event_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	event.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__event_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____event_BUNDLE_TGT_REF_DEP = event.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____event_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__event_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -159,25 +162,25 @@ event$(EXEEXT): $(EVENT_OBJECTS) $(__event___win32rc)
 	$(__event___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-event.app/Contents/PkgInfo: event$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@event.app/Contents/PkgInfo: event$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p event.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p event.app/Contents
-	mkdir -p event.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p event.app/Contents/MacOS
-	mkdir -p event.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p event.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/event/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/event/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >event.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >event.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >event.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >event.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f event$(EXEEXT) event.app/Contents/MacOS/event
+@COND_PLATFORM_MACOSX_1@	ln -f event$(EXEEXT) event.app/Contents/MacOS/event
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns event.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns event.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@event_bundle: $(____event_BUNDLE_TGT_REF_DEP)
 

samples/except/Makefile.in

@@ -97,11 +97,13 @@ COND_PLATFORM_OS2_1___except___os2_emxbindcmd = $(NM) except$(EXEEXT) | if grep
 @COND_PLATFORM_WIN32_1@__except___win32rc = except_sample_rc.o
 @COND_PLATFORM_OS2_1@__except_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__except_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= except.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__except_bundle___depname = except_bundle
 @COND_TOOLKIT_COCOA@____except_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	except.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__except_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____except_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	except.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__except_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ except$(EXEEXT): $(EXCEPT_OBJECTS) $(__except___win32rc)
 	$(__except___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-except.app/Contents/PkgInfo: except$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@except.app/Contents/PkgInfo: except$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p except.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p except.app/Contents
-	mkdir -p except.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p except.app/Contents/MacOS
-	mkdir -p except.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p except.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/except/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/except/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >except.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >except.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >except.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >except.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f except$(EXEEXT) except.app/Contents/MacOS/except
+@COND_PLATFORM_MACOSX_1@	ln -f except$(EXEEXT) except.app/Contents/MacOS/except
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns except.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns except.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@except_bundle: $(____except_BUNDLE_TGT_REF_DEP)
 

samples/exec/Makefile.in

@@ -96,9 +96,13 @@ COND_PLATFORM_OS2_1___exec___os2_emxbindcmd = $(NM) exec$(EXEEXT) | if grep -q \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__exec_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__exec_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= exec.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__exec_bundle___depname = exec_bundle
-@COND_TOOLKIT_COCOA@____exec_BUNDLE_TGT_REF_DEP = exec.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@____exec_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@____exec_BUNDLE_TGT_REF_DEP = exec.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__exec_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_MAC@____exec_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__exec_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -158,25 +162,25 @@ exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc)
 	$(__exec___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-exec.app/Contents/PkgInfo: exec$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@exec.app/Contents/PkgInfo: exec$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p exec.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p exec.app/Contents
-	mkdir -p exec.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p exec.app/Contents/MacOS
-	mkdir -p exec.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p exec.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/exec/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/exec/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >exec.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >exec.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >exec.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >exec.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f exec$(EXEEXT) exec.app/Contents/MacOS/exec
+@COND_PLATFORM_MACOSX_1@	ln -f exec$(EXEEXT) exec.app/Contents/MacOS/exec
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns exec.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns exec.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@exec_bundle: $(____exec_BUNDLE_TGT_REF_DEP)
 

samples/font/Makefile.in

@@ -96,9 +96,13 @@ COND_PLATFORM_OS2_1___font___os2_emxbindcmd = $(NM) font$(EXEEXT) | if grep -q \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__font_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__font_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= font.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__font_bundle___depname = font_bundle
-@COND_TOOLKIT_COCOA@____font_BUNDLE_TGT_REF_DEP = font.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@____font_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@____font_BUNDLE_TGT_REF_DEP = font.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__font_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_MAC@____font_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__font_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -158,25 +162,25 @@ font$(EXEEXT): $(FONT_OBJECTS) $(__font___win32rc)
 	$(__font___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-font.app/Contents/PkgInfo: font$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@font.app/Contents/PkgInfo: font$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p font.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p font.app/Contents
-	mkdir -p font.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p font.app/Contents/MacOS
-	mkdir -p font.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p font.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/font/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/font/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >font.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >font.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >font.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >font.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f font$(EXEEXT) font.app/Contents/MacOS/font
+@COND_PLATFORM_MACOSX_1@	ln -f font$(EXEEXT) font.app/Contents/MacOS/font
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns font.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns font.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@font_bundle: $(____font_BUNDLE_TGT_REF_DEP)
 

samples/grid/Makefile.in

@@ -100,9 +100,13 @@ COND_PLATFORM_OS2_1___grid___os2_emxbindcmd = $(NM) grid$(EXEEXT) | if grep -q \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__grid_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__grid_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= grid.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__grid_bundle___depname = grid_bundle
-@COND_TOOLKIT_COCOA@____grid_BUNDLE_TGT_REF_DEP = grid.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@____grid_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@____grid_BUNDLE_TGT_REF_DEP = grid.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__grid_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_MAC@____grid_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__grid_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -171,25 +175,25 @@ grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc)
 	$(__grid___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-grid.app/Contents/PkgInfo: grid$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@grid.app/Contents/PkgInfo: grid$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p grid.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p grid.app/Contents
-	mkdir -p grid.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p grid.app/Contents/MacOS
-	mkdir -p grid.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p grid.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/grid/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/grid/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >grid.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >grid.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >grid.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >grid.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f grid$(EXEEXT) grid.app/Contents/MacOS/grid
+@COND_PLATFORM_MACOSX_1@	ln -f grid$(EXEEXT) grid.app/Contents/MacOS/grid
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns grid.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns grid.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@grid_bundle: $(____grid_BUNDLE_TGT_REF_DEP)
 

samples/help/Makefile.in

@@ -99,9 +99,13 @@ COND_PLATFORM_OS2_1___help___os2_emxbindcmd = $(NM) help$(EXEEXT) | if grep -q \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__help_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__help_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= help.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__help_bundle___depname = help_bundle
-@COND_TOOLKIT_COCOA@____help_BUNDLE_TGT_REF_DEP = help.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@____help_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@____help_BUNDLE_TGT_REF_DEP = help.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__help_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_MAC@____help_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__help_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_HTML_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
@@ -167,25 +171,25 @@ help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc)
 	$(__help___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p help.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p help.app/Contents
-	mkdir -p help.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p help.app/Contents/MacOS
-	mkdir -p help.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p help.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/help/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/help/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >help.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >help.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >help.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >help.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f help$(EXEEXT) help.app/Contents/MacOS/help
+@COND_PLATFORM_MACOSX_1@	ln -f help$(EXEEXT) help.app/Contents/MacOS/help
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns help.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns help.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@help_bundle: $(____help_BUNDLE_TGT_REF_DEP)
 

samples/htlbox/Makefile.in

@@ -97,11 +97,13 @@ COND_PLATFORM_OS2_1___htlbox___os2_emxbindcmd = $(NM) htlbox$(EXEEXT) | if grep
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__htlbox_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__htlbox_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= htlbox.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__htlbox_bundle___depname = htlbox_bundle
 @COND_TOOLKIT_COCOA@____htlbox_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	htlbox.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__htlbox_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____htlbox_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	htlbox.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__htlbox_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_HTML_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
@@ -164,25 +166,25 @@ htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc)
 	$(__htlbox___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p htlbox.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p htlbox.app/Contents
-	mkdir -p htlbox.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p htlbox.app/Contents/MacOS
-	mkdir -p htlbox.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p htlbox.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/htlbox/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/htlbox/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >htlbox.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >htlbox.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >htlbox.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >htlbox.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f htlbox$(EXEEXT) htlbox.app/Contents/MacOS/htlbox
+@COND_PLATFORM_MACOSX_1@	ln -f htlbox$(EXEEXT) htlbox.app/Contents/MacOS/htlbox
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns htlbox.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns htlbox.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@htlbox_bundle: $(____htlbox_BUNDLE_TGT_REF_DEP)
 

samples/html/about/Makefile.in

@@ -97,10 +97,13 @@ COND_PLATFORM_OS2_1___about___os2_emxbindcmd = $(NM) about$(EXEEXT) | if grep -q
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__about_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__about_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= about.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__about_bundle___depname = about_bundle
 @COND_TOOLKIT_COCOA@____about_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	about.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__about_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____about_BUNDLE_TGT_REF_DEP = about.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____about_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__about_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_HTML_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
@@ -163,25 +166,25 @@ about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc)
 	$(__about___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-about.app/Contents/PkgInfo: about$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@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
-	mkdir -p about.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p about.app/Contents
-	mkdir -p about.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p about.app/Contents/MacOS
-	mkdir -p about.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p about.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/about/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/about/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >about.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >about.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >about.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >about.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f about$(EXEEXT) about.app/Contents/MacOS/about
+@COND_PLATFORM_MACOSX_1@	ln -f about$(EXEEXT) about.app/Contents/MacOS/about
-	
+@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/mac/carbon/wxmac.icns about.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@about_bundle: $(____about_BUNDLE_TGT_REF_DEP)
 

samples/html/help/Makefile.in

@@ -97,11 +97,13 @@ COND_PLATFORM_OS2_1___htmlhelp___os2_emxbindcmd = $(NM) htmlhelp$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__htmlhelp_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__htmlhelp_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= htmlhelp.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__htmlhelp_bundle___depname = htmlhelp_bundle
 @COND_TOOLKIT_COCOA@____htmlhelp_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	htmlhelp.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__htmlhelp_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____htmlhelp_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	htmlhelp.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__htmlhelp_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_HTML_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
@@ -164,25 +166,25 @@ htmlhelp$(EXEEXT): $(HTMLHELP_OBJECTS) $(__htmlhelp___win32rc)
 	$(__htmlhelp___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-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/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p htmlhelp.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p htmlhelp.app/Contents
-	mkdir -p htmlhelp.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p htmlhelp.app/Contents/MacOS
-	mkdir -p htmlhelp.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p htmlhelp.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/htmlhelp/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/htmlhelp/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >htmlhelp.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >htmlhelp.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >htmlhelp.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >htmlhelp.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f htmlhelp$(EXEEXT) htmlhelp.app/Contents/MacOS/htmlhelp
+@COND_PLATFORM_MACOSX_1@	ln -f htmlhelp$(EXEEXT) htmlhelp.app/Contents/MacOS/htmlhelp
-	
+@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/mac/carbon/wxmac.icns htmlhelp.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@htmlhelp_bundle: $(____htmlhelp_BUNDLE_TGT_REF_DEP)
 

samples/html/helpview/Makefile.in

@@ -97,11 +97,13 @@ COND_PLATFORM_OS2_1___helpview___os2_emxbindcmd = $(NM) helpview$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__helpview_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__helpview_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= helpview.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__helpview_bundle___depname = helpview_bundle
 @COND_TOOLKIT_COCOA@____helpview_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	helpview.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__helpview_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____helpview_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	helpview.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__helpview_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_HTML_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
@@ -164,25 +166,25 @@ helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
 	$(__helpview___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-helpview.app/Contents/PkgInfo: helpview$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@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
-	mkdir -p helpview.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p helpview.app/Contents
-	mkdir -p helpview.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p helpview.app/Contents/MacOS
-	mkdir -p helpview.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p helpview.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/helpview/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/helpview/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >helpview.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >helpview.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >helpview.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >helpview.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f helpview$(EXEEXT) helpview.app/Contents/MacOS/helpview
+@COND_PLATFORM_MACOSX_1@	ln -f helpview$(EXEEXT) helpview.app/Contents/MacOS/helpview
-	
+@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/mac/carbon/wxmac.icns helpview.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@helpview_bundle: $(____helpview_BUNDLE_TGT_REF_DEP)
 

samples/html/htmlctrl/Makefile.in

@@ -97,11 +97,13 @@ COND_PLATFORM_OS2_1___htmlctrl___os2_emxbindcmd = $(NM) htmlctrl$(EXEEXT) | if \
 @COND_PLATFORM_WIN32_1@__htmlctrl___win32rc = htmlctrl_sample_rc.o
 @COND_PLATFORM_OS2_1@__htmlctrl_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__htmlctrl_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= htmlctrl.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__htmlctrl_bundle___depname = htmlctrl_bundle
 @COND_TOOLKIT_COCOA@____htmlctrl_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	htmlctrl.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__htmlctrl_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____htmlctrl_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	htmlctrl.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__htmlctrl_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ htmlctrl$(EXEEXT): $(HTMLCTRL_OBJECTS) $(__htmlctrl___win32rc)
 	$(__htmlctrl___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-htmlctrl.app/Contents/PkgInfo: htmlctrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@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
-	mkdir -p htmlctrl.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p htmlctrl.app/Contents
-	mkdir -p htmlctrl.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p htmlctrl.app/Contents/MacOS
-	mkdir -p htmlctrl.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p htmlctrl.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/htmlctrl/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/htmlctrl/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >htmlctrl.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >htmlctrl.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >htmlctrl.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >htmlctrl.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f htmlctrl$(EXEEXT) htmlctrl.app/Contents/MacOS/htmlctrl
+@COND_PLATFORM_MACOSX_1@	ln -f htmlctrl$(EXEEXT) htmlctrl.app/Contents/MacOS/htmlctrl
-	
+@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/mac/carbon/wxmac.icns htmlctrl.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@htmlctrl_bundle: $(____htmlctrl_BUNDLE_TGT_REF_DEP)
 

samples/html/printing/Makefile.in

@@ -99,12 +99,14 @@ COND_PLATFORM_OS2_1___htmlprinting___os2_emxbindcmd = $(NM) \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__htmlprinting_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__htmlprinting_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= htmlprinting.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__htmlprinting_bundle___depname \
 @COND_PLATFORM_MACOSX_1@	= htmlprinting_bundle
 @COND_TOOLKIT_COCOA@____htmlprinting_BUNDLE_TGT_REF_DEP \
-@COND_TOOLKIT_COCOA@	= htmlprinting.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	= $(__htmlprinting_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____htmlprinting_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	htmlprinting.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__htmlprinting_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_HTML_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
@@ -168,25 +170,25 @@ htmlprinting$(EXEEXT): $(HTMLPRINTING_OBJECTS) $(__htmlprinting___win32rc)
 	$(__htmlprinting___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-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/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p htmlprinting.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p htmlprinting.app/Contents
-	mkdir -p htmlprinting.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p htmlprinting.app/Contents/MacOS
-	mkdir -p htmlprinting.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p htmlprinting.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/htmlprinting/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/htmlprinting/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >htmlprinting.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >htmlprinting.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >htmlprinting.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >htmlprinting.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f htmlprinting$(EXEEXT) htmlprinting.app/Contents/MacOS/htmlprinting
+@COND_PLATFORM_MACOSX_1@	ln -f htmlprinting$(EXEEXT) htmlprinting.app/Contents/MacOS/htmlprinting
-	
+@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/mac/carbon/wxmac.icns htmlprinting.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@htmlprinting_bundle: $(____htmlprinting_BUNDLE_TGT_REF_DEP)
 

samples/html/test/Makefile.in

@@ -97,9 +97,13 @@ COND_PLATFORM_OS2_1___test___os2_emxbindcmd = $(NM) test$(EXEEXT) | if grep -q \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__test_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__test_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= test.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__test_bundle___depname = test_bundle
-@COND_TOOLKIT_COCOA@____test_BUNDLE_TGT_REF_DEP = test.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@____test_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@____test_BUNDLE_TGT_REF_DEP = test.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__test_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_MAC@____test_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__test_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_HTML_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
@@ -165,25 +169,25 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
 	$(__test___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@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
-	mkdir -p test.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p test.app/Contents
-	mkdir -p test.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p test.app/Contents/MacOS
-	mkdir -p test.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p test.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/test/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/test/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >test.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >test.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >test.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >test.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f test$(EXEEXT) test.app/Contents/MacOS/test
+@COND_PLATFORM_MACOSX_1@	ln -f test$(EXEEXT) test.app/Contents/MacOS/test
-	
+@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/mac/carbon/wxmac.icns test.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@test_bundle: $(____test_BUNDLE_TGT_REF_DEP)
 

samples/html/virtual/Makefile.in

@@ -97,11 +97,13 @@ COND_PLATFORM_OS2_1___virtual___os2_emxbindcmd = $(NM) virtual$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__virtual_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__virtual_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= virtual.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__virtual_bundle___depname = virtual_bundle
 @COND_TOOLKIT_COCOA@____virtual_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	virtual.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__virtual_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____virtual_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	virtual.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__virtual_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_HTML_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
@@ -164,25 +166,25 @@ virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc)
 	$(__virtual___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-virtual.app/Contents/PkgInfo: virtual$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@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
-	mkdir -p virtual.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p virtual.app/Contents
-	mkdir -p virtual.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p virtual.app/Contents/MacOS
-	mkdir -p virtual.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p virtual.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/virtual/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/virtual/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >virtual.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >virtual.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >virtual.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >virtual.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f virtual$(EXEEXT) virtual.app/Contents/MacOS/virtual
+@COND_PLATFORM_MACOSX_1@	ln -f virtual$(EXEEXT) virtual.app/Contents/MacOS/virtual
-	
+@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/mac/carbon/wxmac.icns virtual.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@virtual_bundle: $(____virtual_BUNDLE_TGT_REF_DEP)
 

samples/html/widget/Makefile.in

@@ -97,11 +97,13 @@ COND_PLATFORM_OS2_1___widget___os2_emxbindcmd = $(NM) widget$(EXEEXT) | if grep
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__widget_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__widget_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= widget.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__widget_bundle___depname = widget_bundle
 @COND_TOOLKIT_COCOA@____widget_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	widget.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__widget_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____widget_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	widget.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__widget_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_HTML_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
@@ -164,25 +166,25 @@ widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc)
 	$(__widget___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-widget.app/Contents/PkgInfo: widget$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@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
-	mkdir -p widget.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p widget.app/Contents
-	mkdir -p widget.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p widget.app/Contents/MacOS
-	mkdir -p widget.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p widget.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/widget/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/widget/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >widget.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >widget.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >widget.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >widget.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f widget$(EXEEXT) widget.app/Contents/MacOS/widget
+@COND_PLATFORM_MACOSX_1@	ln -f widget$(EXEEXT) widget.app/Contents/MacOS/widget
-	
+@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/mac/carbon/wxmac.icns widget.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@widget_bundle: $(____widget_BUNDLE_TGT_REF_DEP)
 

samples/html/zip/Makefile.in

@@ -96,9 +96,13 @@ COND_PLATFORM_OS2_1___zip___os2_emxbindcmd = $(NM) zip$(EXEEXT) | if grep -q \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__zip_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__zip_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= zip.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__zip_bundle___depname = zip_bundle
-@COND_TOOLKIT_COCOA@____zip_BUNDLE_TGT_REF_DEP = zip.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@____zip_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@____zip_BUNDLE_TGT_REF_DEP = zip.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__zip_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_MAC@____zip_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__zip_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_HTML_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
@@ -161,25 +165,25 @@ zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc)
 	$(__zip___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-zip.app/Contents/PkgInfo: zip$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@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
-	mkdir -p zip.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p zip.app/Contents
-	mkdir -p zip.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p zip.app/Contents/MacOS
-	mkdir -p zip.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p zip.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/zip/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/zip/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >zip.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >zip.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >zip.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >zip.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f zip$(EXEEXT) zip.app/Contents/MacOS/zip
+@COND_PLATFORM_MACOSX_1@	ln -f zip$(EXEEXT) zip.app/Contents/MacOS/zip
-	
+@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/mac/carbon/wxmac.icns zip.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@zip_bundle: $(____zip_BUNDLE_TGT_REF_DEP)
 

samples/image/Makefile.in

@@ -96,10 +96,13 @@ COND_PLATFORM_OS2_1___image___os2_emxbindcmd = $(NM) image$(EXEEXT) | if grep -q
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__image_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__image_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= image.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__image_bundle___depname = image_bundle
 @COND_TOOLKIT_COCOA@____image_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	image.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__image_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____image_BUNDLE_TGT_REF_DEP = image.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____image_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__image_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -159,25 +162,25 @@ image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc)
 	$(__image___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p image.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p image.app/Contents
-	mkdir -p image.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p image.app/Contents/MacOS
-	mkdir -p image.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p image.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/image/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/image/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >image.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >image.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >image.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >image.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f image$(EXEEXT) image.app/Contents/MacOS/image
+@COND_PLATFORM_MACOSX_1@	ln -f image$(EXEEXT) image.app/Contents/MacOS/image
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns image.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns image.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@image_bundle: $(____image_BUNDLE_TGT_REF_DEP)
 

samples/internat/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___internat___os2_emxbindcmd = $(NM) internat$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__internat_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__internat_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= internat.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__internat_bundle___depname = internat_bundle
 @COND_TOOLKIT_COCOA@____internat_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	internat.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__internat_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____internat_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	internat.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__internat_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc)
 	$(__internat___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p internat.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p internat.app/Contents
-	mkdir -p internat.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p internat.app/Contents/MacOS
-	mkdir -p internat.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p internat.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/internat/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/internat/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >internat.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >internat.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >internat.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >internat.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f internat$(EXEEXT) internat.app/Contents/MacOS/internat
+@COND_PLATFORM_MACOSX_1@	ln -f internat$(EXEEXT) internat.app/Contents/MacOS/internat
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns internat.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns internat.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@internat_bundle: $(____internat_BUNDLE_TGT_REF_DEP)
 

samples/ipc/Makefile.in

@@ -97,11 +97,14 @@ COND_PLATFORM_OS2_1___ipcclient___os2_emxbindcmd = $(NM) ipcclient$(EXEEXT) | \
 	if grep -q pmwin.763 ; then emxbind -ep ipcclient$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__ipcclient___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___ipcclient___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__ipcclient___win32rc = ipcclient_sample_rc.o
-@COND_PLATFORM_MACOSX_1@__ipcclient_bundle___depname = ipcclient_bundle
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@__ipcclient_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	= ipcclient.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@__ipcclient_bundle___depname \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	= ipcclient_bundle
 @COND_TOOLKIT_COCOA@____ipcclient_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	ipcclient.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__ipcclient_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____ipcclient_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	ipcclient.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__ipcclient_app_Contents_PkgInfo___depname)
 @COND_USE_GUI_1@__ipcserver___depname = ipcserver$(EXEEXT)
 @COND_PLATFORM_MAC_0@__ipcserver___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__ipcserver___mac_setfilecmd = \
@@ -111,11 +114,14 @@ COND_PLATFORM_OS2_1___ipcserver___os2_emxbindcmd = $(NM) ipcserver$(EXEEXT) | \
 	if grep -q pmwin.763 ; then emxbind -ep ipcserver$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__ipcserver___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___ipcserver___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__ipcserver___win32rc = ipcserver_sample_rc.o
-@COND_PLATFORM_MACOSX_1@__ipcserver_bundle___depname = ipcserver_bundle
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@__ipcserver_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	= ipcserver.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@__ipcserver_bundle___depname \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	= ipcserver_bundle
 @COND_TOOLKIT_COCOA@____ipcserver_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	ipcserver.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__ipcserver_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____ipcserver_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	ipcserver.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__ipcserver_app_Contents_PkgInfo___depname)
 @COND_PLATFORM_MAC_0@__baseipcclient___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__baseipcclient___mac_setfilecmd \
 @COND_PLATFORM_MAC_1@	= $(SETFILE) -t APPL baseipcclient$(EXEEXT)
@@ -213,27 +219,27 @@ distclean: clean
 @COND_USE_GUI_1@	$(__ipcclient___os2_emxbindcmd)
 @COND_USE_GUI_1@	$(SAMPLES_RPATH_POSTLINK)
 
-ipcclient.app/Contents/PkgInfo: $(__ipcclient___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcclient.app/Contents/PkgInfo: $(__ipcclient___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p ipcclient.app/Contents
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p ipcclient.app/Contents
-	mkdir -p ipcclient.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p ipcclient.app/Contents/MacOS
-	mkdir -p ipcclient.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p ipcclient.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/EXECUTABLE/ipcclient/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >ipcclient.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	echo -n "APPL????" >ipcclient.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	ln -f ipcclient$(EXEEXT) ipcclient.app/Contents/MacOS/ipcclient
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns ipcclient.app/Contents/Resources/wxmac.icns
 
-	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcclient_bundle: $(____ipcclient_BUNDLE_TGT_REF_DEP)
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/ipcclient/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >ipcclient.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >ipcclient.app/Contents/PkgInfo
-	
-	
-	ln -f ipcclient$(EXEEXT) ipcclient.app/Contents/MacOS/ipcclient
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns ipcclient.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@ipcclient_bundle: $(____ipcclient_BUNDLE_TGT_REF_DEP)
 
 @COND_USE_GUI_1@ipcserver$(EXEEXT): $(IPCSERVER_OBJECTS) $(__ipcserver___win32rc)
 @COND_USE_GUI_1@	$(CXX) -o $@ $(IPCSERVER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
@@ -242,27 +248,27 @@ ipcclient.app/Contents/PkgInfo: $(__ipcclient___depname) $(top_srcdir)/src/mac/c
 @COND_USE_GUI_1@	$(__ipcserver___os2_emxbindcmd)
 @COND_USE_GUI_1@	$(SAMPLES_RPATH_POSTLINK)
 
-ipcserver.app/Contents/PkgInfo: $(__ipcserver___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcserver.app/Contents/PkgInfo: $(__ipcserver___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p ipcserver.app/Contents
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p ipcserver.app/Contents
-	mkdir -p ipcserver.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p ipcserver.app/Contents/MacOS
-	mkdir -p ipcserver.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p ipcserver.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/EXECUTABLE/ipcserver/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >ipcserver.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	echo -n "APPL????" >ipcserver.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	ln -f ipcserver$(EXEEXT) ipcserver.app/Contents/MacOS/ipcserver
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns ipcserver.app/Contents/Resources/wxmac.icns
 
-	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcserver_bundle: $(____ipcserver_BUNDLE_TGT_REF_DEP)
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/ipcserver/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >ipcserver.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >ipcserver.app/Contents/PkgInfo
-	
-	
-	ln -f ipcserver$(EXEEXT) ipcserver.app/Contents/MacOS/ipcserver
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns ipcserver.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@ipcserver_bundle: $(____ipcserver_BUNDLE_TGT_REF_DEP)
 
 baseipcclient$(EXEEXT): $(BASEIPCCLIENT_OBJECTS)
 	$(CXX) -o $@ $(BASEIPCCLIENT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)

samples/joytest/Makefile.in

@@ -100,11 +100,13 @@ COND_PLATFORM_OS2_1___joytest___os2_emxbindcmd = $(NM) joytest$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__joytest_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__joytest_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= joytest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__joytest_bundle___depname = joytest_bundle
 @COND_TOOLKIT_COCOA@____joytest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	joytest.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__joytest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____joytest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	joytest.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__joytest_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -173,25 +175,25 @@ joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc)
 	$(__joytest___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p joytest.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p joytest.app/Contents
-	mkdir -p joytest.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p joytest.app/Contents/MacOS
-	mkdir -p joytest.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p joytest.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/joytest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/joytest/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >joytest.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >joytest.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >joytest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >joytest.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f joytest$(EXEEXT) joytest.app/Contents/MacOS/joytest
+@COND_PLATFORM_MACOSX_1@	ln -f joytest$(EXEEXT) joytest.app/Contents/MacOS/joytest
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns joytest.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns joytest.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@joytest_bundle: $(____joytest_BUNDLE_TGT_REF_DEP)
 

samples/keyboard/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___keyboard___os2_emxbindcmd = $(NM) keyboard$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__keyboard_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__keyboard_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= keyboard.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__keyboard_bundle___depname = keyboard_bundle
 @COND_TOOLKIT_COCOA@____keyboard_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	keyboard.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__keyboard_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____keyboard_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	keyboard.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__keyboard_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc)
 	$(__keyboard___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p keyboard.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p keyboard.app/Contents
-	mkdir -p keyboard.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p keyboard.app/Contents/MacOS
-	mkdir -p keyboard.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p keyboard.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/keyboard/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/keyboard/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >keyboard.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >keyboard.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >keyboard.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >keyboard.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f keyboard$(EXEEXT) keyboard.app/Contents/MacOS/keyboard
+@COND_PLATFORM_MACOSX_1@	ln -f keyboard$(EXEEXT) keyboard.app/Contents/MacOS/keyboard
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns keyboard.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns keyboard.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@keyboard_bundle: $(____keyboard_BUNDLE_TGT_REF_DEP)
 

samples/layout/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___layout___os2_emxbindcmd = $(NM) layout$(EXEEXT) | if grep
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__layout_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__layout_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= layout.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__layout_bundle___depname = layout_bundle
 @COND_TOOLKIT_COCOA@____layout_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	layout.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__layout_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____layout_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	layout.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__layout_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc)
 	$(__layout___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-layout.app/Contents/PkgInfo: layout$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@layout.app/Contents/PkgInfo: layout$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p layout.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p layout.app/Contents
-	mkdir -p layout.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p layout.app/Contents/MacOS
-	mkdir -p layout.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p layout.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/layout/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/layout/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >layout.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >layout.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >layout.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >layout.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f layout$(EXEEXT) layout.app/Contents/MacOS/layout
+@COND_PLATFORM_MACOSX_1@	ln -f layout$(EXEEXT) layout.app/Contents/MacOS/layout
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns layout.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns layout.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@layout_bundle: $(____layout_BUNDLE_TGT_REF_DEP)
 

samples/listctrl/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___listctrl___os2_emxbindcmd = $(NM) listctrl$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__listctrl_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__listctrl_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= listctrl.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__listctrl_bundle___depname = listctrl_bundle
 @COND_TOOLKIT_COCOA@____listctrl_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	listctrl.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__listctrl_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____listctrl_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	listctrl.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__listctrl_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ listctrl$(EXEEXT): $(LISTCTRL_OBJECTS) $(__listctrl___win32rc)
 	$(__listctrl___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-listctrl.app/Contents/PkgInfo: listctrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@listctrl.app/Contents/PkgInfo: listctrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p listctrl.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p listctrl.app/Contents
-	mkdir -p listctrl.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p listctrl.app/Contents/MacOS
-	mkdir -p listctrl.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p listctrl.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/listctrl/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/listctrl/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >listctrl.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >listctrl.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >listctrl.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >listctrl.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f listctrl$(EXEEXT) listctrl.app/Contents/MacOS/listctrl
+@COND_PLATFORM_MACOSX_1@	ln -f listctrl$(EXEEXT) listctrl.app/Contents/MacOS/listctrl
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns listctrl.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns listctrl.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@listctrl_bundle: $(____listctrl_BUNDLE_TGT_REF_DEP)
 

samples/makefile.bcc

@@ -43,7 +43,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 
 ### Targets: ###
 
-all: access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
+all: access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc
 
 clean: 
 	-if exist .\*.obj del .\*.obj
@@ -337,6 +337,10 @@ clean:
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wizard.bat
 	call wizard.bat
 	@del wizard.bat
+	@echo cd wrapsizer >wrapsizer.bat
+	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wrapsizer.bat
+	call wrapsizer.bat
+	@del wrapsizer.bat
 	@echo cd mfc >mfc.bat
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>mfc.bat
 	call mfc.bat
@@ -774,6 +778,12 @@ wizard:
 	call wizard.bat
 	@del wizard.bat
 
+wrapsizer: 
+	@echo cd wrapsizer >wrapsizer.bat
+	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>wrapsizer.bat
+	call wrapsizer.bat
+	@del wrapsizer.bat
+
 mfc: 
 	@echo cd mfc >mfc.bat
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>mfc.bat

samples/makefile.gcc

@@ -35,7 +35,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
 
 ### Targets: ###
 
-all: access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
+all: access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc
 
 clean: 
 	-if exist .\*.o del .\*.o
@@ -112,6 +112,7 @@ clean:
 	$(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) clean
+	$(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) clean
 
 access: 
@@ -330,10 +331,13 @@ widgets:
 wizard: 
 	$(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) all
 
+wrapsizer: 
+	$(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) all
+
 mfc: 
 	$(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) all
 
-.PHONY: all clean access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
+.PHONY: all clean access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc
 
 
 SHELL := $(COMSPEC)

samples/makefile.vc

@@ -34,7 +34,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 
 ### Targets: ###
 
-all: sub_access sub_animate sub_artprov sub_aui sub_calendar sub_caret sub_collpane sub_config sub_combo sub_console sub_controls sub_dataview sub_dialogs sub_dialup sub_display sub_dnd sub_docview sub_docvwmdi sub_dragimag sub_drawing sub_erase sub_event sub_exec sub_except sub_font sub_grid sub_help sub_htlbox sub_html sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi sub_mediaplayer sub_memcheck sub_menu sub_minimal sub_mobile sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_printing sub_regtest sub_render sub_richtext sub_sashtest sub_scroll sub_scrollsub sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_stc sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard sub_mfc
+all: sub_access sub_animate sub_artprov sub_aui sub_calendar sub_caret sub_collpane sub_config sub_combo sub_console sub_controls sub_dataview sub_dialogs sub_dialup sub_display sub_dnd sub_docview sub_docvwmdi sub_dragimag sub_drawing sub_erase sub_event sub_exec sub_except sub_font sub_grid sub_help sub_htlbox sub_html sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi sub_mediaplayer sub_memcheck sub_menu sub_minimal sub_mobile sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_printing sub_regtest sub_render sub_richtext sub_sashtest sub_scroll sub_scrollsub sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_stc sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard sub_wrapsizer sub_mfc
 
 clean: 
 	-if exist .\*.obj del .\*.obj
@@ -256,6 +256,9 @@ clean:
 	cd wizard
 	$(MAKE) -f makefile.vc $(MAKEARGS) clean
 	cd "$(MAKEDIR)"
+	cd wrapsizer
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd "$(MAKEDIR)"
 	cd mfc
 	$(MAKE) -f makefile.vc $(MAKEARGS) clean
 	cd "$(MAKEDIR)"
@@ -620,6 +623,11 @@ sub_wizard:
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd "$(MAKEDIR)"
 
+sub_wrapsizer: 
+	cd wrapsizer
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
+	cd "$(MAKEDIR)"
+
 sub_mfc: 
 	cd mfc
 	$(MAKE) -f makefile.vc $(MAKEARGS) all

samples/makefile.wat

@@ -48,7 +48,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
 
 ### Targets: ###
 
-all : .SYMBOLIC access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
+all : .SYMBOLIC access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc
 
 clean : .SYMBOLIC 
 	-if exist .\*.obj del .\*.obj
@@ -272,6 +272,9 @@ clean : .SYMBOLIC
 	cd wizard
 	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
 	cd $(WATCOM_CWD)
+	cd wrapsizer
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+	cd $(WATCOM_CWD)
 	cd mfc
 	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
 	cd $(WATCOM_CWD)
@@ -636,6 +639,11 @@ wizard : .SYMBOLIC
 	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
 	cd $(WATCOM_CWD)
 
+wrapsizer : .SYMBOLIC 
+	cd wrapsizer
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
 mfc : .SYMBOLIC 
 	cd mfc
 	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all

samples/mdi/Makefile.in

@@ -95,9 +95,13 @@ COND_PLATFORM_OS2_1___mdi___os2_emxbindcmd = $(NM) mdi$(EXEEXT) | if grep -q \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__mdi_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__mdi_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= mdi.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__mdi_bundle___depname = mdi_bundle
-@COND_TOOLKIT_COCOA@____mdi_BUNDLE_TGT_REF_DEP = mdi.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@____mdi_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@____mdi_BUNDLE_TGT_REF_DEP = mdi.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__mdi_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_MAC@____mdi_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__mdi_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -157,25 +161,25 @@ mdi$(EXEEXT): $(MDI_OBJECTS) $(__mdi___win32rc)
 	$(__mdi___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-mdi.app/Contents/PkgInfo: mdi$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@mdi.app/Contents/PkgInfo: mdi$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p mdi.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p mdi.app/Contents
-	mkdir -p mdi.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p mdi.app/Contents/MacOS
-	mkdir -p mdi.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p mdi.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/mdi/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/mdi/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >mdi.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >mdi.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >mdi.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >mdi.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f mdi$(EXEEXT) mdi.app/Contents/MacOS/mdi
+@COND_PLATFORM_MACOSX_1@	ln -f mdi$(EXEEXT) mdi.app/Contents/MacOS/mdi
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mdi.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mdi.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@mdi_bundle: $(____mdi_BUNDLE_TGT_REF_DEP)
 

samples/mediaplayer/Makefile.in

@@ -99,11 +99,13 @@ COND_PLATFORM_OS2_1___mediaplayer___os2_emxbindcmd = $(NM) \
 @COND_PLATFORM_WIN32_1@__mediaplayer___win32rc = mediaplayer_sample_rc.o
 @COND_PLATFORM_OS2_1@__mediaplayer_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__mediaplayer_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= mediaplayer.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__mediaplayer_bundle___depname = mediaplayer_bundle
 @COND_TOOLKIT_COCOA@____mediaplayer_BUNDLE_TGT_REF_DEP \
-@COND_TOOLKIT_COCOA@	= mediaplayer.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	= $(__mediaplayer_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____mediaplayer_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	mediaplayer.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__mediaplayer_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0_USE_MEDIA_1___WXLIB_MEDIA_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0_USE_MEDIA_1@__WXLIB_MEDIA_p = $(COND_MONOLITHIC_0_USE_MEDIA_1___WXLIB_MEDIA_p)
@@ -165,25 +167,25 @@ mediaplayer$(EXEEXT): $(MEDIAPLAYER_OBJECTS) $(__mediaplayer___win32rc)
 	$(__mediaplayer___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-mediaplayer.app/Contents/PkgInfo: mediaplayer$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@mediaplayer.app/Contents/PkgInfo: mediaplayer$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p mediaplayer.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p mediaplayer.app/Contents
-	mkdir -p mediaplayer.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p mediaplayer.app/Contents/MacOS
-	mkdir -p mediaplayer.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p mediaplayer.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/mediaplayer/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/mediaplayer/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >mediaplayer.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >mediaplayer.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >mediaplayer.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >mediaplayer.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f mediaplayer$(EXEEXT) mediaplayer.app/Contents/MacOS/mediaplayer
+@COND_PLATFORM_MACOSX_1@	ln -f mediaplayer$(EXEEXT) mediaplayer.app/Contents/MacOS/mediaplayer
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mediaplayer.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mediaplayer.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@mediaplayer_bundle: $(____mediaplayer_BUNDLE_TGT_REF_DEP)
 

samples/memcheck/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___memcheck___os2_emxbindcmd = $(NM) memcheck$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__memcheck_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__memcheck_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= memcheck.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__memcheck_bundle___depname = memcheck_bundle
 @COND_TOOLKIT_COCOA@____memcheck_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	memcheck.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__memcheck_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____memcheck_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	memcheck.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__memcheck_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ memcheck$(EXEEXT): $(MEMCHECK_OBJECTS) $(__memcheck___win32rc)
 	$(__memcheck___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-memcheck.app/Contents/PkgInfo: memcheck$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@memcheck.app/Contents/PkgInfo: memcheck$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p memcheck.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p memcheck.app/Contents
-	mkdir -p memcheck.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p memcheck.app/Contents/MacOS
-	mkdir -p memcheck.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p memcheck.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/memcheck/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/memcheck/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >memcheck.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >memcheck.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >memcheck.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >memcheck.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f memcheck$(EXEEXT) memcheck.app/Contents/MacOS/memcheck
+@COND_PLATFORM_MACOSX_1@	ln -f memcheck$(EXEEXT) memcheck.app/Contents/MacOS/memcheck
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns memcheck.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns memcheck.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@memcheck_bundle: $(____memcheck_BUNDLE_TGT_REF_DEP)
 

samples/menu/Makefile.in

@@ -96,9 +96,13 @@ COND_PLATFORM_OS2_1___menu___os2_emxbindcmd = $(NM) menu$(EXEEXT) | if grep -q \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__menu_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__menu_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= menu.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__menu_bundle___depname = menu_bundle
-@COND_TOOLKIT_COCOA@____menu_BUNDLE_TGT_REF_DEP = menu.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@____menu_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@____menu_BUNDLE_TGT_REF_DEP = menu.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__menu_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_MAC@____menu_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__menu_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -158,25 +162,25 @@ menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc)
 	$(__menu___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-menu.app/Contents/PkgInfo: menu$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@menu.app/Contents/PkgInfo: menu$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p menu.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p menu.app/Contents
-	mkdir -p menu.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p menu.app/Contents/MacOS
-	mkdir -p menu.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p menu.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/menu/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/menu/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >menu.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >menu.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >menu.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >menu.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f menu$(EXEEXT) menu.app/Contents/MacOS/menu
+@COND_PLATFORM_MACOSX_1@	ln -f menu$(EXEEXT) menu.app/Contents/MacOS/menu
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns menu.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns menu.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@menu_bundle: $(____menu_BUNDLE_TGT_REF_DEP)
 

samples/mfc/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___mfctest___os2_emxbindcmd = $(NM) mfctest$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__mfctest_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__mfctest_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= mfctest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__mfctest_bundle___depname = mfctest_bundle
 @COND_TOOLKIT_COCOA@____mfctest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	mfctest.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__mfctest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____mfctest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	mfctest.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__mfctest_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ mfctest$(EXEEXT): $(MFCTEST_OBJECTS) $(__mfctest___win32rc)
 	$(__mfctest___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-mfctest.app/Contents/PkgInfo: mfctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@mfctest.app/Contents/PkgInfo: mfctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p mfctest.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p mfctest.app/Contents
-	mkdir -p mfctest.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p mfctest.app/Contents/MacOS
-	mkdir -p mfctest.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p mfctest.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/mfctest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/mfctest/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >mfctest.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >mfctest.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >mfctest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >mfctest.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f mfctest$(EXEEXT) mfctest.app/Contents/MacOS/mfctest
+@COND_PLATFORM_MACOSX_1@	ln -f mfctest$(EXEEXT) mfctest.app/Contents/MacOS/mfctest
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mfctest.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns mfctest.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@mfctest_bundle: $(____mfctest_BUNDLE_TGT_REF_DEP)
 

samples/minimal/Makefile.in

@@ -97,11 +97,13 @@ COND_PLATFORM_OS2_1___minimal___os2_emxbindcmd = $(NM) minimal$(EXEEXT) | if \
 @COND_PLATFORM_WIN32_1@__minimal___win32rc = minimal_sample_rc.o
 @COND_PLATFORM_OS2_1@__minimal_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__minimal_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= minimal.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__minimal_bundle___depname = minimal_bundle
 @COND_TOOLKIT_COCOA@____minimal_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	minimal.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__minimal_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____minimal_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	minimal.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__minimal_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc)
 	$(__minimal___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-minimal.app/Contents/PkgInfo: minimal$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@minimal.app/Contents/PkgInfo: minimal$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p minimal.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p minimal.app/Contents
-	mkdir -p minimal.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p minimal.app/Contents/MacOS
-	mkdir -p minimal.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p minimal.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/minimal/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/minimal/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >minimal.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >minimal.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >minimal.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >minimal.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f minimal$(EXEEXT) minimal.app/Contents/MacOS/minimal
+@COND_PLATFORM_MACOSX_1@	ln -f minimal$(EXEEXT) minimal.app/Contents/MacOS/minimal
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns minimal.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns minimal.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@minimal_bundle: $(____minimal_BUNDLE_TGT_REF_DEP)
 

samples/mobile/styles/Makefile.in

@@ -97,11 +97,13 @@ COND_PLATFORM_OS2_1___styles___os2_emxbindcmd = $(NM) styles$(EXEEXT) | if grep
 @COND_PLATFORM_WIN32_1@__styles___win32rc = styles_sample_rc.o
 @COND_PLATFORM_OS2_1@__styles_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__styles_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= styles.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__styles_bundle___depname = styles_bundle
 @COND_TOOLKIT_COCOA@____styles_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	styles.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__styles_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____styles_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	styles.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__styles_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ styles$(EXEEXT): $(STYLES_OBJECTS) $(__styles___win32rc)
 	$(__styles___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-styles.app/Contents/PkgInfo: styles$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@styles.app/Contents/PkgInfo: styles$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p styles.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p styles.app/Contents
-	mkdir -p styles.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p styles.app/Contents/MacOS
-	mkdir -p styles.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p styles.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/styles/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/styles/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >styles.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >styles.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >styles.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >styles.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f styles$(EXEEXT) styles.app/Contents/MacOS/styles
+@COND_PLATFORM_MACOSX_1@	ln -f styles$(EXEEXT) styles.app/Contents/MacOS/styles
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns styles.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns styles.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@styles_bundle: $(____styles_BUNDLE_TGT_REF_DEP)
 

samples/mobile/wxedit/Makefile.in

@@ -97,11 +97,13 @@ COND_PLATFORM_OS2_1___wxedit___os2_emxbindcmd = $(NM) wxedit$(EXEEXT) | if grep
 @COND_PLATFORM_WIN32_1@__wxedit___win32rc = wxedit_sample_rc.o
 @COND_PLATFORM_OS2_1@__wxedit_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__wxedit_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= wxedit.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__wxedit_bundle___depname = wxedit_bundle
 @COND_TOOLKIT_COCOA@____wxedit_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	wxedit.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__wxedit_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____wxedit_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	wxedit.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__wxedit_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ wxedit$(EXEEXT): $(WXEDIT_OBJECTS) $(__wxedit___win32rc)
 	$(__wxedit___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-wxedit.app/Contents/PkgInfo: wxedit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@wxedit.app/Contents/PkgInfo: wxedit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p wxedit.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p wxedit.app/Contents
-	mkdir -p wxedit.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p wxedit.app/Contents/MacOS
-	mkdir -p wxedit.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p wxedit.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/wxedit/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/wxedit/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >wxedit.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >wxedit.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >wxedit.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >wxedit.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f wxedit$(EXEEXT) wxedit.app/Contents/MacOS/wxedit
+@COND_PLATFORM_MACOSX_1@	ln -f wxedit$(EXEEXT) wxedit.app/Contents/MacOS/wxedit
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns wxedit.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns wxedit.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@wxedit_bundle: $(____wxedit_BUNDLE_TGT_REF_DEP)
 

samples/nativdlg/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___nativdlg___os2_emxbindcmd = $(NM) nativdlg$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__nativdlg_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__nativdlg_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= nativdlg.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__nativdlg_bundle___depname = nativdlg_bundle
 @COND_TOOLKIT_COCOA@____nativdlg_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	nativdlg.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__nativdlg_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____nativdlg_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	nativdlg.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__nativdlg_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ nativdlg$(EXEEXT): $(NATIVDLG_OBJECTS) $(__nativdlg___win32rc)
 	$(__nativdlg___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-nativdlg.app/Contents/PkgInfo: nativdlg$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@nativdlg.app/Contents/PkgInfo: nativdlg$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p nativdlg.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p nativdlg.app/Contents
-	mkdir -p nativdlg.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p nativdlg.app/Contents/MacOS
-	mkdir -p nativdlg.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p nativdlg.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/nativdlg/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/nativdlg/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >nativdlg.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >nativdlg.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >nativdlg.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >nativdlg.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f nativdlg$(EXEEXT) nativdlg.app/Contents/MacOS/nativdlg
+@COND_PLATFORM_MACOSX_1@	ln -f nativdlg$(EXEEXT) nativdlg.app/Contents/MacOS/nativdlg
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns nativdlg.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns nativdlg.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@nativdlg_bundle: $(____nativdlg_BUNDLE_TGT_REF_DEP)
 

samples/notebook/Makefile.in

@@ -97,11 +97,13 @@ COND_PLATFORM_OS2_1___notebook___os2_emxbindcmd = $(NM) notebook$(EXEEXT) | if \
 @COND_PLATFORM_WIN32_1@__notebook___win32rc = notebook_sample_rc.o
 @COND_PLATFORM_OS2_1@__notebook_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__notebook_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= notebook.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__notebook_bundle___depname = notebook_bundle
 @COND_TOOLKIT_COCOA@____notebook_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	notebook.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__notebook_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____notebook_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	notebook.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__notebook_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ notebook$(EXEEXT): $(NOTEBOOK_OBJECTS) $(__notebook___win32rc)
 	$(__notebook___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-notebook.app/Contents/PkgInfo: notebook$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@notebook.app/Contents/PkgInfo: notebook$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p notebook.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p notebook.app/Contents
-	mkdir -p notebook.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p notebook.app/Contents/MacOS
-	mkdir -p notebook.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p notebook.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/notebook/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/notebook/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >notebook.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >notebook.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >notebook.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >notebook.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f notebook$(EXEEXT) notebook.app/Contents/MacOS/notebook
+@COND_PLATFORM_MACOSX_1@	ln -f notebook$(EXEEXT) notebook.app/Contents/MacOS/notebook
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns notebook.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns notebook.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@notebook_bundle: $(____notebook_BUNDLE_TGT_REF_DEP)
 

samples/oleauto/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___oleauto___os2_emxbindcmd = $(NM) oleauto$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__oleauto_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__oleauto_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= oleauto.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__oleauto_bundle___depname = oleauto_bundle
 @COND_TOOLKIT_COCOA@____oleauto_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	oleauto.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__oleauto_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____oleauto_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	oleauto.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__oleauto_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ oleauto$(EXEEXT): $(OLEAUTO_OBJECTS) $(__oleauto___win32rc)
 	$(__oleauto___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-oleauto.app/Contents/PkgInfo: oleauto$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@oleauto.app/Contents/PkgInfo: oleauto$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p oleauto.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p oleauto.app/Contents
-	mkdir -p oleauto.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p oleauto.app/Contents/MacOS
-	mkdir -p oleauto.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p oleauto.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/oleauto/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/oleauto/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >oleauto.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >oleauto.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >oleauto.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >oleauto.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f oleauto$(EXEEXT) oleauto.app/Contents/MacOS/oleauto
+@COND_PLATFORM_MACOSX_1@	ln -f oleauto$(EXEEXT) oleauto.app/Contents/MacOS/oleauto
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns oleauto.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns oleauto.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@oleauto_bundle: $(____oleauto_BUNDLE_TGT_REF_DEP)
 

samples/opengl/cube/Makefile.in

@@ -98,9 +98,13 @@ COND_PLATFORM_OS2_1___cube___os2_emxbindcmd = $(NM) cube$(EXEEXT) | if grep -q \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__cube_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__cube_bundle___depname = cube_bundle
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__cube_app_Contents_PkgInfo___depname \
-@COND_TOOLKIT_COCOA@____cube_BUNDLE_TGT_REF_DEP = cube.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	= cube.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____cube_BUNDLE_TGT_REF_DEP = cube.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__cube_bundle___depname = cube_bundle
+@COND_TOOLKIT_COCOA@____cube_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@	$(__cube_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_MAC@____cube_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__cube_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,27 +164,27 @@ distclean: clean
 @COND_USE_OPENGL_1@	$(__cube___os2_emxbindcmd)
 @COND_USE_OPENGL_1@	$(SAMPLES_RPATH_POSTLINK)
 
-cube.app/Contents/PkgInfo: $(__cube___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@cube.app/Contents/PkgInfo: $(__cube___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p cube.app/Contents
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	mkdir -p cube.app/Contents
-	mkdir -p cube.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	mkdir -p cube.app/Contents/MacOS
-	mkdir -p cube.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	mkdir -p cube.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/EXECUTABLE/cube/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >cube.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	echo -n "APPL????" >cube.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	ln -f cube$(EXEEXT) cube.app/Contents/MacOS/cube
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns cube.app/Contents/Resources/wxmac.icns
 
-	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@cube_bundle: $(____cube_BUNDLE_TGT_REF_DEP)
-	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/carbon/Info.plist.in >cube.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >cube.app/Contents/PkgInfo
-	
-	
-	ln -f cube$(EXEEXT) cube.app/Contents/MacOS/cube
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns cube.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@cube_bundle: $(____cube_BUNDLE_TGT_REF_DEP)
 
 cube_cube.o: $(srcdir)/cube.cpp
 	$(CXXC) -c -o $@ $(CUBE_CXXFLAGS) $(srcdir)/cube.cpp

samples/opengl/isosurf/Makefile.in

@@ -99,11 +99,14 @@ COND_PLATFORM_OS2_1___isosurf___os2_emxbindcmd = $(NM) isosurf$(EXEEXT) | if \
 @COND_PLATFORM_WIN32_1@__isosurf___win32rc = isosurf_sample_rc.o
 @COND_PLATFORM_OS2_1@__isosurf_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__isosurf_bundle___depname = isosurf_bundle
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__isosurf_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	= isosurf.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__isosurf_bundle___depname \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	= isosurf_bundle
 @COND_TOOLKIT_COCOA@____isosurf_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	isosurf.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__isosurf_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____isosurf_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	isosurf.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__isosurf_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -162,27 +165,27 @@ distclean: clean
 @COND_USE_OPENGL_1@	$(__isosurf___os2_emxbindcmd)
 @COND_USE_OPENGL_1@	$(SAMPLES_RPATH_POSTLINK)
 
-isosurf.app/Contents/PkgInfo: $(__isosurf___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@isosurf.app/Contents/PkgInfo: $(__isosurf___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p isosurf.app/Contents
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	mkdir -p isosurf.app/Contents
-	mkdir -p isosurf.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	mkdir -p isosurf.app/Contents/MacOS
-	mkdir -p isosurf.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	mkdir -p isosurf.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/EXECUTABLE/isosurf/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >isosurf.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	echo -n "APPL????" >isosurf.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	ln -f isosurf$(EXEEXT) isosurf.app/Contents/MacOS/isosurf
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns isosurf.app/Contents/Resources/wxmac.icns
 
-	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@isosurf_bundle: $(____isosurf_BUNDLE_TGT_REF_DEP)
-	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/carbon/Info.plist.in >isosurf.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >isosurf.app/Contents/PkgInfo
-	
-	
-	ln -f isosurf$(EXEEXT) isosurf.app/Contents/MacOS/isosurf
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns isosurf.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@isosurf_bundle: $(____isosurf_BUNDLE_TGT_REF_DEP)
 
 data: 
 	@mkdir -p .

samples/opengl/penguin/Makefile.in

@@ -108,11 +108,14 @@ COND_PLATFORM_OS2_1___penguin___os2_emxbindcmd = $(NM) penguin$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__penguin_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__penguin_bundle___depname = penguin_bundle
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__penguin_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	= penguin.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__penguin_bundle___depname \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	= penguin_bundle
 @COND_TOOLKIT_COCOA@____penguin_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	penguin.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__penguin_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____penguin_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	penguin.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__penguin_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -172,27 +175,27 @@ distclean: clean
 @COND_USE_OPENGL_1@	$(__penguin___os2_emxbindcmd)
 @COND_USE_OPENGL_1@	$(SAMPLES_RPATH_POSTLINK)
 
-penguin.app/Contents/PkgInfo: $(__penguin___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@penguin.app/Contents/PkgInfo: $(__penguin___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p penguin.app/Contents
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	mkdir -p penguin.app/Contents
-	mkdir -p penguin.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	mkdir -p penguin.app/Contents/MacOS
-	mkdir -p penguin.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	mkdir -p penguin.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/EXECUTABLE/penguin/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >penguin.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	echo -n "APPL????" >penguin.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	ln -f penguin$(EXEEXT) penguin.app/Contents/MacOS/penguin
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns penguin.app/Contents/Resources/wxmac.icns
 
-	
+@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@penguin_bundle: $(____penguin_BUNDLE_TGT_REF_DEP)
-	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/carbon/Info.plist.in >penguin.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >penguin.app/Contents/PkgInfo
-	
-	
-	ln -f penguin$(EXEEXT) penguin.app/Contents/MacOS/penguin
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns penguin.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@penguin_bundle: $(____penguin_BUNDLE_TGT_REF_DEP)
 
 data: 
 	@mkdir -p .

samples/ownerdrw/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___ownerdrw___os2_emxbindcmd = $(NM) ownerdrw$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__ownerdrw_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__ownerdrw_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= ownerdrw.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__ownerdrw_bundle___depname = ownerdrw_bundle
 @COND_TOOLKIT_COCOA@____ownerdrw_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	ownerdrw.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__ownerdrw_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____ownerdrw_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	ownerdrw.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__ownerdrw_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ ownerdrw$(EXEEXT): $(OWNERDRW_OBJECTS) $(__ownerdrw___win32rc)
 	$(__ownerdrw___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-ownerdrw.app/Contents/PkgInfo: ownerdrw$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@ownerdrw.app/Contents/PkgInfo: ownerdrw$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p ownerdrw.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p ownerdrw.app/Contents
-	mkdir -p ownerdrw.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p ownerdrw.app/Contents/MacOS
-	mkdir -p ownerdrw.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p ownerdrw.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/ownerdrw/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/ownerdrw/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >ownerdrw.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >ownerdrw.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >ownerdrw.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >ownerdrw.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f ownerdrw$(EXEEXT) ownerdrw.app/Contents/MacOS/ownerdrw
+@COND_PLATFORM_MACOSX_1@	ln -f ownerdrw$(EXEEXT) ownerdrw.app/Contents/MacOS/ownerdrw
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns ownerdrw.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns ownerdrw.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@ownerdrw_bundle: $(____ownerdrw_BUNDLE_TGT_REF_DEP)
 

samples/popup/Makefile.in

@@ -96,10 +96,13 @@ COND_PLATFORM_OS2_1___popup___os2_emxbindcmd = $(NM) popup$(EXEEXT) | if grep -q
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__popup_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__popup_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= popup.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__popup_bundle___depname = popup_bundle
 @COND_TOOLKIT_COCOA@____popup_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	popup.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__popup_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____popup_BUNDLE_TGT_REF_DEP = popup.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____popup_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__popup_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -159,25 +162,25 @@ popup$(EXEEXT): $(POPUP_OBJECTS) $(__popup___win32rc)
 	$(__popup___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-popup.app/Contents/PkgInfo: popup$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@popup.app/Contents/PkgInfo: popup$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p popup.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p popup.app/Contents
-	mkdir -p popup.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p popup.app/Contents/MacOS
-	mkdir -p popup.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p popup.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/popup/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/popup/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >popup.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >popup.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >popup.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >popup.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f popup$(EXEEXT) popup.app/Contents/MacOS/popup
+@COND_PLATFORM_MACOSX_1@	ln -f popup$(EXEEXT) popup.app/Contents/MacOS/popup
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns popup.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns popup.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@popup_bundle: $(____popup_BUNDLE_TGT_REF_DEP)
 

samples/power/Makefile.in

@@ -97,10 +97,13 @@ COND_PLATFORM_OS2_1___power___os2_emxbindcmd = $(NM) power$(EXEEXT) | if grep -q
 @COND_PLATFORM_WIN32_1@__power___win32rc = power_sample_rc.o
 @COND_PLATFORM_OS2_1@__power_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__power_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= power.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__power_bundle___depname = power_bundle
 @COND_TOOLKIT_COCOA@____power_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	power.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__power_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____power_BUNDLE_TGT_REF_DEP = power.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____power_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__power_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -159,25 +162,25 @@ power$(EXEEXT): $(POWER_OBJECTS) $(__power___win32rc)
 	$(__power___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-power.app/Contents/PkgInfo: power$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@power.app/Contents/PkgInfo: power$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p power.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p power.app/Contents
-	mkdir -p power.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p power.app/Contents/MacOS
-	mkdir -p power.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p power.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/power/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/power/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >power.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >power.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >power.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >power.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f power$(EXEEXT) power.app/Contents/MacOS/power
+@COND_PLATFORM_MACOSX_1@	ln -f power$(EXEEXT) power.app/Contents/MacOS/power
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns power.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns power.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@power_bundle: $(____power_BUNDLE_TGT_REF_DEP)
 

samples/printing/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___printing___os2_emxbindcmd = $(NM) printing$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__printing_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__printing_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= printing.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__printing_bundle___depname = printing_bundle
 @COND_TOOLKIT_COCOA@____printing_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	printing.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__printing_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____printing_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	printing.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__printing_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc)
 	$(__printing___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p printing.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p printing.app/Contents
-	mkdir -p printing.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p printing.app/Contents/MacOS
-	mkdir -p printing.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p printing.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/printing/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/printing/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >printing.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >printing.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >printing.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >printing.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f printing$(EXEEXT) printing.app/Contents/MacOS/printing
+@COND_PLATFORM_MACOSX_1@	ln -f printing$(EXEEXT) printing.app/Contents/MacOS/printing
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns printing.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns printing.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@printing_bundle: $(____printing_BUNDLE_TGT_REF_DEP)
 

samples/regtest/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___regtest___os2_emxbindcmd = $(NM) regtest$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__regtest_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__regtest_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= regtest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__regtest_bundle___depname = regtest_bundle
 @COND_TOOLKIT_COCOA@____regtest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	regtest.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__regtest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____regtest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	regtest.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__regtest_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ regtest$(EXEEXT): $(REGTEST_OBJECTS) $(__regtest___win32rc)
 	$(__regtest___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-regtest.app/Contents/PkgInfo: regtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@regtest.app/Contents/PkgInfo: regtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p regtest.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p regtest.app/Contents
-	mkdir -p regtest.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p regtest.app/Contents/MacOS
-	mkdir -p regtest.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p regtest.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/regtest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/regtest/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >regtest.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >regtest.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >regtest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >regtest.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f regtest$(EXEEXT) regtest.app/Contents/MacOS/regtest
+@COND_PLATFORM_MACOSX_1@	ln -f regtest$(EXEEXT) regtest.app/Contents/MacOS/regtest
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns regtest.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns regtest.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@regtest_bundle: $(____regtest_BUNDLE_TGT_REF_DEP)
 

samples/render/Makefile.in

@@ -118,11 +118,13 @@ COND_PLATFORM_OS2_1___render___os2_emxbindcmd = $(NM) render$(EXEEXT) | if grep
 @COND_PLATFORM_WIN32_1@__render___win32rc = render_sample_rc.o
 @COND_PLATFORM_OS2_1@__render_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__render_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= render.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__render_bundle___depname = render_bundle
 @COND_TOOLKIT_COCOA@____render_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	render.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__render_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____render_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	render.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__render_app_Contents_PkgInfo___depname)
 COND_SHARED_1___renddll___depname = \
 	$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
 @COND_SHARED_1@__renddll___depname = $(COND_SHARED_1___renddll___depname)
@@ -192,25 +194,25 @@ render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc)
 	$(__render___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p render.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p render.app/Contents
-	mkdir -p render.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p render.app/Contents/MacOS
-	mkdir -p render.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p render.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/render/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/render/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >render.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >render.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >render.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >render.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f render$(EXEEXT) render.app/Contents/MacOS/render
+@COND_PLATFORM_MACOSX_1@	ln -f render$(EXEEXT) render.app/Contents/MacOS/render
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns render.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns render.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@render_bundle: $(____render_BUNDLE_TGT_REF_DEP)
 

samples/richtext/Makefile.in

@@ -100,11 +100,13 @@ COND_PLATFORM_OS2_1___richtext___os2_emxbindcmd = $(NM) richtext$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__richtext_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__richtext_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= richtext.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__richtext_bundle___depname = richtext_bundle
 @COND_TOOLKIT_COCOA@____richtext_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	richtext.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__richtext_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____richtext_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	richtext.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__richtext_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_RICHTEXT_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_RICHTEXT_p = $(COND_MONOLITHIC_0___WXLIB_RICHTEXT_p)
@@ -176,25 +178,25 @@ richtext$(EXEEXT): $(RICHTEXT_OBJECTS) $(__richtext___win32rc)
 	$(__richtext___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-richtext.app/Contents/PkgInfo: richtext$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@richtext.app/Contents/PkgInfo: richtext$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p richtext.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p richtext.app/Contents
-	mkdir -p richtext.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p richtext.app/Contents/MacOS
-	mkdir -p richtext.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p richtext.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/richtext/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/richtext/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >richtext.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >richtext.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >richtext.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >richtext.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f richtext$(EXEEXT) richtext.app/Contents/MacOS/richtext
+@COND_PLATFORM_MACOSX_1@	ln -f richtext$(EXEEXT) richtext.app/Contents/MacOS/richtext
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns richtext.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns richtext.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@richtext_bundle: $(____richtext_BUNDLE_TGT_REF_DEP)
 

samples/sashtest/Makefile.in

@@ -100,11 +100,13 @@ COND_PLATFORM_OS2_1___sashtest___os2_emxbindcmd = $(NM) sashtest$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__sashtest_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__sashtest_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= sashtest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__sashtest_bundle___depname = sashtest_bundle
 @COND_TOOLKIT_COCOA@____sashtest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	sashtest.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__sashtest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____sashtest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	sashtest.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__sashtest_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -173,25 +175,25 @@ sashtest$(EXEEXT): $(SASHTEST_OBJECTS) $(__sashtest___win32rc)
 	$(__sashtest___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-sashtest.app/Contents/PkgInfo: sashtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@sashtest.app/Contents/PkgInfo: sashtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p sashtest.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p sashtest.app/Contents
-	mkdir -p sashtest.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p sashtest.app/Contents/MacOS
-	mkdir -p sashtest.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p sashtest.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/sashtest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/sashtest/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >sashtest.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >sashtest.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >sashtest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >sashtest.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f sashtest$(EXEEXT) sashtest.app/Contents/MacOS/sashtest
+@COND_PLATFORM_MACOSX_1@	ln -f sashtest$(EXEEXT) sashtest.app/Contents/MacOS/sashtest
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns sashtest.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns sashtest.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@sashtest_bundle: $(____sashtest_BUNDLE_TGT_REF_DEP)
 

samples/scroll/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___scroll___os2_emxbindcmd = $(NM) scroll$(EXEEXT) | if grep
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__scroll_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__scroll_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= scroll.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__scroll_bundle___depname = scroll_bundle
 @COND_TOOLKIT_COCOA@____scroll_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	scroll.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__scroll_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____scroll_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	scroll.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__scroll_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ scroll$(EXEEXT): $(SCROLL_OBJECTS) $(__scroll___win32rc)
 	$(__scroll___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-scroll.app/Contents/PkgInfo: scroll$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@scroll.app/Contents/PkgInfo: scroll$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p scroll.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p scroll.app/Contents
-	mkdir -p scroll.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p scroll.app/Contents/MacOS
-	mkdir -p scroll.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p scroll.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/scroll/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/scroll/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >scroll.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >scroll.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >scroll.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >scroll.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f scroll$(EXEEXT) scroll.app/Contents/MacOS/scroll
+@COND_PLATFORM_MACOSX_1@	ln -f scroll$(EXEEXT) scroll.app/Contents/MacOS/scroll
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns scroll.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns scroll.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@scroll_bundle: $(____scroll_BUNDLE_TGT_REF_DEP)
 

samples/scrollsub/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___scrollsub___os2_emxbindcmd = $(NM) scrollsub$(EXEEXT) | \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__scrollsub_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__scrollsub_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= scrollsub.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__scrollsub_bundle___depname = scrollsub_bundle
 @COND_TOOLKIT_COCOA@____scrollsub_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	scrollsub.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__scrollsub_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____scrollsub_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	scrollsub.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__scrollsub_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ scrollsub$(EXEEXT): $(SCROLLSUB_OBJECTS) $(__scrollsub___win32rc)
 	$(__scrollsub___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-scrollsub.app/Contents/PkgInfo: scrollsub$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@scrollsub.app/Contents/PkgInfo: scrollsub$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p scrollsub.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p scrollsub.app/Contents
-	mkdir -p scrollsub.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p scrollsub.app/Contents/MacOS
-	mkdir -p scrollsub.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p scrollsub.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/scrollsub/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/scrollsub/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >scrollsub.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >scrollsub.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >scrollsub.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >scrollsub.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f scrollsub$(EXEEXT) scrollsub.app/Contents/MacOS/scrollsub
+@COND_PLATFORM_MACOSX_1@	ln -f scrollsub$(EXEEXT) scrollsub.app/Contents/MacOS/scrollsub
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns scrollsub.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns scrollsub.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@scrollsub_bundle: $(____scrollsub_BUNDLE_TGT_REF_DEP)
 

samples/shaped/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___shaped___os2_emxbindcmd = $(NM) shaped$(EXEEXT) | if grep
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__shaped_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__shaped_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= shaped.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__shaped_bundle___depname = shaped_bundle
 @COND_TOOLKIT_COCOA@____shaped_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	shaped.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__shaped_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____shaped_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	shaped.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__shaped_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc)
 	$(__shaped___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p shaped.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p shaped.app/Contents
-	mkdir -p shaped.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p shaped.app/Contents/MacOS
-	mkdir -p shaped.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p shaped.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/shaped/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/shaped/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >shaped.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >shaped.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >shaped.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >shaped.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f shaped$(EXEEXT) shaped.app/Contents/MacOS/shaped
+@COND_PLATFORM_MACOSX_1@	ln -f shaped$(EXEEXT) shaped.app/Contents/MacOS/shaped
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns shaped.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns shaped.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@shaped_bundle: $(____shaped_BUNDLE_TGT_REF_DEP)
 

samples/sockets/Makefile.in

@@ -96,11 +96,13 @@ BASESERVER_OBJECTS =  \
 COND_PLATFORM_OS2_1___client___os2_emxbindcmd = $(NM) client$(EXEEXT) | if grep \
 	-q pmwin.763 ; then emxbind -ep client$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__client___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___client___os2_emxbindcmd)
-@COND_PLATFORM_MACOSX_1@__client_bundle___depname = client_bundle
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@__client_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	= client.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@__client_bundle___depname = client_bundle
 @COND_TOOLKIT_COCOA@____client_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	client.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__client_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____client_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	client.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__client_app_Contents_PkgInfo___depname)
 @COND_PLATFORM_WIN32_1@__client___win32rc = client_client_rc.o
 @COND_USE_GUI_1@__server___depname = server$(EXEEXT)
 @COND_PLATFORM_MAC_0@__server___mac_setfilecmd = @true
@@ -110,11 +112,13 @@ COND_PLATFORM_OS2_1___client___os2_emxbindcmd = $(NM) client$(EXEEXT) | if grep
 COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep \
 	-q pmwin.763 ; then emxbind -ep server$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__server___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___server___os2_emxbindcmd)
-@COND_PLATFORM_MACOSX_1@__server_bundle___depname = server_bundle
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@__server_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	= server.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@__server_bundle___depname = server_bundle
 @COND_TOOLKIT_COCOA@____server_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	server.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__server_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____server_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	server.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__server_app_Contents_PkgInfo___depname)
 @COND_PLATFORM_WIN32_1@__server___win32rc = server_server_rc.o
 @COND_PLATFORM_MAC_0@__baseclient___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__baseclient___mac_setfilecmd = \
@@ -213,27 +217,27 @@ distclean: clean
 @COND_USE_GUI_1@	$(__client___os2_emxbindcmd)
 @COND_USE_GUI_1@	$(SAMPLES_RPATH_POSTLINK)
 
-client.app/Contents/PkgInfo: $(__client___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@client.app/Contents/PkgInfo: $(__client___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p client.app/Contents
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p client.app/Contents
-	mkdir -p client.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p client.app/Contents/MacOS
-	mkdir -p client.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p client.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/EXECUTABLE/client/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >client.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	echo -n "APPL????" >client.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	ln -f client$(EXEEXT) client.app/Contents/MacOS/client
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns client.app/Contents/Resources/wxmac.icns
 
-	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@client_bundle: $(____client_BUNDLE_TGT_REF_DEP)
-	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/carbon/Info.plist.in >client.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >client.app/Contents/PkgInfo
-	
-	
-	ln -f client$(EXEEXT) client.app/Contents/MacOS/client
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns client.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@client_bundle: $(____client_BUNDLE_TGT_REF_DEP)
 
 @COND_USE_GUI_1@server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc)
 @COND_USE_GUI_1@	$(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
@@ -242,27 +246,27 @@ client.app/Contents/PkgInfo: $(__client___depname) $(top_srcdir)/src/mac/carbon/
 @COND_USE_GUI_1@	$(__server___os2_emxbindcmd)
 @COND_USE_GUI_1@	$(SAMPLES_RPATH_POSTLINK)
 
-server.app/Contents/PkgInfo: $(__server___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@server.app/Contents/PkgInfo: $(__server___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p server.app/Contents
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p server.app/Contents
-	mkdir -p server.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p server.app/Contents/MacOS
-	mkdir -p server.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p server.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/EXECUTABLE/server/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >server.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	echo -n "APPL????" >server.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	ln -f server$(EXEEXT) server.app/Contents/MacOS/server
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns server.app/Contents/Resources/wxmac.icns
 
-	
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@server_bundle: $(____server_BUNDLE_TGT_REF_DEP)
-	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/carbon/Info.plist.in >server.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >server.app/Contents/PkgInfo
-	
-	
-	ln -f server$(EXEEXT) server.app/Contents/MacOS/server
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns server.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@server_bundle: $(____server_BUNDLE_TGT_REF_DEP)
 
 baseclient$(EXEEXT): $(BASECLIENT_OBJECTS)
 	$(CXX) -o $@ $(BASECLIENT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)

samples/sound/Makefile.in

@@ -100,10 +100,13 @@ COND_PLATFORM_OS2_1___sound___os2_emxbindcmd = $(NM) sound$(EXEEXT) | if grep -q
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__sound_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__sound_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= sound.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__sound_bundle___depname = sound_bundle
 @COND_TOOLKIT_COCOA@____sound_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	sound.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__sound_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____sound_BUNDLE_TGT_REF_DEP = sound.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____sound_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__sound_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -172,25 +175,25 @@ sound$(EXEEXT): $(SOUND_OBJECTS) $(__sound___win32rc)
 	$(__sound___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p sound.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p sound.app/Contents
-	mkdir -p sound.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p sound.app/Contents/MacOS
-	mkdir -p sound.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p sound.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/sound/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/sound/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >sound.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >sound.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >sound.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >sound.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f sound$(EXEEXT) sound.app/Contents/MacOS/sound
+@COND_PLATFORM_MACOSX_1@	ln -f sound$(EXEEXT) sound.app/Contents/MacOS/sound
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns sound.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns sound.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@sound_bundle: $(____sound_BUNDLE_TGT_REF_DEP)
 

samples/splash/Makefile.in

@@ -101,11 +101,13 @@ COND_PLATFORM_OS2_1___splash___os2_emxbindcmd = $(NM) splash$(EXEEXT) | if grep
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__splash_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__splash_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= splash.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__splash_bundle___depname = splash_bundle
 @COND_TOOLKIT_COCOA@____splash_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	splash.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__splash_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____splash_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	splash.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__splash_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0_USE_MEDIA_1___WXLIB_MEDIA_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0_USE_MEDIA_1@__WXLIB_MEDIA_p = $(COND_MONOLITHIC_0_USE_MEDIA_1___WXLIB_MEDIA_p)
@@ -177,25 +179,25 @@ splash$(EXEEXT): $(SPLASH_OBJECTS) $(__splash___win32rc)
 	$(__splash___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-splash.app/Contents/PkgInfo: splash$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@splash.app/Contents/PkgInfo: splash$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p splash.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p splash.app/Contents
-	mkdir -p splash.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p splash.app/Contents/MacOS
-	mkdir -p splash.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p splash.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/splash/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/splash/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >splash.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >splash.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >splash.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >splash.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f splash$(EXEEXT) splash.app/Contents/MacOS/splash
+@COND_PLATFORM_MACOSX_1@	ln -f splash$(EXEEXT) splash.app/Contents/MacOS/splash
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns splash.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns splash.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@splash_bundle: $(____splash_BUNDLE_TGT_REF_DEP)
 

samples/splitter/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___splitter___os2_emxbindcmd = $(NM) splitter$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__splitter_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__splitter_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= splitter.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__splitter_bundle___depname = splitter_bundle
 @COND_TOOLKIT_COCOA@____splitter_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	splitter.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__splitter_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____splitter_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	splitter.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__splitter_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ splitter$(EXEEXT): $(SPLITTER_OBJECTS) $(__splitter___win32rc)
 	$(__splitter___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-splitter.app/Contents/PkgInfo: splitter$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@splitter.app/Contents/PkgInfo: splitter$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p splitter.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p splitter.app/Contents
-	mkdir -p splitter.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p splitter.app/Contents/MacOS
-	mkdir -p splitter.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p splitter.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/splitter/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/splitter/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >splitter.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >splitter.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >splitter.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >splitter.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f splitter$(EXEEXT) splitter.app/Contents/MacOS/splitter
+@COND_PLATFORM_MACOSX_1@	ln -f splitter$(EXEEXT) splitter.app/Contents/MacOS/splitter
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns splitter.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns splitter.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@splitter_bundle: $(____splitter_BUNDLE_TGT_REF_DEP)
 

samples/statbar/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___statbar___os2_emxbindcmd = $(NM) statbar$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__statbar_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__statbar_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= statbar.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__statbar_bundle___depname = statbar_bundle
 @COND_TOOLKIT_COCOA@____statbar_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	statbar.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__statbar_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____statbar_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	statbar.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__statbar_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ statbar$(EXEEXT): $(STATBAR_OBJECTS) $(__statbar___win32rc)
 	$(__statbar___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-statbar.app/Contents/PkgInfo: statbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@statbar.app/Contents/PkgInfo: statbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p statbar.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p statbar.app/Contents
-	mkdir -p statbar.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p statbar.app/Contents/MacOS
-	mkdir -p statbar.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p statbar.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/statbar/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/statbar/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >statbar.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >statbar.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >statbar.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >statbar.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f statbar$(EXEEXT) statbar.app/Contents/MacOS/statbar
+@COND_PLATFORM_MACOSX_1@	ln -f statbar$(EXEEXT) statbar.app/Contents/MacOS/statbar
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns statbar.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns statbar.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@statbar_bundle: $(____statbar_BUNDLE_TGT_REF_DEP)
 

samples/stc/Makefile.in

@@ -98,11 +98,13 @@ COND_PLATFORM_OS2_1___stctest___os2_emxbindcmd = $(NM) stctest$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__stctest_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__stctest_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= stctest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__stctest_bundle___depname = stctest_bundle
 @COND_TOOLKIT_COCOA@____stctest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	stctest.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__stctest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____stctest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	stctest.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__stctest_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_STC_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_STC_p = $(COND_MONOLITHIC_0___WXLIB_STC_p)
@@ -165,25 +167,25 @@ stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc)
 	$(__stctest___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p stctest.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p stctest.app/Contents
-	mkdir -p stctest.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p stctest.app/Contents/MacOS
-	mkdir -p stctest.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p stctest.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/stctest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/stctest/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >stctest.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >stctest.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >stctest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >stctest.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f stctest$(EXEEXT) stctest.app/Contents/MacOS/stctest
+@COND_PLATFORM_MACOSX_1@	ln -f stctest$(EXEEXT) stctest.app/Contents/MacOS/stctest
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns stctest.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns stctest.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@stctest_bundle: $(____stctest_BUNDLE_TGT_REF_DEP)
 

samples/svg/Makefile.in

@@ -97,11 +97,13 @@ COND_PLATFORM_OS2_1___svgtest___os2_emxbindcmd = $(NM) svgtest$(EXEEXT) | if \
 @COND_PLATFORM_WIN32_1@__svgtest___win32rc = svgtest_sample_rc.o
 @COND_PLATFORM_OS2_1@__svgtest_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__svgtest_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= svgtest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__svgtest_bundle___depname = svgtest_bundle
 @COND_TOOLKIT_COCOA@____svgtest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	svgtest.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__svgtest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____svgtest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	svgtest.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__svgtest_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc)
 	$(__svgtest___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p svgtest.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p svgtest.app/Contents
-	mkdir -p svgtest.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p svgtest.app/Contents/MacOS
-	mkdir -p svgtest.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p svgtest.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/svgtest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/svgtest/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >svgtest.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >svgtest.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >svgtest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >svgtest.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f svgtest$(EXEEXT) svgtest.app/Contents/MacOS/svgtest
+@COND_PLATFORM_MACOSX_1@	ln -f svgtest$(EXEEXT) svgtest.app/Contents/MacOS/svgtest
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns svgtest.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns svgtest.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@svgtest_bundle: $(____svgtest_BUNDLE_TGT_REF_DEP)
 

samples/taborder/Makefile.in

@@ -97,11 +97,13 @@ COND_PLATFORM_OS2_1___taborder___os2_emxbindcmd = $(NM) taborder$(EXEEXT) | if \
 @COND_PLATFORM_WIN32_1@__taborder___win32rc = taborder_sample_rc.o
 @COND_PLATFORM_OS2_1@__taborder_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__taborder_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= taborder.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__taborder_bundle___depname = taborder_bundle
 @COND_TOOLKIT_COCOA@____taborder_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	taborder.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__taborder_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____taborder_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	taborder.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__taborder_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ taborder$(EXEEXT): $(TABORDER_OBJECTS) $(__taborder___win32rc)
 	$(__taborder___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-taborder.app/Contents/PkgInfo: taborder$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@taborder.app/Contents/PkgInfo: taborder$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p taborder.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p taborder.app/Contents
-	mkdir -p taborder.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p taborder.app/Contents/MacOS
-	mkdir -p taborder.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p taborder.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/taborder/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/taborder/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >taborder.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >taborder.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >taborder.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >taborder.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f taborder$(EXEEXT) taborder.app/Contents/MacOS/taborder
+@COND_PLATFORM_MACOSX_1@	ln -f taborder$(EXEEXT) taborder.app/Contents/MacOS/taborder
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns taborder.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns taborder.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@taborder_bundle: $(____taborder_BUNDLE_TGT_REF_DEP)
 

samples/taskbar/Makefile.in

@@ -101,11 +101,13 @@ COND_PLATFORM_OS2_1___taskbar___os2_emxbindcmd = $(NM) taskbar$(EXEEXT) | if \
 @COND_PLATFORM_WIN32_1@__taskbar___win32rc = taskbar_sample_rc.o
 @COND_PLATFORM_OS2_1@__taskbar_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__taskbar_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= taskbar.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__taskbar_bundle___depname = taskbar_bundle
 @COND_TOOLKIT_COCOA@____taskbar_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	taskbar.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__taskbar_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____taskbar_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	taskbar.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__taskbar_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -173,25 +175,25 @@ taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc)
 	$(__taskbar___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p taskbar.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p taskbar.app/Contents
-	mkdir -p taskbar.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p taskbar.app/Contents/MacOS
-	mkdir -p taskbar.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p taskbar.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/taskbar/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/taskbar/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >taskbar.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >taskbar.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >taskbar.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >taskbar.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f taskbar$(EXEEXT) taskbar.app/Contents/MacOS/taskbar
+@COND_PLATFORM_MACOSX_1@	ln -f taskbar$(EXEEXT) taskbar.app/Contents/MacOS/taskbar
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns taskbar.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns taskbar.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@taskbar_bundle: $(____taskbar_BUNDLE_TGT_REF_DEP)
 

samples/text/Makefile.in

@@ -96,9 +96,13 @@ COND_PLATFORM_OS2_1___text___os2_emxbindcmd = $(NM) text$(EXEEXT) | if grep -q \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__text_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__text_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= text.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__text_bundle___depname = text_bundle
-@COND_TOOLKIT_COCOA@____text_BUNDLE_TGT_REF_DEP = text.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@____text_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@____text_BUNDLE_TGT_REF_DEP = text.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__text_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_MAC@____text_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__text_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -158,25 +162,25 @@ text$(EXEEXT): $(TEXT_OBJECTS) $(__text___win32rc)
 	$(__text___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-text.app/Contents/PkgInfo: text$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@text.app/Contents/PkgInfo: text$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p text.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p text.app/Contents
-	mkdir -p text.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p text.app/Contents/MacOS
-	mkdir -p text.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p text.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/text/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/text/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >text.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >text.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >text.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >text.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f text$(EXEEXT) text.app/Contents/MacOS/text
+@COND_PLATFORM_MACOSX_1@	ln -f text$(EXEEXT) text.app/Contents/MacOS/text
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns text.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns text.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@text_bundle: $(____text_BUNDLE_TGT_REF_DEP)
 

samples/thread/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___thread___os2_emxbindcmd = $(NM) thread$(EXEEXT) | if grep
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__thread_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__thread_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= thread.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__thread_bundle___depname = thread_bundle
 @COND_TOOLKIT_COCOA@____thread_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	thread.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__thread_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____thread_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	thread.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__thread_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ thread$(EXEEXT): $(THREAD_OBJECTS) $(__thread___win32rc)
 	$(__thread___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-thread.app/Contents/PkgInfo: thread$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@thread.app/Contents/PkgInfo: thread$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p thread.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p thread.app/Contents
-	mkdir -p thread.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p thread.app/Contents/MacOS
-	mkdir -p thread.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p thread.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/thread/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/thread/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >thread.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >thread.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >thread.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >thread.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f thread$(EXEEXT) thread.app/Contents/MacOS/thread
+@COND_PLATFORM_MACOSX_1@	ln -f thread$(EXEEXT) thread.app/Contents/MacOS/thread
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns thread.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns thread.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@thread_bundle: $(____thread_BUNDLE_TGT_REF_DEP)
 

samples/toolbar/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___toolbar___os2_emxbindcmd = $(NM) toolbar$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__toolbar_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__toolbar_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= toolbar.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__toolbar_bundle___depname = toolbar_bundle
 @COND_TOOLKIT_COCOA@____toolbar_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	toolbar.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__toolbar_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____toolbar_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	toolbar.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__toolbar_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ toolbar$(EXEEXT): $(TOOLBAR_OBJECTS) $(__toolbar___win32rc)
 	$(__toolbar___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p toolbar.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p toolbar.app/Contents
-	mkdir -p toolbar.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p toolbar.app/Contents/MacOS
-	mkdir -p toolbar.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p toolbar.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/toolbar/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/toolbar/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >toolbar.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >toolbar.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >toolbar.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >toolbar.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f toolbar$(EXEEXT) toolbar.app/Contents/MacOS/toolbar
+@COND_PLATFORM_MACOSX_1@	ln -f toolbar$(EXEEXT) toolbar.app/Contents/MacOS/toolbar
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns toolbar.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns toolbar.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@toolbar_bundle: $(____toolbar_BUNDLE_TGT_REF_DEP)
 

samples/treectrl/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___treectrl___os2_emxbindcmd = $(NM) treectrl$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__treectrl_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__treectrl_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= treectrl.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__treectrl_bundle___depname = treectrl_bundle
 @COND_TOOLKIT_COCOA@____treectrl_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	treectrl.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__treectrl_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____treectrl_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	treectrl.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__treectrl_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ treectrl$(EXEEXT): $(TREECTRL_OBJECTS) $(__treectrl___win32rc)
 	$(__treectrl___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p treectrl.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p treectrl.app/Contents
-	mkdir -p treectrl.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p treectrl.app/Contents/MacOS
-	mkdir -p treectrl.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p treectrl.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/treectrl/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/treectrl/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >treectrl.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >treectrl.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >treectrl.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >treectrl.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f treectrl$(EXEEXT) treectrl.app/Contents/MacOS/treectrl
+@COND_PLATFORM_MACOSX_1@	ln -f treectrl$(EXEEXT) treectrl.app/Contents/MacOS/treectrl
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns treectrl.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns treectrl.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@treectrl_bundle: $(____treectrl_BUNDLE_TGT_REF_DEP)
 

samples/typetest/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___typetest___os2_emxbindcmd = $(NM) typetest$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__typetest_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__typetest_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= typetest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__typetest_bundle___depname = typetest_bundle
 @COND_TOOLKIT_COCOA@____typetest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	typetest.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__typetest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____typetest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	typetest.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__typetest_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ typetest$(EXEEXT): $(TYPETEST_OBJECTS) $(__typetest___win32rc)
 	$(__typetest___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-typetest.app/Contents/PkgInfo: typetest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@typetest.app/Contents/PkgInfo: typetest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p typetest.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p typetest.app/Contents
-	mkdir -p typetest.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p typetest.app/Contents/MacOS
-	mkdir -p typetest.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p typetest.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/typetest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/typetest/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >typetest.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >typetest.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >typetest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >typetest.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f typetest$(EXEEXT) typetest.app/Contents/MacOS/typetest
+@COND_PLATFORM_MACOSX_1@	ln -f typetest$(EXEEXT) typetest.app/Contents/MacOS/typetest
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns typetest.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns typetest.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@typetest_bundle: $(____typetest_BUNDLE_TGT_REF_DEP)
 

samples/validate/Makefile.in

@@ -96,11 +96,13 @@ COND_PLATFORM_OS2_1___validate___os2_emxbindcmd = $(NM) validate$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__validate_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__validate_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= validate.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__validate_bundle___depname = validate_bundle
 @COND_TOOLKIT_COCOA@____validate_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	validate.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__validate_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____validate_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	validate.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__validate_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ validate$(EXEEXT): $(VALIDATE_OBJECTS) $(__validate___win32rc)
 	$(__validate___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-validate.app/Contents/PkgInfo: validate$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@validate.app/Contents/PkgInfo: validate$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p validate.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p validate.app/Contents
-	mkdir -p validate.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p validate.app/Contents/MacOS
-	mkdir -p validate.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p validate.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/validate/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/validate/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >validate.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >validate.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >validate.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >validate.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f validate$(EXEEXT) validate.app/Contents/MacOS/validate
+@COND_PLATFORM_MACOSX_1@	ln -f validate$(EXEEXT) validate.app/Contents/MacOS/validate
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns validate.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns validate.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@validate_bundle: $(____validate_BUNDLE_TGT_REF_DEP)
 

samples/vscroll/Makefile.in

@@ -97,11 +97,13 @@ COND_PLATFORM_OS2_1___vstest___os2_emxbindcmd = $(NM) vstest$(EXEEXT) | if grep
 @COND_PLATFORM_WIN32_1@__vstest___win32rc = vstest_sample_rc.o
 @COND_PLATFORM_OS2_1@__vstest_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__vstest_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= vstest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__vstest_bundle___depname = vstest_bundle
 @COND_TOOLKIT_COCOA@____vstest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	vstest.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__vstest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____vstest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	vstest.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__vstest_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ vstest$(EXEEXT): $(VSTEST_OBJECTS) $(__vstest___win32rc)
 	$(__vstest___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-vstest.app/Contents/PkgInfo: vstest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@vstest.app/Contents/PkgInfo: vstest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p vstest.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p vstest.app/Contents
-	mkdir -p vstest.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p vstest.app/Contents/MacOS
-	mkdir -p vstest.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p vstest.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/vstest/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/vstest/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >vstest.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >vstest.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >vstest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >vstest.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f vstest$(EXEEXT) vstest.app/Contents/MacOS/vstest
+@COND_PLATFORM_MACOSX_1@	ln -f vstest$(EXEEXT) vstest.app/Contents/MacOS/vstest
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns vstest.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns vstest.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@vstest_bundle: $(____vstest_BUNDLE_TGT_REF_DEP)
 

samples/widgets/Makefile.in

@@ -125,11 +125,13 @@ COND_PLATFORM_OS2_1___widgets___os2_emxbindcmd = $(NM) widgets$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__widgets_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__widgets_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= widgets.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__widgets_bundle___depname = widgets_bundle
 @COND_TOOLKIT_COCOA@____widgets_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	widgets.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__widgets_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____widgets_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	widgets.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__widgets_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_XML_p = \
 	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
@@ -198,25 +200,25 @@ widgets$(EXEEXT): $(WIDGETS_OBJECTS) $(__widgets___win32rc)
 	$(__widgets___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-widgets.app/Contents/PkgInfo: widgets$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@widgets.app/Contents/PkgInfo: widgets$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p widgets.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p widgets.app/Contents
-	mkdir -p widgets.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p widgets.app/Contents/MacOS
-	mkdir -p widgets.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p widgets.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/widgets/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/widgets/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >widgets.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >widgets.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >widgets.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >widgets.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f widgets$(EXEEXT) widgets.app/Contents/MacOS/widgets
+@COND_PLATFORM_MACOSX_1@	ln -f widgets$(EXEEXT) widgets.app/Contents/MacOS/widgets
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns widgets.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns widgets.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@widgets_bundle: $(____widgets_BUNDLE_TGT_REF_DEP)
 

samples/wizard/Makefile.in

@@ -100,11 +100,13 @@ COND_PLATFORM_OS2_1___wizard___os2_emxbindcmd = $(NM) wizard$(EXEEXT) | if grep
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__wizard_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__wizard_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= wizard.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__wizard_bundle___depname = wizard_bundle
 @COND_TOOLKIT_COCOA@____wizard_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	wizard.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__wizard_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____wizard_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	wizard.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__wizard_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -173,25 +175,25 @@ wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc)
 	$(__wizard___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-wizard.app/Contents/PkgInfo: wizard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@wizard.app/Contents/PkgInfo: wizard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p wizard.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p wizard.app/Contents
-	mkdir -p wizard.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p wizard.app/Contents/MacOS
-	mkdir -p wizard.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p wizard.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/wizard/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/wizard/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >wizard.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >wizard.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >wizard.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >wizard.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f wizard$(EXEEXT) wizard.app/Contents/MacOS/wizard
+@COND_PLATFORM_MACOSX_1@	ln -f wizard$(EXEEXT) wizard.app/Contents/MacOS/wizard
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns wizard.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns wizard.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@wizard_bundle: $(____wizard_BUNDLE_TGT_REF_DEP)
 

samples/wrapsizer/Makefile.in

@@ -97,11 +97,13 @@ COND_PLATFORM_OS2_1___wrapsizer___os2_emxbindcmd = $(NM) wrapsizer$(EXEEXT) | \
 @COND_PLATFORM_WIN32_1@__wrapsizer___win32rc = wrapsizer_sample_rc.o
 @COND_PLATFORM_OS2_1@__wrapsizer_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__wrapsizer_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= wrapsizer.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__wrapsizer_bundle___depname = wrapsizer_bundle
 @COND_TOOLKIT_COCOA@____wrapsizer_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	wrapsizer.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__wrapsizer_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____wrapsizer_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	wrapsizer.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__wrapsizer_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -160,25 +162,25 @@ wrapsizer$(EXEEXT): $(WRAPSIZER_OBJECTS) $(__wrapsizer___win32rc)
 	$(__wrapsizer___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-wrapsizer.app/Contents/PkgInfo: wrapsizer$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@wrapsizer.app/Contents/PkgInfo: wrapsizer$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p wrapsizer.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p wrapsizer.app/Contents
-	mkdir -p wrapsizer.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p wrapsizer.app/Contents/MacOS
-	mkdir -p wrapsizer.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p wrapsizer.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/wrapsizer/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/wrapsizer/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >wrapsizer.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >wrapsizer.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >wrapsizer.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >wrapsizer.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f wrapsizer$(EXEEXT) wrapsizer.app/Contents/MacOS/wrapsizer
+@COND_PLATFORM_MACOSX_1@	ln -f wrapsizer$(EXEEXT) wrapsizer.app/Contents/MacOS/wrapsizer
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns wrapsizer.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns wrapsizer.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@wrapsizer_bundle: $(____wrapsizer_BUNDLE_TGT_REF_DEP)
 

samples/xrc/Makefile.in

@@ -103,11 +103,13 @@ COND_PLATFORM_OS2_1___xrcdemo___os2_emxbindcmd = $(NM) xrcdemo$(EXEEXT) | if \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__xrcdemo_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__xrcdemo_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= xrcdemo.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__xrcdemo_bundle___depname = xrcdemo_bundle
 @COND_TOOLKIT_COCOA@____xrcdemo_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	xrcdemo.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__xrcdemo_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____xrcdemo_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@	xrcdemo.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@	$(__xrcdemo_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_XRC_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_XRC_p = $(COND_MONOLITHIC_0___WXLIB_XRC_p)
@@ -179,25 +181,25 @@ xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc)
 	$(__xrcdemo___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p xrcdemo.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p xrcdemo.app/Contents
-	mkdir -p xrcdemo.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p xrcdemo.app/Contents/MacOS
-	mkdir -p xrcdemo.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	mkdir -p xrcdemo.app/Contents/Resources
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/xrcdemo/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/EXECUTABLE/xrcdemo/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >xrcdemo.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/mac/carbon/Info.plist.in >xrcdemo.app/Contents/Info.plist
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	echo -n "APPL????" >xrcdemo.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >xrcdemo.app/Contents/PkgInfo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	ln -f xrcdemo$(EXEEXT) xrcdemo.app/Contents/MacOS/xrcdemo
+@COND_PLATFORM_MACOSX_1@	ln -f xrcdemo$(EXEEXT) xrcdemo.app/Contents/MacOS/xrcdemo
-	
+@COND_PLATFORM_MACOSX_1@	
-	
+@COND_PLATFORM_MACOSX_1@	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns xrcdemo.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns xrcdemo.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@xrcdemo_bundle: $(____xrcdemo_BUNDLE_TGT_REF_DEP)