Typo correction

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

diff --git a/contrib/samples/fl/Makefile.in b/contrib/samples/fl/Makefile.in
index d5285dc56c309e90a6c755e9474f3341b609b116..5c038c0ba19f84f1dda8ec11b297fa76ffde2bb2 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.8 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -11,7 +11,8 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
-RESCOMP = @RESCOMP@
+WINDRES = @WINDRES@
+REZ = @REZ@
 SETFILE = @SETFILE@
 NM = @NM@
 srcdir = @srcdir@
@@ -26,6 +27,7 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
+TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
@@ -35,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
-WX_RELEASE = 2.6
+WX_RELEASE = 2.7
 WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
 FL_DEMO1_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
@@ -154,40 +156,40 @@ COND_PLATFORM_OS2_1___fl_sample3___os2_emxbindcmd = $(NM) fl_sample3$(EXEEXT) \
 @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 \
+COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_5 = $(REZ) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) $(__EXCEPTIONS_DEFINE_p_1_2) \
        $(__RTTI_DEFINE_p_1_2) $(__THREAD_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 \
-       sample.r
+       $(__DLLFLAG_p_1_2) -i $(srcdir)/../../../samples $(__RCDEFDIR_p) -i \
+       $(top_srcdir)/include -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o \
+       fl_demo1$(EXEEXT) Carbon.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 \
+COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_6 = $(REZ) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) $(__EXCEPTIONS_DEFINE_p_1_2) \
        $(__RTTI_DEFINE_p_1_2) $(__THREAD_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 \
-       sample.r
+       $(__DLLFLAG_p_1_2) -i $(srcdir)/../../../samples $(__RCDEFDIR_p) -i \
+       $(top_srcdir)/include -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o \
+       fl_demo2$(EXEEXT) Carbon.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 \
+COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_7 = $(REZ) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) $(__EXCEPTIONS_DEFINE_p_1_2) \
        $(__RTTI_DEFINE_p_1_2) $(__THREAD_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 \
-       sample.r
+       $(__DLLFLAG_p_1_2) -i $(srcdir)/../../../samples $(__RCDEFDIR_p) -i \
+       $(top_srcdir)/include -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o \
+       fl_sample1$(EXEEXT) Carbon.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 \
+COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_8 = $(REZ) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) $(__EXCEPTIONS_DEFINE_p_1_2) \
        $(__RTTI_DEFINE_p_1_2) $(__THREAD_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 \
-       sample.r
+       $(__DLLFLAG_p_1_2) -i $(srcdir)/../../../samples $(__RCDEFDIR_p) -i \
+       $(top_srcdir)/include -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o \
+       fl_sample2$(EXEEXT) Carbon.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 \
+COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9 = $(REZ) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_2) $(__EXCEPTIONS_DEFINE_p_1_2) \
        $(__RTTI_DEFINE_p_1_2) $(__THREAD_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 \
-       sample.r
+       $(__DLLFLAG_p_1_2) -i $(srcdir)/../../../samples $(__RCDEFDIR_p) -i \
+       $(top_srcdir)/include -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o \
+       fl_sample3$(EXEEXT) Carbon.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__
@@ -204,6 +206,10 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
 @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_TOOLKIT_MSW@__RCDEFDIR_p = -i \
+@COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_TOOLKIT_MSW@__RCDEFDIR_p_12 = --include-dir \
+@COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @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)
@@ -408,7 +414,7 @@ fl_sample3.app/Contents/PkgInfo: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/carbo
 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 ; \
+       if test ! -f ./bitmaps/$$f -a ! -d ./bitmaps/$$f ; \
        then x=yep ; \
        else x=`find $(srcdir)/bitmaps/$$f -newer ./bitmaps/$$f -print` ; \
        fi; \
@@ -421,31 +427,31 @@ fl_demo1_fl_demo1.o: $(srcdir)/fl_demo1.cpp
        $(CXXC) -c -o $@ $(FL_DEMO1_CXXFLAGS) $(srcdir)/fl_demo1.cpp
 
 fl_demo1_fl_demo1_rc.o: $(srcdir)/fl_demo1.rc
-       $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_3)  $(__EXCEPTIONS_DEFINE_p_1_3) $(__RTTI_DEFINE_p_1_3) $(__THREAD_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/"
+       $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_3)  $(__EXCEPTIONS_DEFINE_p_1_3) $(__RTTI_DEFINE_p_1_3) $(__THREAD_DEFINE_p_1_3)   --include-dir $(srcdir) $(__DLLFLAG_p_1_3) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_12) --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) $(srcdir)/fl_demo2.cpp
 
 fl_demo2_fl_demo2_rc.o: $(srcdir)/fl_demo2.rc
-       $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_3)  $(__EXCEPTIONS_DEFINE_p_1_3) $(__RTTI_DEFINE_p_1_3) $(__THREAD_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/"
+       $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_3)  $(__EXCEPTIONS_DEFINE_p_1_3) $(__RTTI_DEFINE_p_1_3) $(__THREAD_DEFINE_p_1_3)   --include-dir $(srcdir) $(__DLLFLAG_p_1_3) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_12) --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)  $(__EXCEPTIONS_DEFINE_p_1_3) $(__RTTI_DEFINE_p_1_3) $(__THREAD_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/"
+       $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_3)  $(__EXCEPTIONS_DEFINE_p_1_3) $(__RTTI_DEFINE_p_1_3) $(__THREAD_DEFINE_p_1_3)   --include-dir $(srcdir) $(__DLLFLAG_p_1_3) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_12) --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)  $(__EXCEPTIONS_DEFINE_p_1_3) $(__RTTI_DEFINE_p_1_3) $(__THREAD_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/"
+       $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_3)  $(__EXCEPTIONS_DEFINE_p_1_3) $(__RTTI_DEFINE_p_1_3) $(__THREAD_DEFINE_p_1_3)   --include-dir $(srcdir) $(__DLLFLAG_p_1_3) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_12) --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)  $(__EXCEPTIONS_DEFINE_p_1_3) $(__RTTI_DEFINE_p_1_3) $(__THREAD_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/"
+       $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1_3)  $(__EXCEPTIONS_DEFINE_p_1_3) $(__RTTI_DEFINE_p_1_3) $(__THREAD_DEFINE_p_1_3)   --include-dir $(srcdir) $(__DLLFLAG_p_1_3) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_12) --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
 
 
 # Include dependency info, if present: