Sample update - wxTE_AUTO_URL from Mart R. [patch 1126182]

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

diff --git a/contrib/samples/fl/Makefile.in b/contrib/samples/fl/Makefile.in
index 65e441c1c0ced8e4aee7a0408bb04c90e52f544f..687d9078de37a0c7ea20cf8f91bd45c672031bf2 100644 (file)
--- a/contrib/samples/fl/Makefile.in
+++ b/contrib/samples/fl/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.6 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -10,66 +10,70 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 INSTALL = @INSTALL@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 INSTALL = @INSTALL@

-CPPFLAGS = @CPPFLAGS@
+EXEEXT = @EXEEXT@
+RESCOMP = @RESCOMP@
+SETFILE = @SETFILE@
+NM = @NM@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+LDFLAGS_GUI = @LDFLAGS_GUI@

 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@

-EXEEXT = @EXEEXT@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
+TOOLKIT = @TOOLKIT@
+TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
+TOOLKIT_VERSION = @TOOLKIT_VERSION@
+TOOLCHAIN_NAME = @TOOLCHAIN_NAME@

 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@

-LDFLAGS = @LDFLAGS@
-LDFLAGS_GUI = @LDFLAGS_GUI@
-RESCOMP = @RESCOMP@

 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@

-SETFILE = @SETFILE@
-TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
-TOOLKIT = @TOOLKIT@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-srcdir = @srcdir@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@

 
 ### Variables: ###
 
 
 ### Variables: ###
 

-FL_DEMO1_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../../samples -I$(srcdir)/../../include \
-       -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+DESTDIR = 
+WX_RELEASE = 2.5
+WX_VERSION = $(WX_RELEASE).4
+LIBDIRNAME = $(top_builddir)lib
+FL_DEMO1_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
+       $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \
+       -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS)

 FL_DEMO1_OBJECTS =  \
 FL_DEMO1_OBJECTS =  \

+       $(__fl) \

        fl_demo1_fl_demo1.o \
        $(__fl_demo1___win32rc)
        fl_demo1_fl_demo1.o \
        $(__fl_demo1___win32rc)

-FL_DEMO2_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../../samples -I$(srcdir)/../../include \
-       -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+FL_DEMO2_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
+       $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \
+       -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS)

 FL_DEMO2_OBJECTS =  \
 FL_DEMO2_OBJECTS =  \

+       $(__fl) \

        fl_demo2_fl_demo2.o \
        $(__fl_demo2___win32rc)
        fl_demo2_fl_demo2.o \
        $(__fl_demo2___win32rc)

-FL_SAMPLE1_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../../samples -I$(srcdir)/../../include \
-       -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+FL_SAMPLE1_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
+       $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \
+       -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS)

 FL_SAMPLE1_OBJECTS =  \
 FL_SAMPLE1_OBJECTS =  \

+       $(__fl) \

        fl_sample1_fl_sample1.o \
        $(__fl_sample1___win32rc)
        fl_sample1_fl_sample1.o \
        $(__fl_sample1___win32rc)

-FL_SAMPLE2_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../../samples -I$(srcdir)/../../include \
-       -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+FL_SAMPLE2_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
+       $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \
+       -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS)

 FL_SAMPLE2_OBJECTS =  \
 FL_SAMPLE2_OBJECTS =  \

+       $(__fl) \

        fl_sample2_fl_sample2.o \
        $(__fl_sample2___win32rc)
        fl_sample2_fl_sample2.o \
        $(__fl_sample2___win32rc)

-FL_SAMPLE3_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../../samples -I$(srcdir)/../../include \
-       -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+FL_SAMPLE3_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
+       $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \
+       -DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS)

 FL_SAMPLE3_OBJECTS =  \
 FL_SAMPLE3_OBJECTS =  \

+       $(__fl) \

        fl_sample3_fl_sample3.o \
        $(__fl_sample3___win32rc)
        fl_sample3_fl_sample3.o \
        $(__fl_sample3___win32rc)

-LIBDIRNAME = $(top_builddir)lib
-WX_VERSION = 2.5.0

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 


@@ -82,97 +86,145 @@ WX_VERSION = 2.5.0
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ

-@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
-@COND_SHARED_1@__DLLFLAG_p_17 = --define WXUSINGDLL
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
-@COND_WXUSE_REGEX_BUILTIN@     -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
-COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_5 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
-       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
-       $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \
-       BMP_DIR="bitmaps/" -o fl_sample2$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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) -i $(top_srcdir)/include -i $(srcdir) \
-       $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \
-       BMP_DIR="bitmaps/" -o fl_sample3$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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) -i $(top_srcdir)/include -i $(srcdir) \
-       $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \
-       BMP_DIR="bitmaps/" -o fl_sample1$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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) -i $(top_srcdir)/include -i $(srcdir) \
-       $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \
-       BMP_DIR="bitmaps/" -o fl_demo1$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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) -i $(top_srcdir)/include -i $(srcdir) \
-       $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \
-       BMP_DIR="bitmaps/" -o fl_demo2$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_9 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
-@COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1_1 = --define __WXUNIVERSAL__
-@COND_PLATFORM_MAC_1@__fl_demo1___mac_rezcmd = $(__MACOSX_RESOURCES_p_8)
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 

 @COND_PLATFORM_MAC_1@__fl_demo1___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C fl_demo1$(EXEEXT)
 @COND_PLATFORM_MAC_1@__fl_demo1___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C fl_demo1$(EXEEXT)

-@COND_PLATFORM_WIN32_1@__fl_demo1___win32rc = fl_demo1_fl_demo1_rc.o
+@COND_PLATFORM_MAC_1@__fl_demo1___mac_rezcmd = $(__MACOSX_RESOURCES_p_5)
+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_PLATFORM_MACOSX_1@__fl_demo1_bundle___depname = fl_demo1_bundle

-@COND_PLATFORM_MAC_1@__fl_demo2___mac_rezcmd = $(__MACOSX_RESOURCES_p_9)
+@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)
 @COND_PLATFORM_MAC_1@__fl_demo2___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C fl_demo2$(EXEEXT)

-@COND_PLATFORM_WIN32_1@__fl_demo2___win32rc = fl_demo2_fl_demo2_rc.o
+@COND_PLATFORM_MAC_1@__fl_demo2___mac_rezcmd = $(__MACOSX_RESOURCES_p_6)
+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_PLATFORM_MACOSX_1@__fl_demo2_bundle___depname = fl_demo2_bundle

-@COND_PLATFORM_MAC_1@__fl_sample1___mac_rezcmd = $(__MACOSX_RESOURCES_p_7)
+@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)
 @COND_PLATFORM_MAC_1@__fl_sample1___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C fl_sample1$(EXEEXT)

-@COND_PLATFORM_WIN32_1@__fl_sample1___win32rc = fl_sample1_fl_sample1_rc.o
+@COND_PLATFORM_MAC_1@__fl_sample1___mac_rezcmd = $(__MACOSX_RESOURCES_p_7)
+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_PLATFORM_MACOSX_1@__fl_sample1_bundle___depname = fl_sample1_bundle

-@COND_PLATFORM_MAC_1@__fl_sample2___mac_rezcmd = $(__MACOSX_RESOURCES_p_5)
+@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)
 @COND_PLATFORM_MAC_1@__fl_sample2___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C fl_sample2$(EXEEXT)

-@COND_PLATFORM_WIN32_1@__fl_sample2___win32rc = fl_sample2_fl_sample2_rc.o
+@COND_PLATFORM_MAC_1@__fl_sample2___mac_rezcmd = $(__MACOSX_RESOURCES_p_8)
+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_PLATFORM_MACOSX_1@__fl_sample2_bundle___depname = fl_sample2_bundle

-@COND_PLATFORM_MAC_1@__fl_sample3___mac_rezcmd = $(__MACOSX_RESOURCES_p_6)
+@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)
 @COND_PLATFORM_MAC_1@__fl_sample3___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C fl_sample3$(EXEEXT)

-@COND_PLATFORM_WIN32_1@__fl_sample3___win32rc = fl_sample3_fl_sample3_rc.o
+@COND_PLATFORM_MAC_1@__fl_sample3___mac_rezcmd = $(__MACOSX_RESOURCES_p_9)
+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_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 $(top_srcdir)/include -i \
+       $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o fl_demo1$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.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 $(top_srcdir)/include -i \
+       $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o fl_demo2$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.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 $(top_srcdir)/include -i \
+       $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o fl_sample1$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.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 $(top_srcdir)/include -i \
+       $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o fl_sample2$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.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 $(top_srcdir)/include -i \
+       $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o fl_sample3$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.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__
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1_3 = --define __WXUNIVERSAL__
+@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
+@COND_SHARED_1@__DLLFLAG_p_1_2 = -d WXUSINGDLL
+@COND_SHARED_1@__DLLFLAG_p_1_3 = --define WXUSINGDLL
+@COND_PLATFORM_OS2_1@__fl = $(top_srcdir)/include/wx/os2/wx.res
+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)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+       -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  = \
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
+@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
+@COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+       -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
+@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
+@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

 
 ### Targets: ###
 
 all: fl_demo1$(EXEEXT) $(__fl_demo1_bundle___depname) fl_demo2$(EXEEXT) $(__fl_demo2_bundle___depname) fl_sample1$(EXEEXT) $(__fl_sample1_bundle___depname) fl_sample2$(EXEEXT) $(__fl_sample2_bundle___depname) fl_sample3$(EXEEXT) $(__fl_sample3_bundle___depname) data_files
 
 
 ### Targets: ###
 
 all: fl_demo1$(EXEEXT) $(__fl_demo1_bundle___depname) fl_demo2$(EXEEXT) $(__fl_demo2_bundle___depname) fl_sample1$(EXEEXT) $(__fl_sample1_bundle___depname) fl_sample2$(EXEEXT) $(__fl_sample2_bundle___depname) fl_sample3$(EXEEXT) $(__fl_sample3_bundle___depname) data_files
 

+install: all
+
+uninstall: 
+
+install-strip: install
+

 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o


@@ -187,24 +239,17 @@ clean:
        rm -f fl_sample3$(EXEEXT)
        rm -rf fl_sample3.app
 
        rm -f fl_sample3$(EXEEXT)
        rm -rf fl_sample3.app
 

-data_files: 
-       @mkdir -p ./bitmaps
-       @for f in bookmarks.bmp class_icon.bmp class_icon1.bmp copy.bmp cut.bmp file_icon.bmp folder_icon.bmp help_icon.bmp new.bmp nextmark.bmp open.bmp paste.bmp prevmark.bmp res_icon.bmp save.bmp saveall.bmp search.bmp start95_dp.bmp start95_pr.bmp tile.bmp; do \
-       if test \( ! -s ./bitmaps/$$f \) -o \( $(srcdir)/bitmaps/$$f -nt ./bitmaps/$$f  \) ; then \
-       cp -pRf $(srcdir)/bitmaps/$$f ./bitmaps ; \
-       fi; \
-       done
-

 distclean: clean
 distclean: clean

-       rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+       rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile

 
 fl_demo1$(EXEEXT): $(FL_DEMO1_OBJECTS) $(__fl_demo1___win32rc)
 
 fl_demo1$(EXEEXT): $(FL_DEMO1_OBJECTS) $(__fl_demo1___win32rc)

-       $(CXX) -o $@ $(FL_DEMO1_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)
+       $(CXX) -o $@ $(FL_DEMO1_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(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_FOR_BASE) $(EXTRALIBS_FOR_GUI)

        $(__fl_demo1___mac_rezcmd)
        $(__fl_demo1___mac_setfilecmd)
        $(__fl_demo1___mac_rezcmd)
        $(__fl_demo1___mac_setfilecmd)

+       $(__fl_demo1___os2_emxbindcmd)

        $(SAMPLES_RPATH_POSTLINK)
 
        $(SAMPLES_RPATH_POSTLINK)
 

-fl_demo1.app/Contents: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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).4.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
        mkdir -p fl_demo1.app/Contents
        mkdir -p fl_demo1.app/Contents/MacOS
        mkdir -p fl_demo1.app/Contents/Resources


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

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

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


@@ -222,24 +267,19 @@ fl_demo1.app/Contents: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
        ln -f fl_demo1$(EXEEXT) fl_demo1.app/Contents/MacOS/fl_demo1
        
        
        ln -f fl_demo1$(EXEEXT) fl_demo1.app/Contents/MacOS/fl_demo1
        
        

-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_demo1.app/Contents/Resources/fl_demo1.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns fl_demo1.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.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
-
-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_1)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
+@COND_PLATFORM_MACOSX_1@fl_demo1_bundle: $(____fl_demo1_BUNDLE_TGT_REF_DEP)

 
 fl_demo2$(EXEEXT): $(FL_DEMO2_OBJECTS) $(__fl_demo2___win32rc)
 
 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)
+       $(CXX) -o $@ $(FL_DEMO2_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(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_FOR_BASE) $(EXTRALIBS_FOR_GUI)

        $(__fl_demo2___mac_rezcmd)
        $(__fl_demo2___mac_setfilecmd)
        $(__fl_demo2___mac_rezcmd)
        $(__fl_demo2___mac_setfilecmd)

+       $(__fl_demo2___os2_emxbindcmd)

        $(SAMPLES_RPATH_POSTLINK)
 
        $(SAMPLES_RPATH_POSTLINK)
 

-fl_demo2.app/Contents: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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).4.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
        mkdir -p fl_demo2.app/Contents
        mkdir -p fl_demo2.app/Contents/MacOS
        mkdir -p fl_demo2.app/Contents/Resources


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

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

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


@@ -257,24 +297,19 @@ fl_demo2.app/Contents: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
        ln -f fl_demo2$(EXEEXT) fl_demo2.app/Contents/MacOS/fl_demo2
        
        
        ln -f fl_demo2$(EXEEXT) fl_demo2.app/Contents/MacOS/fl_demo2
        
        

-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_demo2.app/Contents/Resources/fl_demo2.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns fl_demo2.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@fl_demo2_bundle: fl_demo2.app/Contents
-
-fl_demo2_fl_demo2.o: $(srcdir)/fl_demo2.cpp
-       $(CXXC) -c -o $@ $(FL_DEMO2_CXXFLAGS) $<
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.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

 
 

-fl_demo2_fl_demo2_rc.o: $(srcdir)/fl_demo2.rc
-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_1)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
+@COND_PLATFORM_MACOSX_1@fl_demo2_bundle: $(____fl_demo2_BUNDLE_TGT_REF_DEP)

 
 fl_sample1$(EXEEXT): $(FL_SAMPLE1_OBJECTS) $(__fl_sample1___win32rc)
 
 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)
+       $(CXX) -o $@ $(FL_SAMPLE1_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(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_FOR_BASE) $(EXTRALIBS_FOR_GUI)

        $(__fl_sample1___mac_rezcmd)
        $(__fl_sample1___mac_setfilecmd)
        $(__fl_sample1___mac_rezcmd)
        $(__fl_sample1___mac_setfilecmd)

+       $(__fl_sample1___os2_emxbindcmd)

        $(SAMPLES_RPATH_POSTLINK)
 
        $(SAMPLES_RPATH_POSTLINK)
 

-fl_sample1.app/Contents: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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).4.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
        mkdir -p fl_sample1.app/Contents
        mkdir -p fl_sample1.app/Contents/MacOS
        mkdir -p fl_sample1.app/Contents/Resources


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

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

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


@@ -292,24 +327,19 @@ fl_sample1.app/Contents: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in
        ln -f fl_sample1$(EXEEXT) fl_sample1.app/Contents/MacOS/fl_sample1
        
        
        ln -f fl_sample1$(EXEEXT) fl_sample1.app/Contents/MacOS/fl_sample1
        
        

-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_sample1.app/Contents/Resources/fl_sample1.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns fl_sample1.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.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
-
-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_1)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
+@COND_PLATFORM_MACOSX_1@fl_sample1_bundle: $(____fl_sample1_BUNDLE_TGT_REF_DEP)

 
 fl_sample2$(EXEEXT): $(FL_SAMPLE2_OBJECTS) $(__fl_sample2___win32rc)
 
 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)
+       $(CXX) -o $@ $(FL_SAMPLE2_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(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_FOR_BASE) $(EXTRALIBS_FOR_GUI)

        $(__fl_sample2___mac_rezcmd)
        $(__fl_sample2___mac_setfilecmd)
        $(__fl_sample2___mac_rezcmd)
        $(__fl_sample2___mac_setfilecmd)

+       $(__fl_sample2___os2_emxbindcmd)

        $(SAMPLES_RPATH_POSTLINK)
 
        $(SAMPLES_RPATH_POSTLINK)
 

-fl_sample2.app/Contents: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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).4.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
        mkdir -p fl_sample2.app/Contents
        mkdir -p fl_sample2.app/Contents/MacOS
        mkdir -p fl_sample2.app/Contents/Resources


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

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

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


@@ -327,24 +357,19 @@ fl_sample2.app/Contents: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in
        ln -f fl_sample2$(EXEEXT) fl_sample2.app/Contents/MacOS/fl_sample2
        
        
        ln -f fl_sample2$(EXEEXT) fl_sample2.app/Contents/MacOS/fl_sample2
        
        

-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_sample2.app/Contents/Resources/fl_sample2.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns fl_sample2.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@fl_sample2_bundle: fl_sample2.app/Contents
-
-fl_sample2_fl_sample2.o: $(srcdir)/fl_sample2.cpp
-       $(CXXC) -c -o $@ $(FL_SAMPLE2_CXXFLAGS) $<
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.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

 
 

-fl_sample2_fl_sample2_rc.o: $(srcdir)/fl_sample2.rc
-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_1)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
+@COND_PLATFORM_MACOSX_1@fl_sample2_bundle: $(____fl_sample2_BUNDLE_TGT_REF_DEP)

 
 fl_sample3$(EXEEXT): $(FL_SAMPLE3_OBJECTS) $(__fl_sample3___win32rc)
 
 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)
+       $(CXX) -o $@ $(FL_SAMPLE3_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(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_FOR_BASE) $(EXTRALIBS_FOR_GUI)

        $(__fl_sample3___mac_rezcmd)
        $(__fl_sample3___mac_setfilecmd)
        $(__fl_sample3___mac_rezcmd)
        $(__fl_sample3___mac_setfilecmd)

+       $(__fl_sample3___os2_emxbindcmd)

        $(SAMPLES_RPATH_POSTLINK)
 
        $(SAMPLES_RPATH_POSTLINK)
 

-fl_sample3.app/Contents: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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).4.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
        mkdir -p fl_sample3.app/Contents
        mkdir -p fl_sample3.app/Contents/MacOS
        mkdir -p fl_sample3.app/Contents/Resources


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

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

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


@@ -362,25 +387,55 @@ fl_sample3.app/Contents: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in
        ln -f fl_sample3$(EXEEXT) fl_sample3.app/Contents/MacOS/fl_sample3
        
        
        ln -f fl_sample3$(EXEEXT) fl_sample3.app/Contents/MacOS/fl_sample3
        
        

-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_sample3.app/Contents/Resources/fl_sample3.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns fl_sample3.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.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
+@COND_PLATFORM_MACOSX_1@fl_sample3_bundle: $(____fl_sample3_BUNDLE_TGT_REF_DEP)

 
 

-fl_sample3_fl_sample3.o: $(srcdir)/fl_sample3.cpp
-       $(CXXC) -c -o $@ $(FL_SAMPLE3_CXXFLAGS) $<
+data_files: 
+       @mkdir -p ./bitmaps
+       @for f in bookmarks.bmp class_icon.bmp class_icon1.bmp copy.bmp cut.bmp file_icon.bmp folder_icon.bmp help_icon.bmp new.bmp nextmark.bmp open.bmp paste.bmp prevmark.bmp res_icon.bmp save.bmp saveall.bmp search.bmp start95_dp.bmp start95_pr.bmp tile.bmp; do \
+       if test ! -e ./bitmaps/$$f ; \
+       then x=yep ; \
+       else x=`find $(srcdir)/bitmaps/$$f -newer ./bitmaps/$$f -print` ; \
+       fi; \
+       case "$$x" in ?*) \
+       cp -pRf $(srcdir)/bitmaps/$$f ./bitmaps ;; \
+       esac; \
+       done

 
 

-fl_sample3_fl_sample3_rc.o: $(srcdir)/fl_sample3.rc
-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_1)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_17) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
+fl_demo1_fl_demo1.o: $(srcdir)/fl_demo1.cpp
+       $(CXXC) -c -o $@ $(FL_DEMO1_CXXFLAGS) $(srcdir)/fl_demo1.cpp

 
 

-install: all
+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 $(top_srcdir)/include --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"

 
 

-install-strip: install
+fl_demo2_fl_demo2.o: $(srcdir)/fl_demo2.cpp
+       $(CXXC) -c -o $@ $(FL_DEMO2_CXXFLAGS) $(srcdir)/fl_demo2.cpp

 
 

-uninstall: 
+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 $(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) $(srcdir)/fl_sample1.cpp
+
+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 $(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) $(srcdir)/fl_sample2.cpp
+
+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 $(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) $(srcdir)/fl_sample3.cpp
+
+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 $(top_srcdir)/include --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"

 
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
 
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 

-.PHONY: all clean data_files distclean fl_demo1_bundle fl_demo2_bundle fl_sample1_bundle fl_sample2_bundle fl_sample3_bundle install uninstall
+.PHONY: all install uninstall clean distclean fl_demo1_bundle fl_demo2_bundle fl_sample1_bundle fl_sample2_bundle fl_sample3_bundle data_files