]> git.saurik.com Git - wxWidgets.git/blobdiff - contrib/src/fl/Makefile.in
Applied patch [ 1174270 ] small fixes to wxGenericDirCtrl
[wxWidgets.git] / contrib / src / fl / Makefile.in
index ce629ed294bf8cb6502278462a30ecd9579b1c00..13a12912a6a61ebfbb9a28385bc2dba2c12dd72d 100644 (file)
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -16,6 +16,7 @@ LIBPREFIX = @LIBPREFIX@
 SO_SUFFIX = @SO_SUFFIX@
 DLLIMP_SUFFIX = @DLLIMP_SUFFIX@
 LN_S = @LN_S@
+RESCOMP = @RESCOMP@
 PIC_FLAG = @PIC_FLAG@
 SONAME_FLAG = @SONAME_FLAG@
 STRIP = @STRIP@
@@ -35,25 +36,29 @@ CXXFLAGS = @CXXFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 VENDOR = @VENDOR@
+WX_FLAVOUR = @WX_FLAVOUR@
+WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
-WX_FLAVOUR = @WX_FLAVOUR@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 
 ### Variables: ###
 
 DESTDIR = 
-WX_VERSION = 2.5.2
 WX_RELEASE = 2.5
+WX_RELEASE_NODOT = 25
+WX_VERSION = $(WX_RELEASE).5
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5
 LIBDIRNAME = $(top_builddir)lib
 FLDLL_CXXFLAGS = $(__fldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_FL $(PIC_FLAG) \
        $(CPPFLAGS) $(CXXFLAGS)
 FLDLL_OBJECTS =  \
+       $(__fldll___win32rc) \
        fldll_antiflickpl.o \
        fldll_bardragpl.o \
        fldll_barhintspl.o \
@@ -73,6 +78,7 @@ FLDLL_OBJECTS =  \
        fldll_updatesmgr.o
 FLDLL_ODEP =  $(___pch_wxprec_fldll_wx_wxprec_h_gch___depname)
 FLLIB_CXXFLAGS = $(__fllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)
 FLLIB_OBJECTS =  \
        fllib_antiflickpl.o \
@@ -109,34 +115,43 @@ FLLIB_ODEP =  $(___pch_wxprec_fllib_wx_wxprec_h_gch___depname)
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
-@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)252
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5
+@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
+@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)
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
 @COND_SHARED_1@__install_fldll___depname = install_fldll
 COND_PLATFORM_MACOSX_1___fldll___macinstnamecmd = -install_name \
        $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2)
 @COND_PLATFORM_MACOSX_1@__fldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___fldll___macinstnamecmd)
 COND_PLATFORM_OS2_1___fldll___importlib = -import \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
 @COND_PLATFORM_OS2_1@__fldll___importlib = $(COND_PLATFORM_OS2_1___fldll___importlib)
 COND_PLATFORM_WIN32_1___fldll___importlib = \
-       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
 @COND_PLATFORM_WIN32_1@__fldll___importlib = $(COND_PLATFORM_WIN32_1___fldll___importlib)
 @COND_GCC_PCH_1@__fldll_PCH_INC = -I.pch/wxprec_fldll
 @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).5
 @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@       = .5.$(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).5.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@       = .5.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)
@@ -145,30 +160,31 @@ COND_USE_SOVERSOLARIS_1___fldll___soname_flags = \
        $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3)
 @COND_USE_SOVERSOLARIS_1@__fldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___fldll___soname_flags)
 COND_USE_SOSYMLINKS_1___fldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \
        $(LN_S) \
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) \
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \
        $(LN_S) \
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
 @COND_USE_SOSYMLINKS_1@__fldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___fldll___so_symlinks_cmd)
 COND_USE_SOSYMLINKS_1___fldll___so_symlinks_inst_cmd = rm -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \
        $(LN_S) \
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) \
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2); \
        $(LN_S) \
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2) \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
 @COND_USE_SOSYMLINKS_1@__fldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___fldll___so_symlinks_inst_cmd)
 @COND_PLATFORM_MACOSX_1@__fldll___macver = \
 @COND_PLATFORM_MACOSX_1@       -compatibility_version $(WX_VERSION) \
 @COND_PLATFORM_MACOSX_1@       -current_version $(WX_VERSION)
+@COND_PLATFORM_WIN32_1@__fldll___win32rc = fldll_version_rc.o
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-2.5$(HOST_SUFFIX)
+       -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@ = \
@@ -182,38 +198,41 @@ 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)
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-2.5$(HOST_SUFFIX)
+       -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)-2.5$(HOST_SUFFIX)
+       -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_SHARED_0___fllib___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-2.5$(HOST_SUFFIX)$(LIBEXT)
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
 @COND_SHARED_0@__fllib___depname = $(COND_SHARED_0___fllib___depname)
 @COND_SHARED_0@__install_fllib___depname = install_fllib
 @COND_GCC_PCH_1@__fllib_PCH_INC = -I.pch/wxprec_fllib
 @COND_GCC_PCH_1@___pch_wxprec_fllib_wx_wxprec_h_gch___depname \
 @COND_GCC_PCH_1@       = .pch/wxprec_fllib/wx/wxprec.h.gch
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
 
 ### Targets: ###
 
 all: $(__fldll___depname) $(__fllib___depname)
 
 install: all $(__install_fldll___depname) $(__install_fllib___depname)
-       $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5$(WX_FLAVOUR)
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
        for f in wx/fl/antiflickpl.h wx/fl/bardragpl.h wx/fl/barhintspl.h wx/fl/cbcustom.h wx/fl/controlbar.h wx/fl/dynbarhnd.h wx/fl/dyntbar.h wx/fl/dyntbarhnd.h wx/fl/fldefs.h wx/fl/frmview.h wx/fl/garbagec.h wx/fl/gcupdatesmgr.h wx/fl/hintanimpl.h wx/fl/newbmpbtn.h wx/fl/panedrawpl.h wx/fl/rowdragpl.h wx/fl/rowlayoutpl.h wx/fl/toolwnd.h wx/fl/updatesmgr.h; do \
-       if test ! -d $(DESTDIR)$(includedir)/wx-2.5$(WX_FLAVOUR)/`dirname $$f` ; then \
-       $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5$(WX_FLAVOUR)/`dirname $$f`; \
+       if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
        fi; \
-       $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5$(WX_FLAVOUR)/$$f; \
+       $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
        done
 
 uninstall: 
@@ -225,140 +244,143 @@ clean:
        rm -rf ./.deps ./.pch
        rm -f ./*.o
        rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3)
-       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2)
-       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-2.5$(HOST_SUFFIX)$(LIBEXT)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf2)
+       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@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3): $(FLDLL_OBJECTS) $(__fldll___win32rc)
+@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)
 
 @COND_SHARED_1@install_fldll: 
 @COND_SHARED_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
+@COND_SHARED_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
 @COND_SHARED_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) $(DESTDIR)$(libdir)
 @COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__fldll___so_symlinks_inst_cmd))
 
 @COND_GCC_PCH_1@.pch/wxprec_fldll/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_fldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FLDLL_CXXFLAGS)
 
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-2.5$(HOST_SUFFIX)$(LIBEXT): $(FLLIB_OBJECTS)
+@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(FLLIB_OBJECTS)
 @COND_SHARED_0@        rm -f $@
 @COND_SHARED_0@        $(AR) rcu $@ $(FLLIB_OBJECTS)
 @COND_SHARED_0@        $(RANLIB) $@
 
 @COND_SHARED_0@install_fllib: 
 @COND_SHARED_0@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-2.5$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
+@COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
 
 @COND_GCC_PCH_1@.pch/wxprec_fllib/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_fllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FLLIB_CXXFLAGS)
 
+fldll_version_rc.o: $(srcdir)/../../../src/msw/version.rc $(FLDLL_ODEP)
+       $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)  --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) --include-dir $(top_srcdir)/include
+
 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: