fix evaluation order bug (patch 1158099)

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

diff --git a/contrib/src/fl/Makefile.in b/contrib/src/fl/Makefile.in
index e28266620442ec227e2ab4f013bc74153267dd9e..0de38d68c7e9ed7c657b3321c54f2458df2bf5f3 100644 (file)
--- a/contrib/src/fl/Makefile.in
+++ b/contrib/src/fl/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.7 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -49,8 +49,8 @@ HOST_SUFFIX = @HOST_SUFFIX@
 DESTDIR = 
 WX_RELEASE = 2.5
 WX_RELEASE_NODOT = 25
-WX_VERSION = $(WX_RELEASE).2
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
+WX_VERSION = $(WX_RELEASE).4
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4
 LIBDIRNAME = $(top_builddir)lib
 FLDLL_CXXFLAGS = $(__fldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_FL $(PIC_FLAG) \
@@ -115,6 +115,10 @@ FLLIB_ODEP =  $(___pch_wxprec_fllib_wx_wxprec_h_gch___depname)
 @COND_PLATFORM_WIN32_1@        wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
 @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
 @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
+@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_SHARED_1___fldll___depname = \
        $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3)
 @COND_SHARED_1@__fldll___depname = $(COND_SHARED_1___fldll___depname)
@@ -132,14 +136,14 @@ COND_PLATFORM_WIN32_1___fldll___importlib = \
 @COND_GCC_PCH_1@___pch_wxprec_fldll_wx_wxprec_h_gch___depname \
 @COND_GCC_PCH_1@       = .pch/wxprec_fldll/wx/wxprec.h.gch
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__fldll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@       = .$(SO_SUFFIX).2
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@       = .$(SO_SUFFIX).4
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__fldll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .2.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .4.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__fldll___targetsuf2 = .$(SO_SUFFIX)
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__fldll___targetsuf3 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@       = .$(SO_SUFFIX).2.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@       = .$(SO_SUFFIX).4.0.0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__fldll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .2.0.0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .4.0.0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__fldll___targetsuf3 = .$(SO_SUFFIX)
 COND_USE_SOVERLINUX_1___fldll___soname_flags = \
        $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2)
@@ -185,7 +189,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @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)$(HOST_SUFFIX)
+@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)
@@ -233,10 +237,10 @@ clean:
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
 
 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
 
 @COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3): $(FLDLL_OBJECTS)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(FLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__fldll___macinstnamecmd) $(__fldll___importlib) $(__fldll___soname_flags) $(__fldll___macver)  $(__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) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(FLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__fldll___macinstnamecmd) $(__fldll___importlib) $(__fldll___soname_flags) $(__fldll___macver)  $(__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) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
 @COND_SHARED_1@        
 @COND_SHARED_1@        $(__fldll___so_symlinks_cmd)
 
@@ -262,106 +266,106 @@ distclean: clean
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_fllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FLLIB_CXXFLAGS)
 
 fldll_antiflickpl.o: $(srcdir)/antiflickpl.cpp $(FLDLL_ODEP)
-       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/antiflickpl.cpp
 
 fldll_bardragpl.o: $(srcdir)/bardragpl.cpp $(FLDLL_ODEP)
-       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/bardragpl.cpp
 
 fldll_barhintspl.o: $(srcdir)/barhintspl.cpp $(FLDLL_ODEP)
-       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/barhintspl.cpp
 
 fldll_cbcustom.o: $(srcdir)/cbcustom.cpp $(FLDLL_ODEP)
-       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/cbcustom.cpp
 
 fldll_controlbar.o: $(srcdir)/controlbar.cpp $(FLDLL_ODEP)
-       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/controlbar.cpp
 
 fldll_dyntbar.o: $(srcdir)/dyntbar.cpp $(FLDLL_ODEP)
-       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/dyntbar.cpp
 
 fldll_dyntbarhnd.o: $(srcdir)/dyntbarhnd.cpp $(FLDLL_ODEP)
-       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/dyntbarhnd.cpp
 
 fldll_frmview.o: $(srcdir)/frmview.cpp $(FLDLL_ODEP)
-       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/frmview.cpp
 
 fldll_garbagec.o: $(srcdir)/garbagec.cpp $(FLDLL_ODEP)
-       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/garbagec.cpp
 
 fldll_gcupdatesmgr.o: $(srcdir)/gcupdatesmgr.cpp $(FLDLL_ODEP)
-       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/gcupdatesmgr.cpp
 
 fldll_hintanimpl.o: $(srcdir)/hintanimpl.cpp $(FLDLL_ODEP)
-       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/hintanimpl.cpp
 
 fldll_newbmpbtn.o: $(srcdir)/newbmpbtn.cpp $(FLDLL_ODEP)
-       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/newbmpbtn.cpp
 
 fldll_panedrawpl.o: $(srcdir)/panedrawpl.cpp $(FLDLL_ODEP)
-       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/panedrawpl.cpp
 
 fldll_rowdragpl.o: $(srcdir)/rowdragpl.cpp $(FLDLL_ODEP)
-       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/rowdragpl.cpp
 
 fldll_rowlayoutpl.o: $(srcdir)/rowlayoutpl.cpp $(FLDLL_ODEP)
-       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/rowlayoutpl.cpp
 
 fldll_toolwnd.o: $(srcdir)/toolwnd.cpp $(FLDLL_ODEP)
-       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/toolwnd.cpp
 
 fldll_updatesmgr.o: $(srcdir)/updatesmgr.cpp $(FLDLL_ODEP)
-       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $(srcdir)/updatesmgr.cpp
 
 fllib_antiflickpl.o: $(srcdir)/antiflickpl.cpp $(FLLIB_ODEP)
-       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/antiflickpl.cpp
 
 fllib_bardragpl.o: $(srcdir)/bardragpl.cpp $(FLLIB_ODEP)
-       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/bardragpl.cpp
 
 fllib_barhintspl.o: $(srcdir)/barhintspl.cpp $(FLLIB_ODEP)
-       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/barhintspl.cpp
 
 fllib_cbcustom.o: $(srcdir)/cbcustom.cpp $(FLLIB_ODEP)
-       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/cbcustom.cpp
 
 fllib_controlbar.o: $(srcdir)/controlbar.cpp $(FLLIB_ODEP)
-       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/controlbar.cpp
 
 fllib_dyntbar.o: $(srcdir)/dyntbar.cpp $(FLLIB_ODEP)
-       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/dyntbar.cpp
 
 fllib_dyntbarhnd.o: $(srcdir)/dyntbarhnd.cpp $(FLLIB_ODEP)
-       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/dyntbarhnd.cpp
 
 fllib_frmview.o: $(srcdir)/frmview.cpp $(FLLIB_ODEP)
-       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/frmview.cpp
 
 fllib_garbagec.o: $(srcdir)/garbagec.cpp $(FLLIB_ODEP)
-       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/garbagec.cpp
 
 fllib_gcupdatesmgr.o: $(srcdir)/gcupdatesmgr.cpp $(FLLIB_ODEP)
-       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/gcupdatesmgr.cpp
 
 fllib_hintanimpl.o: $(srcdir)/hintanimpl.cpp $(FLLIB_ODEP)
-       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/hintanimpl.cpp
 
 fllib_newbmpbtn.o: $(srcdir)/newbmpbtn.cpp $(FLLIB_ODEP)
-       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/newbmpbtn.cpp
 
 fllib_panedrawpl.o: $(srcdir)/panedrawpl.cpp $(FLLIB_ODEP)
-       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/panedrawpl.cpp
 
 fllib_rowdragpl.o: $(srcdir)/rowdragpl.cpp $(FLLIB_ODEP)
-       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/rowdragpl.cpp
 
 fllib_rowlayoutpl.o: $(srcdir)/rowlayoutpl.cpp $(FLLIB_ODEP)
-       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/rowlayoutpl.cpp
 
 fllib_toolwnd.o: $(srcdir)/toolwnd.cpp $(FLLIB_ODEP)
-       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/toolwnd.cpp
 
 fllib_updatesmgr.o: $(srcdir)/updatesmgr.cpp $(FLLIB_ODEP)
-       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FLLIB_CXXFLAGS) $(srcdir)/updatesmgr.cpp
 
 
 # Include dependency info, if present: