fix evaluation order bug (patch 1158099)

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

diff --git a/contrib/src/foldbar/Makefile.in b/contrib/src/foldbar/Makefile.in
index 40a8234a989b00148744b93c317f5487d005cee1..883b96867348c0db467b2c928e398f43e03837d3 100644 (file)
--- a/contrib/src/foldbar/Makefile.in
+++ b/contrib/src/foldbar/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!
 # =========================================================================
 
@@ -35,20 +35,22 @@ 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).4
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4
 LIBDIRNAME = $(top_builddir)lib
 FOLDBARDLL_CXXFLAGS = $(__foldbardll_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -DWXUSINGDLL \
@@ -81,9 +83,14 @@ FOLDBARLIB_ODEP =  $(___pch_wxprec_foldbarlib_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___foldbardll___depname = \
        $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3)
 @COND_SHARED_1@__foldbardll___depname = $(COND_SHARED_1___foldbardll___depname)
@@ -92,23 +99,23 @@ COND_PLATFORM_MACOSX_1___foldbardll___macinstnamecmd = -install_name \
        $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2)
 @COND_PLATFORM_MACOSX_1@__foldbardll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___foldbardll___macinstnamecmd)
 COND_PLATFORM_OS2_1___foldbardll___importlib = -import \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
 @COND_PLATFORM_OS2_1@__foldbardll___importlib = $(COND_PLATFORM_OS2_1___foldbardll___importlib)
 COND_PLATFORM_WIN32_1___foldbardll___importlib = \
-       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
 @COND_PLATFORM_WIN32_1@__foldbardll___importlib = $(COND_PLATFORM_WIN32_1___foldbardll___importlib)
 @COND_GCC_PCH_1@__foldbardll_PCH_INC = -I.pch/wxprec_foldbardll
 @COND_GCC_PCH_1@___pch_wxprec_foldbardll_wx_wxprec_h_gch___depname \
 @COND_GCC_PCH_1@       = .pch/wxprec_foldbardll/wx/wxprec.h.gch
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__foldbardll___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@__foldbardll___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@__foldbardll___targetsuf2 = .$(SO_SUFFIX)
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__foldbardll___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@__foldbardll___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@__foldbardll___targetsuf3 = .$(SO_SUFFIX)
 COND_USE_SOVERLINUX_1___foldbardll___soname_flags = \
        $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2)
@@ -118,30 +125,30 @@ COND_USE_SOVERSOLARIS_1___foldbardll___soname_flags = \
 @COND_USE_SOVERSOLARIS_1@__foldbardll___soname_flags = $(COND_USE_SOVERSOLARIS_1___foldbardll___soname_flags)
 COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm \
        -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2); \
        $(LN_S) \
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3) \
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2); \
        $(LN_S) \
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2) \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
 @COND_USE_SOSYMLINKS_1@__foldbardll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_cmd)
 COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_inst_cmd = rm -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2); \
        $(LN_S) \
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3) \
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2); \
        $(LN_S) \
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2) \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
 @COND_USE_SOSYMLINKS_1@__foldbardll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___foldbardll___so_symlinks_inst_cmd)
 @COND_PLATFORM_MACOSX_1@__foldbardll___macver = \
 @COND_PLATFORM_MACOSX_1@       -compatibility_version $(WX_VERSION) \
 @COND_PLATFORM_MACOSX_1@       -current_version $(WX_VERSION)
 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@ = \
@@ -155,20 +162,20 @@ 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___foldbarlib___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-2.5$(HOST_SUFFIX)$(LIBEXT)
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
 @COND_SHARED_0@__foldbarlib___depname = $(COND_SHARED_0___foldbarlib___depname)
 @COND_SHARED_0@__install_foldbarlib___depname = install_foldbarlib
 @COND_GCC_PCH_1@__foldbarlib_PCH_INC = -I.pch/wxprec_foldbarlib
@@ -181,12 +188,12 @@ COND_SHARED_0___foldbarlib___depname = \
 all: $(__foldbardll___depname) $(__foldbarlib___depname)
 
 install: all $(__install_foldbardll___depname) $(__install_foldbarlib___depname)
-       $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5$(WX_FLAVOUR)
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
        for f in wx/foldbar/captionbar.h wx/foldbar/foldpanelbar.h wx/foldbar/foldpanelitem.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: 
@@ -198,56 +205,56 @@ clean:
        rm -rf ./.deps ./.pch
        rm -f ./*.o
        rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3)
-       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2)
-       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-2.5$(HOST_SUFFIX)$(LIBEXT)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf2)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(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)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3): $(FOLDBARDLL_OBJECTS)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(FOLDBARDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__foldbardll___macinstnamecmd) $(__foldbardll___importlib) $(__foldbardll___soname_flags) $(__foldbardll___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) $@ $(FOLDBARDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__foldbardll___macinstnamecmd) $(__foldbardll___importlib) $(__foldbardll___soname_flags) $(__foldbardll___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@        $(__foldbardll___so_symlinks_cmd)
 
 @COND_SHARED_1@install_foldbardll: 
 @COND_SHARED_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
+@COND_SHARED_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
 @COND_SHARED_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3) $(DESTDIR)$(libdir)
 @COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__foldbardll___so_symlinks_inst_cmd))
 
 @COND_GCC_PCH_1@.pch/wxprec_foldbardll/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_foldbardll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FOLDBARDLL_CXXFLAGS)
 
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-2.5$(HOST_SUFFIX)$(LIBEXT): $(FOLDBARLIB_OBJECTS)
+@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(FOLDBARLIB_OBJECTS)
 @COND_SHARED_0@        rm -f $@
 @COND_SHARED_0@        $(AR) rcu $@ $(FOLDBARLIB_OBJECTS)
 @COND_SHARED_0@        $(RANLIB) $@
 
 @COND_SHARED_0@install_foldbarlib: 
 @COND_SHARED_0@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-2.5$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
+@COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
 
 @COND_GCC_PCH_1@.pch/wxprec_foldbarlib/wx/wxprec.h.gch: 
 @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_foldbarlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FOLDBARLIB_CXXFLAGS)
 
 foldbardll_captionbar.o: $(srcdir)/captionbar.cpp $(FOLDBARDLL_ODEP)
-       $(CXXC) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $(srcdir)/captionbar.cpp
 
 foldbardll_foldpanelbar.o: $(srcdir)/foldpanelbar.cpp $(FOLDBARDLL_ODEP)
-       $(CXXC) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $(srcdir)/foldpanelbar.cpp
 
 foldbardll_foldpanelitem.o: $(srcdir)/foldpanelitem.cpp $(FOLDBARDLL_ODEP)
-       $(CXXC) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $(srcdir)/foldpanelitem.cpp
 
 foldbarlib_captionbar.o: $(srcdir)/captionbar.cpp $(FOLDBARLIB_ODEP)
-       $(CXXC) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $(srcdir)/captionbar.cpp
 
 foldbarlib_foldpanelbar.o: $(srcdir)/foldpanelbar.cpp $(FOLDBARLIB_ODEP)
-       $(CXXC) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $(srcdir)/foldpanelbar.cpp
 
 foldbarlib_foldpanelitem.o: $(srcdir)/foldpanelitem.cpp $(FOLDBARLIB_ODEP)
-       $(CXXC) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $(srcdir)/foldpanelitem.cpp
 
 
 # Include dependency info, if present: