Fix for wrong replacement of the FALSE.

[wxWidgets.git] / contrib / samples / fl / Makefile.in

diff --git a/contrib/samples/fl/Makefile.in b/contrib/samples/fl/Makefile.in
index bf40db795a8a8cdbfabf101b9d94227240e6dc50..e9cb1af38d1b4cf33e7564a1e5b5bb196b5e3a36 100644 (file)
--- a/contrib/samples/fl/Makefile.in
+++ b/contrib/samples/fl/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -35,7 +35,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
-WX_VERSION = 2.5.1
+WX_VERSION = 2.5.2
 LIBDIRNAME = $(top_builddir)lib
 FL_DEMO1_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \
@@ -91,6 +91,10 @@ COND_PLATFORM_OS2_1___fl_demo1___os2_emxbindcmd = $(NM) fl_demo1$(EXEEXT) | if \
        grep -q pmwin.763 ; then emxbind -ep fl_demo1$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__fl_demo1___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___fl_demo1___os2_emxbindcmd)
 @COND_PLATFORM_MACOSX_1@__fl_demo1_bundle___depname = fl_demo1_bundle
+@COND_TOOLKIT_COCOA@____fl_demo1_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   fl_demo1.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____fl_demo1_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     fl_demo1.app/Contents/PkgInfo
 @COND_PLATFORM_WIN32_1@__fl_demo1___win32rc = fl_demo1_fl_demo1_rc.o
 @COND_PLATFORM_MAC_1@__fl_demo2___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C fl_demo2$(EXEEXT)
@@ -99,6 +103,10 @@ COND_PLATFORM_OS2_1___fl_demo2___os2_emxbindcmd = $(NM) fl_demo2$(EXEEXT) | if \
        grep -q pmwin.763 ; then emxbind -ep fl_demo2$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__fl_demo2___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___fl_demo2___os2_emxbindcmd)
 @COND_PLATFORM_MACOSX_1@__fl_demo2_bundle___depname = fl_demo2_bundle
+@COND_TOOLKIT_COCOA@____fl_demo2_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   fl_demo2.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____fl_demo2_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     fl_demo2.app/Contents/PkgInfo
 @COND_PLATFORM_WIN32_1@__fl_demo2___win32rc = fl_demo2_fl_demo2_rc.o
 @COND_PLATFORM_MAC_1@__fl_sample1___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C fl_sample1$(EXEEXT)
@@ -107,6 +115,10 @@ COND_PLATFORM_OS2_1___fl_sample1___os2_emxbindcmd = $(NM) fl_sample1$(EXEEXT) \
        | if grep -q pmwin.763 ; then emxbind -ep fl_sample1$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__fl_sample1___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___fl_sample1___os2_emxbindcmd)
 @COND_PLATFORM_MACOSX_1@__fl_sample1_bundle___depname = fl_sample1_bundle
+@COND_TOOLKIT_COCOA@____fl_sample1_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   fl_sample1.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____fl_sample1_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     fl_sample1.app/Contents/PkgInfo
 @COND_PLATFORM_WIN32_1@__fl_sample1___win32rc = fl_sample1_fl_sample1_rc.o
 @COND_PLATFORM_MAC_1@__fl_sample2___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C fl_sample2$(EXEEXT)
@@ -115,6 +127,10 @@ COND_PLATFORM_OS2_1___fl_sample2___os2_emxbindcmd = $(NM) fl_sample2$(EXEEXT) \
        | if grep -q pmwin.763 ; then emxbind -ep fl_sample2$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__fl_sample2___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___fl_sample2___os2_emxbindcmd)
 @COND_PLATFORM_MACOSX_1@__fl_sample2_bundle___depname = fl_sample2_bundle
+@COND_TOOLKIT_COCOA@____fl_sample2_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   fl_sample2.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____fl_sample2_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     fl_sample2.app/Contents/PkgInfo
 @COND_PLATFORM_WIN32_1@__fl_sample2___win32rc = fl_sample2_fl_sample2_rc.o
 @COND_PLATFORM_MAC_1@__fl_sample3___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C fl_sample3$(EXEEXT)
@@ -123,36 +139,40 @@ COND_PLATFORM_OS2_1___fl_sample3___os2_emxbindcmd = $(NM) fl_sample3$(EXEEXT) \
        | if grep -q pmwin.763 ; then emxbind -ep fl_sample3$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__fl_sample3___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___fl_sample3___os2_emxbindcmd)
 @COND_PLATFORM_MACOSX_1@__fl_sample3_bundle___depname = fl_sample3_bundle
+@COND_TOOLKIT_COCOA@____fl_sample3_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   fl_sample3.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____fl_sample3_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     fl_sample3.app/Contents/PkgInfo
 @COND_PLATFORM_WIN32_1@__fl_sample3___win32rc = fl_sample3_fl_sample3_rc.o
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_5 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) -i $(srcdir) $(__DLLFLAG_p_1_2) -i \
-       $(srcdir)/../../../samples -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" \
-       -o fl_demo1$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \
-       sample.r
+       $(srcdir)/../../../samples -i $(top_srcdir)/include -i \
+       $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o fl_demo1$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_5 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_5)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_6 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) -i $(srcdir) $(__DLLFLAG_p_1_2) -i \
-       $(srcdir)/../../../samples -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" \
-       -o fl_demo2$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \
-       sample.r
+       $(srcdir)/../../../samples -i $(top_srcdir)/include -i \
+       $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o fl_demo2$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_6 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_6)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_7 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) -i $(srcdir) $(__DLLFLAG_p_1_2) -i \
-       $(srcdir)/../../../samples -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" \
-       -o fl_sample1$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \
-       sample.r
+       $(srcdir)/../../../samples -i $(top_srcdir)/include -i \
+       $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o fl_sample1$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_7 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_7)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_8 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) -i $(srcdir) $(__DLLFLAG_p_1_2) -i \
-       $(srcdir)/../../../samples -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" \
-       -o fl_sample2$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \
-       sample.r
+       $(srcdir)/../../../samples -i $(top_srcdir)/include -i \
+       $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o fl_sample2$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_8 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_8)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) -i $(srcdir) $(__DLLFLAG_p_1_2) -i \
-       $(srcdir)/../../../samples -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" \
-       -o fl_sample3$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \
-       sample.r
+       $(srcdir)/../../../samples -i $(top_srcdir)/include -i \
+       $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o fl_sample3$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_9 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1_2 = -d __WXUNIVERSAL__
@@ -183,7 +203,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
 @COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
-@COND_WXUSE_REGEX_BUILTIN@     -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_REGEX_BUILTIN@     -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
 
@@ -221,7 +241,7 @@ fl_demo1$(EXEEXT): $(FL_DEMO1_OBJECTS) $(__fl_demo1___win32rc)
        $(__fl_demo1___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-fl_demo1.app/Contents/PkgInfo: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+fl_demo1.app/Contents/PkgInfo: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p fl_demo1.app/Contents
        mkdir -p fl_demo1.app/Contents/MacOS
        mkdir -p fl_demo1.app/Contents/Resources
@@ -230,7 +250,7 @@ fl_demo1.app/Contents/PkgInfo: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/fl_demo1/" \
        -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/Info.plist.in >fl_demo1.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >fl_demo1.app/Contents/Info.plist
        
        
        echo -n "APPL????" >fl_demo1.app/Contents/PkgInfo
@@ -239,10 +259,10 @@ fl_demo1.app/Contents/PkgInfo: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
        ln -f fl_demo1$(EXEEXT) fl_demo1.app/Contents/MacOS/fl_demo1
        
        
-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc fl_demo1.app/Contents/Resources/fl_demo1.rsrc
-       ln -sf $(top_srcdir)/src/mac/wxmac.icns fl_demo1.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc fl_demo1.app/Contents/Resources/fl_demo1.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fl_demo1.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@fl_demo1_bundle: fl_demo1.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@fl_demo1_bundle: $(____fl_demo1_BUNDLE_TGT_REF_DEP)
 
 fl_demo2$(EXEEXT): $(FL_DEMO2_OBJECTS) $(__fl_demo2___win32rc)
        $(CXX) -o $@ $(FL_DEMO2_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
@@ -251,7 +271,7 @@ fl_demo2$(EXEEXT): $(FL_DEMO2_OBJECTS) $(__fl_demo2___win32rc)
        $(__fl_demo2___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-fl_demo2.app/Contents/PkgInfo: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+fl_demo2.app/Contents/PkgInfo: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p fl_demo2.app/Contents
        mkdir -p fl_demo2.app/Contents/MacOS
        mkdir -p fl_demo2.app/Contents/Resources
@@ -260,7 +280,7 @@ fl_demo2.app/Contents/PkgInfo: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/fl_demo2/" \
        -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/Info.plist.in >fl_demo2.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >fl_demo2.app/Contents/Info.plist
        
        
        echo -n "APPL????" >fl_demo2.app/Contents/PkgInfo
@@ -269,10 +289,10 @@ fl_demo2.app/Contents/PkgInfo: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
        ln -f fl_demo2$(EXEEXT) fl_demo2.app/Contents/MacOS/fl_demo2
        
        
-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc fl_demo2.app/Contents/Resources/fl_demo2.rsrc
-       ln -sf $(top_srcdir)/src/mac/wxmac.icns fl_demo2.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc fl_demo2.app/Contents/Resources/fl_demo2.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fl_demo2.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@fl_demo2_bundle: fl_demo2.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@fl_demo2_bundle: $(____fl_demo2_BUNDLE_TGT_REF_DEP)
 
 fl_sample1$(EXEEXT): $(FL_SAMPLE1_OBJECTS) $(__fl_sample1___win32rc)
        $(CXX) -o $@ $(FL_SAMPLE1_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
@@ -281,7 +301,7 @@ fl_sample1$(EXEEXT): $(FL_SAMPLE1_OBJECTS) $(__fl_sample1___win32rc)
        $(__fl_sample1___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-fl_sample1.app/Contents/PkgInfo: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+fl_sample1.app/Contents/PkgInfo: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p fl_sample1.app/Contents
        mkdir -p fl_sample1.app/Contents/MacOS
        mkdir -p fl_sample1.app/Contents/Resources
@@ -290,7 +310,7 @@ fl_sample1.app/Contents/PkgInfo: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/Info.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/fl_sample1/" \
        -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/Info.plist.in >fl_sample1.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >fl_sample1.app/Contents/Info.plist
        
        
        echo -n "APPL????" >fl_sample1.app/Contents/PkgInfo
@@ -299,10 +319,10 @@ fl_sample1.app/Contents/PkgInfo: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/Info.
        ln -f fl_sample1$(EXEEXT) fl_sample1.app/Contents/MacOS/fl_sample1
        
        
-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc fl_sample1.app/Contents/Resources/fl_sample1.rsrc
-       ln -sf $(top_srcdir)/src/mac/wxmac.icns fl_sample1.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc fl_sample1.app/Contents/Resources/fl_sample1.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fl_sample1.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@fl_sample1_bundle: fl_sample1.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@fl_sample1_bundle: $(____fl_sample1_BUNDLE_TGT_REF_DEP)
 
 fl_sample2$(EXEEXT): $(FL_SAMPLE2_OBJECTS) $(__fl_sample2___win32rc)
        $(CXX) -o $@ $(FL_SAMPLE2_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
@@ -311,7 +331,7 @@ fl_sample2$(EXEEXT): $(FL_SAMPLE2_OBJECTS) $(__fl_sample2___win32rc)
        $(__fl_sample2___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-fl_sample2.app/Contents/PkgInfo: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+fl_sample2.app/Contents/PkgInfo: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p fl_sample2.app/Contents
        mkdir -p fl_sample2.app/Contents/MacOS
        mkdir -p fl_sample2.app/Contents/Resources
@@ -320,7 +340,7 @@ fl_sample2.app/Contents/PkgInfo: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/Info.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/fl_sample2/" \
        -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/Info.plist.in >fl_sample2.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >fl_sample2.app/Contents/Info.plist
        
        
        echo -n "APPL????" >fl_sample2.app/Contents/PkgInfo
@@ -329,10 +349,10 @@ fl_sample2.app/Contents/PkgInfo: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/Info.
        ln -f fl_sample2$(EXEEXT) fl_sample2.app/Contents/MacOS/fl_sample2
        
        
-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc fl_sample2.app/Contents/Resources/fl_sample2.rsrc
-       ln -sf $(top_srcdir)/src/mac/wxmac.icns fl_sample2.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc fl_sample2.app/Contents/Resources/fl_sample2.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fl_sample2.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@fl_sample2_bundle: fl_sample2.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@fl_sample2_bundle: $(____fl_sample2_BUNDLE_TGT_REF_DEP)
 
 fl_sample3$(EXEEXT): $(FL_SAMPLE3_OBJECTS) $(__fl_sample3___win32rc)
        $(CXX) -o $@ $(FL_SAMPLE3_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
@@ -341,7 +361,7 @@ fl_sample3$(EXEEXT): $(FL_SAMPLE3_OBJECTS) $(__fl_sample3___win32rc)
        $(__fl_sample3___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-fl_sample3.app/Contents/PkgInfo: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+fl_sample3.app/Contents/PkgInfo: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p fl_sample3.app/Contents
        mkdir -p fl_sample3.app/Contents/MacOS
        mkdir -p fl_sample3.app/Contents/Resources
@@ -350,7 +370,7 @@ fl_sample3.app/Contents/PkgInfo: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/Info.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/fl_sample3/" \
        -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/Info.plist.in >fl_sample3.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >fl_sample3.app/Contents/Info.plist
        
        
        echo -n "APPL????" >fl_sample3.app/Contents/PkgInfo
@@ -359,10 +379,10 @@ fl_sample3.app/Contents/PkgInfo: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/Info.
        ln -f fl_sample3$(EXEEXT) fl_sample3.app/Contents/MacOS/fl_sample3
        
        
-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc fl_sample3.app/Contents/Resources/fl_sample3.rsrc
-       ln -sf $(top_srcdir)/src/mac/wxmac.icns fl_sample3.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc fl_sample3.app/Contents/Resources/fl_sample3.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fl_sample3.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@fl_sample3_bundle: fl_sample3.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@fl_sample3_bundle: $(____fl_sample3_BUNDLE_TGT_REF_DEP)
 
 data_files: 
        @mkdir -p ./bitmaps
@@ -376,31 +396,31 @@ fl_demo1_fl_demo1.o: $(srcdir)/fl_demo1.cpp
        $(CXXC) -c -o $@ $(FL_DEMO1_CXXFLAGS) $<
 
 fl_demo1_fl_demo1_rc.o: $(srcdir)/fl_demo1.rc
-       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_3)   --include-dir $(srcdir) $(__DLLFLAG_p_1_3) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
+       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_3)   --include-dir $(srcdir) $(__DLLFLAG_p_1_3) --include-dir $(srcdir)/../../../samples --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
 
 fl_demo2_fl_demo2.o: $(srcdir)/fl_demo2.cpp
        $(CXXC) -c -o $@ $(FL_DEMO2_CXXFLAGS) $<
 
 fl_demo2_fl_demo2_rc.o: $(srcdir)/fl_demo2.rc
-       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_3)   --include-dir $(srcdir) $(__DLLFLAG_p_1_3) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
+       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_3)   --include-dir $(srcdir) $(__DLLFLAG_p_1_3) --include-dir $(srcdir)/../../../samples --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
 
 fl_sample1_fl_sample1.o: $(srcdir)/fl_sample1.cpp
        $(CXXC) -c -o $@ $(FL_SAMPLE1_CXXFLAGS) $<
 
 fl_sample1_fl_sample1_rc.o: $(srcdir)/fl_sample1.rc
-       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_3)   --include-dir $(srcdir) $(__DLLFLAG_p_1_3) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
+       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_3)   --include-dir $(srcdir) $(__DLLFLAG_p_1_3) --include-dir $(srcdir)/../../../samples --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
 
 fl_sample2_fl_sample2.o: $(srcdir)/fl_sample2.cpp
        $(CXXC) -c -o $@ $(FL_SAMPLE2_CXXFLAGS) $<
 
 fl_sample2_fl_sample2_rc.o: $(srcdir)/fl_sample2.rc
-       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_3)   --include-dir $(srcdir) $(__DLLFLAG_p_1_3) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
+       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_3)   --include-dir $(srcdir) $(__DLLFLAG_p_1_3) --include-dir $(srcdir)/../../../samples --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
 
 fl_sample3_fl_sample3.o: $(srcdir)/fl_sample3.cpp
        $(CXXC) -c -o $@ $(FL_SAMPLE3_CXXFLAGS) $<
 
 fl_sample3_fl_sample3_rc.o: $(srcdir)/fl_sample3.rc
-       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_3)   --include-dir $(srcdir) $(__DLLFLAG_p_1_3) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
+       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_3)   --include-dir $(srcdir) $(__DLLFLAG_p_1_3) --include-dir $(srcdir)/../../../samples --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
 
 
 # Include dependency info, if present: