Rebaked (build/bakefiles/common.bkl 1.95->1.96 change)

author David Elliott <dfe@tgwbd.org>

Mon, 18 Oct 2004 17:02:37 +0000 (17:02 +0000)

committer David Elliott <dfe@tgwbd.org>

Mon, 18 Oct 2004 17:02:37 +0000 (17:02 +0000)
author David Elliott <dfe@tgwbd.org>
Mon, 18 Oct 2004 17:02:37 +0000 (17:02 +0000)
committer David Elliott <dfe@tgwbd.org>
Mon, 18 Oct 2004 17:02:37 +0000 (17:02 +0000)
diff --git a/Makefile.in b/Makefile.in

index 2f59f7948d4ce42527a39589c6c5794a8521f605..93a979b28944042adac1eae4629a9625da7f31f3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1144,6 +1144,10 @@ COND_WXUSE_EXPAT_BUILTIN___wxexpat___depname = \
  @COND_WXUSE_EXPAT_BUILTIN@__wxexpat___depname = $(COND_WXUSE_EXPAT_BUILTIN___wxexpat___depname)
  @COND_SHARED_0_WXUSE_EXPAT_BUILTIN@__install_wxexpat___depname \
  @COND_SHARED_0_WXUSE_EXPAT_BUILTIN@    = install_wxexpat
  @COND_WXUSE_EXPAT_BUILTIN@__wxexpat___depname = $(COND_WXUSE_EXPAT_BUILTIN___wxexpat___depname)
  @COND_SHARED_0_WXUSE_EXPAT_BUILTIN@__install_wxexpat___depname \
  @COND_SHARED_0_WXUSE_EXPAT_BUILTIN@    = install_wxexpat
+@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_UNIX_0@PLUGIN_VERSION0 = $(WX_VERSION_NODOT)
  @COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = $(WX_VERSION)
  @COND_PLATFORM_UNIX_0@PLUGVERDELIM = 
  @COND_PLATFORM_UNIX_0@PLUGIN_VERSION0 = $(WX_VERSION_NODOT)
  @COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = $(WX_VERSION)
  @COND_PLATFORM_UNIX_0@PLUGVERDELIM = 
@@ -7609,7 +7613,7 @@ distclean: clean
  @COND_SHARED_0_WXUSE_EXPAT_BUILTIN@    $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname)
  @COND_SHARED_0_WXUSE_EXPAT_BUILTIN@    $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname)
-@COND_MONOLITHIC_1_SHARED_1@   $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_ODBC) $(PLUGIN_ADV_EXTRALIBS)
+@COND_MONOLITHIC_1_SHARED_1@   $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(dll___macver)  $(__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) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_ODBC) $(PLUGIN_ADV_EXTRALIBS)
  @COND_MONOLITHIC_1_SHARED_1@   
  @COND_MONOLITHIC_1_SHARED_1@   $(__monodll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_1_SHARED_1@   
  @COND_MONOLITHIC_1_SHARED_1@   $(__monodll___so_symlinks_cmd)
  
@@ -7635,7 +7639,7 @@ distclean: clean
  @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_monolib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MONOLIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname)
  @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_monolib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MONOLIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname)
-@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(BASEDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__basedll___macinstnamecmd) $(__basedll___importlib) $(__basedll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS)
+@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(BASEDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__basedll___macinstnamecmd) $(__basedll___importlib) $(__basedll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
  @COND_MONOLITHIC_0_SHARED_1@   
  @COND_MONOLITHIC_0_SHARED_1@   $(__basedll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1@   
  @COND_MONOLITHIC_0_SHARED_1@   $(__basedll___so_symlinks_cmd)
  
@@ -7661,7 +7665,7 @@ distclean: clean
  @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_baselib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(BASELIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
  @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_baselib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(BASELIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(NETDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__netdll___macinstnamecmd) $(__netdll___importlib) $(__netdll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(NETDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__netdll___macinstnamecmd) $(__netdll___importlib) $(__netdll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_MONOLITHIC_0_SHARED_1@   
  @COND_MONOLITHIC_0_SHARED_1@   $(__netdll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1@   
  @COND_MONOLITHIC_0_SHARED_1@   $(__netdll___so_symlinks_cmd)
  
@@ -7687,7 +7691,7 @@ distclean: clean
  @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_netlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETLIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
  @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_netlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETLIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(COREDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__coredll___macinstnamecmd) $(__coredll___importlib) $(__coredll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(COREDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__coredll___macinstnamecmd) $(__coredll___importlib) $(__coredll___soname_flags) $(dll___macver)  $(__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) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ 
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__coredll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ 
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__coredll___so_symlinks_cmd)
  
@@ -7713,7 +7717,7 @@ distclean: clean
  @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_corelib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(CORELIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname)
  @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_corelib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(CORELIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(ADVDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__advdll___macinstnamecmd) $(__advdll___importlib) $(__advdll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(PLUGIN_ADV_EXTRALIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(ADVDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__advdll___macinstnamecmd) $(__advdll___importlib) $(__advdll___soname_flags) $(dll___macver)  $(__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) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(PLUGIN_ADV_EXTRALIBS)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ 
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__advdll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ 
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__advdll___so_symlinks_cmd)
  
@@ -7739,7 +7743,7 @@ distclean: clean
  @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_advlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ADVLIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
  @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_advlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ADVLIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(SHARED_LD_CXX) $@ $(ODBCDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__odbcdll___macinstnamecmd) $(__odbcdll___importlib) $(__odbcdll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(EXTRALIBS_ODBC)
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(SHARED_LD_CXX) $@ $(ODBCDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__odbcdll___macinstnamecmd) $(__odbcdll___importlib) $(__odbcdll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(EXTRALIBS_ODBC)
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(__odbcdll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(__odbcdll___so_symlinks_cmd)
  
@@ -7765,7 +7769,7 @@ distclean: clean
  @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_odbclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ODBCLIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
  @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_odbclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ODBCLIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(SHARED_LD_CXX) $@ $(DBGRIDDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__dbgriddll___macinstnamecmd) $(__dbgriddll___importlib) $(__dbgriddll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(SHARED_LD_CXX) $@ $(DBGRIDDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__dbgriddll___macinstnamecmd) $(__dbgriddll___importlib) $(__dbgriddll___soname_flags) $(dll___macver)  $(__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) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(__dbgriddll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(__dbgriddll___so_symlinks_cmd)
  
@@ -7791,7 +7795,7 @@ distclean: clean
  @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_dbgridlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DBGRIDLIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname)
  @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_dbgridlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DBGRIDLIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(SHARED_LD_CXX) $@ $(HTMLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(EXTRALIBS_HTML)
+@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(SHARED_LD_CXX) $@ $(HTMLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(dll___macver)  $(__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) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(EXTRALIBS_HTML)
  @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        
  @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(__htmldll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        
  @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(__htmldll___so_symlinks_cmd)
  
@@ -7817,7 +7821,7 @@ distclean: clean
  @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_htmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(HTMLLIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
  @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_htmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(HTMLLIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(XMLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__xmldll___macinstnamecmd) $(__xmldll___importlib) $(__xmldll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(EXTRALIBS_XML)
+@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(XMLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__xmldll___macinstnamecmd) $(__xmldll___importlib) $(__xmldll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(EXTRALIBS_XML)
  @COND_MONOLITHIC_0_SHARED_1@   
  @COND_MONOLITHIC_0_SHARED_1@   $(__xmldll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1@   
  @COND_MONOLITHIC_0_SHARED_1@   $(__xmldll___so_symlinks_cmd)
  
@@ -7843,7 +7847,7 @@ distclean: clean
  @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_xmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XMLLIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__htmldll___depname) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
  @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_xmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XMLLIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__htmldll___depname) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(dll___macver)  $(__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) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ 
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(__xrcdll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ 
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(__xrcdll___so_symlinks_cmd)
  
@@ -7869,7 +7873,7 @@ distclean: clean
  @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_xrclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XRCLIB_CXXFLAGS)
  
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) $(__coredll___depname)
  @COND_GCC_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_xrclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XRCLIB_CXXFLAGS)
  
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) $(__coredll___depname)
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) $(EXTRALIBS_OPENGL)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(dll___macver)  $(__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) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) $(EXTRALIBS_OPENGL)
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ 
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(__gldll___so_symlinks_cmd)
  
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ 
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(__gldll___so_symlinks_cmd)
  
diff --git a/contrib/samples/animate/Makefile.in b/contrib/samples/animate/Makefile.in

index ca3b4fc38905300737c3bc7666a80afabeaa9cfc..3460ce19369180a0b6672efacaa058a976fedc1c 100644 (file)
--- a/contrib/samples/animate/Makefile.in
+++ b/contrib/samples/animate/Makefile.in
@@ -58,6 +58,10 @@ ANITEST_OBJECTS =  \
  @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_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@__anitest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C anitest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__anitest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__anitest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C anitest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__anitest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -132,7 +136,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  anitest$(EXEEXT): $(ANITEST_OBJECTS) $(__anitest___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  anitest$(EXEEXT): $(ANITEST_OBJECTS) $(__anitest___win32rc)
-       $(CXX) -o $@ $(ANITEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate-$(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) $(EXTRALIBS_GUI)
+       $(CXX) -o $@ $(ANITEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate-$(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)
         $(__anitest___mac_rezcmd)
         $(__anitest___mac_setfilecmd)
         $(__anitest___os2_emxbindcmd)
         $(__anitest___mac_rezcmd)
         $(__anitest___mac_setfilecmd)
         $(__anitest___os2_emxbindcmd)
diff --git a/contrib/samples/deprecated/proplist/Makefile.in b/contrib/samples/deprecated/proplist/Makefile.in

index d88ac025d2f5236663910fd18496286ac6a5d0f9..1a109f8332d40693de2753bc7d7828bc822ed3d4 100644 (file)
--- a/contrib/samples/deprecated/proplist/Makefile.in
+++ b/contrib/samples/deprecated/proplist/Makefile.in
@@ -58,6 +58,10 @@ PROPLIST_OBJECTS =  \
  @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_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@__proplist___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C proplist$(EXEEXT)
  @COND_PLATFORM_MAC_1@__proplist___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__proplist___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C proplist$(EXEEXT)
  @COND_PLATFORM_MAC_1@__proplist___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -132,7 +136,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  proplist$(EXEEXT): $(PROPLIST_OBJECTS) $(__proplist___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  proplist$(EXEEXT): $(PROPLIST_OBJECTS) $(__proplist___win32rc)
-       $(CXX) -o $@ $(PROPLIST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(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) $(EXTRALIBS_GUI)
+       $(CXX) -o $@ $(PROPLIST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(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)
         $(__proplist___mac_rezcmd)
         $(__proplist___mac_setfilecmd)
         $(__proplist___os2_emxbindcmd)
         $(__proplist___mac_rezcmd)
         $(__proplist___mac_setfilecmd)
         $(__proplist___os2_emxbindcmd)
diff --git a/contrib/samples/deprecated/resource/Makefile.in b/contrib/samples/deprecated/resource/Makefile.in

index 93205a903cc538e8f27504bed0d924a88a924fe5..86cb5f33f266521f6775e713a5b328fc946ad8dc 100644 (file)
--- a/contrib/samples/deprecated/resource/Makefile.in
+++ b/contrib/samples/deprecated/resource/Makefile.in
@@ -58,6 +58,10 @@ RESOURCE_OBJECTS =  \
  @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_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@__resource___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C resource$(EXEEXT)
  @COND_PLATFORM_MAC_1@__resource___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__resource___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C resource$(EXEEXT)
  @COND_PLATFORM_MAC_1@__resource___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -132,7 +136,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  resource$(EXEEXT): $(RESOURCE_OBJECTS) $(__resource___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  resource$(EXEEXT): $(RESOURCE_OBJECTS) $(__resource___win32rc)
-       $(CXX) -o $@ $(RESOURCE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(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) $(EXTRALIBS_GUI)
+       $(CXX) -o $@ $(RESOURCE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(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)
         $(__resource___mac_rezcmd)
         $(__resource___mac_setfilecmd)
         $(__resource___os2_emxbindcmd)
         $(__resource___mac_rezcmd)
         $(__resource___mac_setfilecmd)
         $(__resource___os2_emxbindcmd)
diff --git a/contrib/samples/deprecated/treelay/Makefile.in b/contrib/samples/deprecated/treelay/Makefile.in

index c8c0e428a6b6d9f70672278766b73f7ae22199de..5b34770778a0b81912a2a74c5086011d643c34a8 100644 (file)
--- a/contrib/samples/deprecated/treelay/Makefile.in
+++ b/contrib/samples/deprecated/treelay/Makefile.in
@@ -58,6 +58,10 @@ TREELAY_OBJECTS =  \
  @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_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@__treelay___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C treelay$(EXEEXT)
  @COND_PLATFORM_MAC_1@__treelay___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__treelay___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C treelay$(EXEEXT)
  @COND_PLATFORM_MAC_1@__treelay___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -132,7 +136,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  treelay$(EXEEXT): $(TREELAY_OBJECTS) $(__treelay___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  treelay$(EXEEXT): $(TREELAY_OBJECTS) $(__treelay___win32rc)
-       $(CXX) -o $@ $(TREELAY_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(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) $(EXTRALIBS_GUI)
+       $(CXX) -o $@ $(TREELAY_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(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)
         $(__treelay___mac_rezcmd)
         $(__treelay___mac_setfilecmd)
         $(__treelay___os2_emxbindcmd)
         $(__treelay___mac_rezcmd)
         $(__treelay___mac_setfilecmd)
         $(__treelay___os2_emxbindcmd)
diff --git a/contrib/samples/fl/Makefile.in b/contrib/samples/fl/Makefile.in

index 4ddadde927c64b72cfe6632ba96e385a3fe3a75e..af8297a649a75d0b7d714bf365e13b135b0cc135 100644 (file)
--- a/contrib/samples/fl/Makefile.in
+++ b/contrib/samples/fl/Makefile.in
@@ -86,6 +86,10 @@ FL_SAMPLE3_OBJECTS =  \
  @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_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_rezcmd = $(__MACOSX_RESOURCES_p_5)
  @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_rezcmd = $(__MACOSX_RESOURCES_p_5)
@@ -239,7 +243,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  fl_demo1$(EXEEXT): $(FL_DEMO1_OBJECTS) $(__fl_demo1___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  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)$(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) $(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___os2_emxbindcmd)
         $(__fl_demo1___mac_rezcmd)
         $(__fl_demo1___mac_setfilecmd)
         $(__fl_demo1___os2_emxbindcmd)
@@ -269,7 +273,7 @@ fl_demo1.app/Contents/PkgInfo: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
  @COND_PLATFORM_MACOSX_1@fl_demo1_bundle: $(____fl_demo1_BUNDLE_TGT_REF_DEP)
  
  fl_demo2$(EXEEXT): $(FL_DEMO2_OBJECTS) $(__fl_demo2___win32rc)
  @COND_PLATFORM_MACOSX_1@fl_demo1_bundle: $(____fl_demo1_BUNDLE_TGT_REF_DEP)
  
  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)$(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) $(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___os2_emxbindcmd)
         $(__fl_demo2___mac_rezcmd)
         $(__fl_demo2___mac_setfilecmd)
         $(__fl_demo2___os2_emxbindcmd)
@@ -299,7 +303,7 @@ fl_demo2.app/Contents/PkgInfo: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
  @COND_PLATFORM_MACOSX_1@fl_demo2_bundle: $(____fl_demo2_BUNDLE_TGT_REF_DEP)
  
  fl_sample1$(EXEEXT): $(FL_SAMPLE1_OBJECTS) $(__fl_sample1___win32rc)
  @COND_PLATFORM_MACOSX_1@fl_demo2_bundle: $(____fl_demo2_BUNDLE_TGT_REF_DEP)
  
  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)$(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) $(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___os2_emxbindcmd)
         $(__fl_sample1___mac_rezcmd)
         $(__fl_sample1___mac_setfilecmd)
         $(__fl_sample1___os2_emxbindcmd)
@@ -329,7 +333,7 @@ fl_sample1.app/Contents/PkgInfo: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/carbo
  @COND_PLATFORM_MACOSX_1@fl_sample1_bundle: $(____fl_sample1_BUNDLE_TGT_REF_DEP)
  
  fl_sample2$(EXEEXT): $(FL_SAMPLE2_OBJECTS) $(__fl_sample2___win32rc)
  @COND_PLATFORM_MACOSX_1@fl_sample1_bundle: $(____fl_sample1_BUNDLE_TGT_REF_DEP)
  
  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)$(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) $(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___os2_emxbindcmd)
         $(__fl_sample2___mac_rezcmd)
         $(__fl_sample2___mac_setfilecmd)
         $(__fl_sample2___os2_emxbindcmd)
@@ -359,7 +363,7 @@ fl_sample2.app/Contents/PkgInfo: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/carbo
  @COND_PLATFORM_MACOSX_1@fl_sample2_bundle: $(____fl_sample2_BUNDLE_TGT_REF_DEP)
  
  fl_sample3$(EXEEXT): $(FL_SAMPLE3_OBJECTS) $(__fl_sample3___win32rc)
  @COND_PLATFORM_MACOSX_1@fl_sample2_bundle: $(____fl_sample2_BUNDLE_TGT_REF_DEP)
  
  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)$(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) $(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___os2_emxbindcmd)
         $(__fl_sample3___mac_rezcmd)
         $(__fl_sample3___mac_setfilecmd)
         $(__fl_sample3___os2_emxbindcmd)
diff --git a/contrib/samples/foldbar/foldpanelbar/Makefile.in b/contrib/samples/foldbar/foldpanelbar/Makefile.in

index 084516cee54f04a78659ac0896047f223ee369e3..022d548b2ed32946764a3bd043b72179cdf32818 100644 (file)
--- a/contrib/samples/foldbar/foldpanelbar/Makefile.in
+++ b/contrib/samples/foldbar/foldpanelbar/Makefile.in
@@ -61,6 +61,10 @@ FOLDTEST_OBJECTS =  \
  @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_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@__foldtest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C foldtest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__foldtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__foldtest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C foldtest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__foldtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -136,7 +140,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  foldtest$(EXEEXT): $(FOLDTEST_OBJECTS) $(__foldtest___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  foldtest$(EXEEXT): $(FOLDTEST_OBJECTS) $(__foldtest___win32rc)
-       $(CXX) -o $@ $(FOLDTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(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) $(EXTRALIBS_GUI)
+       $(CXX) -o $@ $(FOLDTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar-$(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)
         $(__foldtest___mac_rezcmd)
         $(__foldtest___mac_setfilecmd)
         $(__foldtest___os2_emxbindcmd)
         $(__foldtest___mac_rezcmd)
         $(__foldtest___mac_setfilecmd)
         $(__foldtest___os2_emxbindcmd)
diff --git a/contrib/samples/gizmos/dynsash/Makefile.in b/contrib/samples/gizmos/dynsash/Makefile.in

index c6c23e94260f68a10285790614a0c72a32d6f1b2..214c46e5dfef21ab2fbb90cd024a67815101074d 100644 (file)
--- a/contrib/samples/gizmos/dynsash/Makefile.in
+++ b/contrib/samples/gizmos/dynsash/Makefile.in
@@ -59,6 +59,10 @@ DYNSASH_OBJECTS =  \
  @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_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@__dynsash___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C dynsash$(EXEEXT)
  @COND_PLATFORM_MAC_1@__dynsash___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__dynsash___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C dynsash$(EXEEXT)
  @COND_PLATFORM_MAC_1@__dynsash___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -136,7 +140,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  dynsash$(EXEEXT): $(DYNSASH_OBJECTS) $(__dynsash___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  dynsash$(EXEEXT): $(DYNSASH_OBJECTS) $(__dynsash___win32rc)
-       $(CXX) -o $@ $(DYNSASH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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 $@ $(DYNSASH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
         $(__dynsash___mac_rezcmd)
         $(__dynsash___mac_setfilecmd)
         $(__dynsash___os2_emxbindcmd)
         $(__dynsash___mac_rezcmd)
         $(__dynsash___mac_setfilecmd)
         $(__dynsash___os2_emxbindcmd)
diff --git a/contrib/samples/gizmos/dynsash_switch/Makefile.in b/contrib/samples/gizmos/dynsash_switch/Makefile.in

index 2877f1628b2cab9a6c978387d3f163680d9e21fd..c6478800b1c0f38645635c9bcc8eee807d240a80 100644 (file)
--- a/contrib/samples/gizmos/dynsash_switch/Makefile.in
+++ b/contrib/samples/gizmos/dynsash_switch/Makefile.in
@@ -58,6 +58,10 @@ DYNSASH_SWITCH_OBJECTS =  \
  @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_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@__dynsash_switch___mac_setfilecmd \
  @COND_PLATFORM_MAC_1@  = $(SETFILE) -a C dynsash_switch$(EXEEXT)
  @COND_PLATFORM_MAC_1@__dynsash_switch___mac_rezcmd = \
  @COND_PLATFORM_MAC_1@__dynsash_switch___mac_setfilecmd \
  @COND_PLATFORM_MAC_1@  = $(SETFILE) -a C dynsash_switch$(EXEEXT)
  @COND_PLATFORM_MAC_1@__dynsash_switch___mac_rezcmd = \
@@ -136,7 +140,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  dynsash_switch$(EXEEXT): $(DYNSASH_SWITCH_OBJECTS) $(__dynsash_switch___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  dynsash_switch$(EXEEXT): $(DYNSASH_SWITCH_OBJECTS) $(__dynsash_switch___win32rc)
-       $(CXX) -o $@ $(DYNSASH_SWITCH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(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) $(EXTRALIBS_GUI)
+       $(CXX) -o $@ $(DYNSASH_SWITCH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(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)
         $(__dynsash_switch___mac_rezcmd)
         $(__dynsash_switch___mac_setfilecmd)
         $(__dynsash_switch___os2_emxbindcmd)
         $(__dynsash_switch___mac_rezcmd)
         $(__dynsash_switch___mac_setfilecmd)
         $(__dynsash_switch___os2_emxbindcmd)
diff --git a/contrib/samples/gizmos/editlbox/Makefile.in b/contrib/samples/gizmos/editlbox/Makefile.in

index c9a5b455c9d72cff67ffba39c9cd04ea8b93d2d7..3f674ee601343072cc9cbce80e4c34b036801f21 100644 (file)
--- a/contrib/samples/gizmos/editlbox/Makefile.in
+++ b/contrib/samples/gizmos/editlbox/Makefile.in
@@ -58,6 +58,10 @@ TEST_OBJECTS =  \
  @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_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@__test___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C test$(EXEEXT)
  @COND_PLATFORM_MAC_1@__test___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__test___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C test$(EXEEXT)
  @COND_PLATFORM_MAC_1@__test___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
-       $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(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) $(EXTRALIBS_GUI)
+       $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(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)
         $(__test___mac_rezcmd)
         $(__test___mac_setfilecmd)
         $(__test___os2_emxbindcmd)
         $(__test___mac_rezcmd)
         $(__test___mac_setfilecmd)
         $(__test___os2_emxbindcmd)
diff --git a/contrib/samples/gizmos/led/Makefile.in b/contrib/samples/gizmos/led/Makefile.in

index 424050ce40fe66c8ada8b137b362a9588f97a739..6fec580ddc278c2cf7668700c4198cb9ed3cb0a1 100644 (file)
--- a/contrib/samples/gizmos/led/Makefile.in
+++ b/contrib/samples/gizmos/led/Makefile.in
@@ -58,6 +58,10 @@ LED_OBJECTS =  \
  @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_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@__led___mac_setfilecmd = $(SETFILE) -a C led$(EXEEXT)
  @COND_PLATFORM_MAC_1@__led___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
  @COND_PLATFORM_MAC_1@__led___mac_setfilecmd = $(SETFILE) -a C led$(EXEEXT)
  @COND_PLATFORM_MAC_1@__led___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -129,7 +133,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  led$(EXEEXT): $(LED_OBJECTS) $(__led___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  led$(EXEEXT): $(LED_OBJECTS) $(__led___win32rc)
-       $(CXX) -o $@ $(LED_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(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) $(EXTRALIBS_GUI)
+       $(CXX) -o $@ $(LED_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(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)
         $(__led___mac_rezcmd)
         $(__led___mac_setfilecmd)
         $(__led___os2_emxbindcmd)
         $(__led___mac_rezcmd)
         $(__led___mac_setfilecmd)
         $(__led___os2_emxbindcmd)
diff --git a/contrib/samples/gizmos/multicell/Makefile.in b/contrib/samples/gizmos/multicell/Makefile.in

index 189883ba84d10491fe632c2daed622b8e3554d73..5d7a2548ca8f95a5bded5878539eeab1a09540ff 100644 (file)
--- a/contrib/samples/gizmos/multicell/Makefile.in
+++ b/contrib/samples/gizmos/multicell/Makefile.in
@@ -58,6 +58,10 @@ MTEST_OBJECTS =  \
  @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_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@__mtest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C mtest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__mtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__mtest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C mtest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__mtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -131,7 +135,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  mtest$(EXEEXT): $(MTEST_OBJECTS) $(__mtest___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  mtest$(EXEEXT): $(MTEST_OBJECTS) $(__mtest___win32rc)
-       $(CXX) -o $@ $(MTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(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) $(EXTRALIBS_GUI)
+       $(CXX) -o $@ $(MTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(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)
         $(__mtest___mac_rezcmd)
         $(__mtest___mac_setfilecmd)
         $(__mtest___os2_emxbindcmd)
         $(__mtest___mac_rezcmd)
         $(__mtest___mac_setfilecmd)
         $(__mtest___os2_emxbindcmd)
diff --git a/contrib/samples/gizmos/splittree/Makefile.in b/contrib/samples/gizmos/splittree/Makefile.in

index 132719dd3d54ef0b998e60d2e4552fab4cd4bab4..12d2c1d323e938f0e28900700da88162b1585964 100644 (file)
--- a/contrib/samples/gizmos/splittree/Makefile.in
+++ b/contrib/samples/gizmos/splittree/Makefile.in
@@ -58,6 +58,10 @@ SPLITTREE_OBJECTS =  \
  @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_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@__splittree___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C splittree$(EXEEXT)
  @COND_PLATFORM_MAC_1@__splittree___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__splittree___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C splittree$(EXEEXT)
  @COND_PLATFORM_MAC_1@__splittree___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -132,7 +136,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  splittree$(EXEEXT): $(SPLITTREE_OBJECTS) $(__splittree___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  splittree$(EXEEXT): $(SPLITTREE_OBJECTS) $(__splittree___win32rc)
-       $(CXX) -o $@ $(SPLITTREE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(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) $(EXTRALIBS_GUI)
+       $(CXX) -o $@ $(SPLITTREE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(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)
         $(__splittree___mac_rezcmd)
         $(__splittree___mac_setfilecmd)
         $(__splittree___os2_emxbindcmd)
         $(__splittree___mac_rezcmd)
         $(__splittree___mac_setfilecmd)
         $(__splittree___os2_emxbindcmd)
diff --git a/contrib/samples/mmedia/Makefile.in b/contrib/samples/mmedia/Makefile.in

index d160ac991385f46398e1b886eedd3afb159ff3a5..5c1595fbf89252e684fad40830e1098f9b04ae18 100644 (file)
--- a/contrib/samples/mmedia/Makefile.in
+++ b/contrib/samples/mmedia/Makefile.in
@@ -60,6 +60,10 @@ MMBOARD_OBJECTS =  \
  @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_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@__mmboard___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C mmboard$(EXEEXT)
  @COND_PLATFORM_MAC_1@__mmboard___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__mmboard___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C mmboard$(EXEEXT)
  @COND_PLATFORM_MAC_1@__mmboard___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -134,7 +138,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  mmboard$(EXEEXT): $(MMBOARD_OBJECTS) $(__mmboard___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  mmboard$(EXEEXT): $(MMBOARD_OBJECTS) $(__mmboard___win32rc)
-       $(CXX) -o $@ $(MMBOARD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)  $(EXTRALIBS_ESD) $(__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 $@ $(MMBOARD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia-$(WX_RELEASE)$(HOST_SUFFIX)  $(EXTRALIBS_ESD) $(__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)
         $(__mmboard___mac_rezcmd)
         $(__mmboard___mac_setfilecmd)
         $(__mmboard___os2_emxbindcmd)
         $(__mmboard___mac_rezcmd)
         $(__mmboard___mac_setfilecmd)
         $(__mmboard___os2_emxbindcmd)
diff --git a/contrib/samples/ogl/ogledit/Makefile.in b/contrib/samples/ogl/ogledit/Makefile.in

index a64406e4f76a14600031baae6ebf36139c00865c..4a90b9ff4ea4b63329eb21b97dcc007597aa350d 100644 (file)
--- a/contrib/samples/ogl/ogledit/Makefile.in
+++ b/contrib/samples/ogl/ogledit/Makefile.in
@@ -61,6 +61,10 @@ OGLEDIT_OBJECTS =  \
  @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_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@__ogledit___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C ogledit$(EXEEXT)
  @COND_PLATFORM_MAC_1@__ogledit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__ogledit___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C ogledit$(EXEEXT)
  @COND_PLATFORM_MAC_1@__ogledit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -135,7 +139,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  ogledit$(EXEEXT): $(OGLEDIT_OBJECTS) $(__ogledit___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  ogledit$(EXEEXT): $(OGLEDIT_OBJECTS) $(__ogledit___win32rc)
-       $(CXX) -o $@ $(OGLEDIT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(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) $(EXTRALIBS_GUI)
+       $(CXX) -o $@ $(OGLEDIT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(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)
         $(__ogledit___mac_rezcmd)
         $(__ogledit___mac_setfilecmd)
         $(__ogledit___os2_emxbindcmd)
         $(__ogledit___mac_rezcmd)
         $(__ogledit___mac_setfilecmd)
         $(__ogledit___os2_emxbindcmd)
diff --git a/contrib/samples/ogl/studio/Makefile.in b/contrib/samples/ogl/studio/Makefile.in

index a1c729f1932f92fc11ca40d7e0873e2bde257c6e..e26677fc72372322e64d56b9583268828379e309 100644 (file)
--- a/contrib/samples/ogl/studio/Makefile.in
+++ b/contrib/samples/ogl/studio/Makefile.in
@@ -70,6 +70,10 @@ STUDIO_OBJECTS =  \
  @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_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@__studio___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C studio$(EXEEXT)
  @COND_PLATFORM_MAC_1@__studio___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__studio___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C studio$(EXEEXT)
  @COND_PLATFORM_MAC_1@__studio___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -150,7 +154,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  studio$(EXEEXT): $(STUDIO_OBJECTS) $(__studio___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  studio$(EXEEXT): $(STUDIO_OBJECTS) $(__studio___win32rc)
-       $(CXX) -o $@ $(STUDIO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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 $@ $(STUDIO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
         $(__studio___mac_rezcmd)
         $(__studio___mac_setfilecmd)
         $(__studio___os2_emxbindcmd)
         $(__studio___mac_rezcmd)
         $(__studio___mac_setfilecmd)
         $(__studio___os2_emxbindcmd)
diff --git a/contrib/samples/plot/Makefile.in b/contrib/samples/plot/Makefile.in

index 4fc93e7d1e855ea0bef63c8de589b935c8fd7fc6..0ee02d9bcd96919bb12f3323378a4f7a3cabeec2 100644 (file)
--- a/contrib/samples/plot/Makefile.in
+++ b/contrib/samples/plot/Makefile.in
@@ -58,6 +58,10 @@ PLOT_OBJECTS =  \
  @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_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@__plot___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C plot$(EXEEXT)
  @COND_PLATFORM_MAC_1@__plot___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__plot___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C plot$(EXEEXT)
  @COND_PLATFORM_MAC_1@__plot___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  plot$(EXEEXT): $(PLOT_OBJECTS) $(__plot___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  plot$(EXEEXT): $(PLOT_OBJECTS) $(__plot___win32rc)
-       $(CXX) -o $@ $(PLOT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(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) $(EXTRALIBS_GUI)
+       $(CXX) -o $@ $(PLOT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot-$(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)
         $(__plot___mac_rezcmd)
         $(__plot___mac_setfilecmd)
         $(__plot___os2_emxbindcmd)
         $(__plot___mac_rezcmd)
         $(__plot___mac_setfilecmd)
         $(__plot___os2_emxbindcmd)
diff --git a/contrib/samples/stc/Makefile.in b/contrib/samples/stc/Makefile.in

index 105eb0b40b3f01da396a704d5d9d42f841d21ffc..554e650f803d7998bd269bdba01cbe9f4b344eb9 100644 (file)
--- a/contrib/samples/stc/Makefile.in
+++ b/contrib/samples/stc/Makefile.in
@@ -60,6 +60,10 @@ STCTEST_OBJECTS =  \
  @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_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@__stctest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C stctest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__stctest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__stctest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C stctest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__stctest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -134,7 +138,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc)
-       $(CXX) -o $@ $(STCTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(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) $(EXTRALIBS_GUI)
+       $(CXX) -o $@ $(STCTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(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)
         $(__stctest___mac_rezcmd)
         $(__stctest___mac_setfilecmd)
         $(__stctest___os2_emxbindcmd)
         $(__stctest___mac_rezcmd)
         $(__stctest___mac_setfilecmd)
         $(__stctest___os2_emxbindcmd)
diff --git a/contrib/samples/svg/Makefile.in b/contrib/samples/svg/Makefile.in

index 76b6a632479ad80ed9b71734e729d0514a2542da..9f91050419fd85892b6e4ad68e531cb4ffd5967f 100644 (file)
--- a/contrib/samples/svg/Makefile.in
+++ b/contrib/samples/svg/Makefile.in
@@ -58,6 +58,10 @@ SVGTEST_OBJECTS =  \
  @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_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@__svgtest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C svgtest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__svgtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__svgtest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C svgtest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__svgtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -132,7 +136,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc)
-       $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(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) $(EXTRALIBS_GUI)
+       $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(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)
         $(__svgtest___mac_rezcmd)
         $(__svgtest___mac_setfilecmd)
         $(__svgtest___os2_emxbindcmd)
         $(__svgtest___mac_rezcmd)
         $(__svgtest___mac_setfilecmd)
         $(__svgtest___os2_emxbindcmd)
diff --git a/contrib/src/animate/Makefile.in b/contrib/src/animate/Makefile.in

index f4f7cb01234751a5418cf70e6e9267dd95a2a59c..7c73c6d19c1163291dd08a541762a0b47a5cebc1 100644 (file)
--- a/contrib/src/animate/Makefile.in
+++ b/contrib/src/animate/Makefile.in
@@ -83,6 +83,10 @@ ANIMATELIB_ODEP =  $(___pch_wxprec_animatelib_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_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___animatedll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3)
  @COND_SHARED_1@__animatedll___depname = $(COND_SHARED_1___animatedll___depname)
  COND_SHARED_1___animatedll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3)
  @COND_SHARED_1@__animatedll___depname = $(COND_SHARED_1___animatedll___depname)
@@ -205,7 +209,7 @@ distclean: clean
         rm -f configure 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)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3): $(ANIMATEDLL_OBJECTS)
         rm -f configure 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)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3): $(ANIMATEDLL_OBJECTS)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(ANIMATEDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__animatedll___macinstnamecmd) $(__animatedll___importlib) $(__animatedll___soname_flags) $(__animatedll___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) $@ $(ANIMATEDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__animatedll___macinstnamecmd) $(__animatedll___importlib) $(__animatedll___soname_flags) $(__animatedll___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@        $(__animatedll___so_symlinks_cmd)
  
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__animatedll___so_symlinks_cmd)
  
diff --git a/contrib/src/deprecated/Makefile.in b/contrib/src/deprecated/Makefile.in

index fdb4d168854a468fdf8844d1cc3f8de7f0859f8d..007eff7b052a9a6fe36c29a9259d21acc862a301 100644 (file)
--- a/contrib/src/deprecated/Makefile.in
+++ b/contrib/src/deprecated/Makefile.in
@@ -110,6 +110,10 @@ DEPRECATEDLIB_ODEP = \
  @COND_PLATFORM_WIN32_1@        wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
  @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
  @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
  @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___deprecateddll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3)
  @COND_SHARED_1@__deprecateddll___depname = $(COND_SHARED_1___deprecateddll___depname)
  COND_SHARED_1___deprecateddll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3)
  @COND_SHARED_1@__deprecateddll___depname = $(COND_SHARED_1___deprecateddll___depname)
@@ -232,7 +236,7 @@ distclean: clean
         rm -f configure 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)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3): $(DEPRECATEDDLL_OBJECTS)
         rm -f configure 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)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3): $(DEPRECATEDDLL_OBJECTS)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__deprecateddll___macinstnamecmd) $(__deprecateddll___importlib) $(__deprecateddll___soname_flags) $(__deprecateddll___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) $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__deprecateddll___macinstnamecmd) $(__deprecateddll___importlib) $(__deprecateddll___soname_flags) $(__deprecateddll___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@        $(__deprecateddll___so_symlinks_cmd)
  
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__deprecateddll___so_symlinks_cmd)
  
diff --git a/contrib/src/fl/Makefile.in b/contrib/src/fl/Makefile.in

index 2964cfb3699946a568a1b61b84b907d53dcacaec..890a8fd4cdd2c3d0ee56447f217c236a55ba3ece 100644 (file)
--- a/contrib/src/fl/Makefile.in
+++ b/contrib/src/fl/Makefile.in
@@ -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_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_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)
@@ -236,7 +240,7 @@ distclean: clean
         rm -f configure 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)
         rm -f configure 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)
  
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__fldll___so_symlinks_cmd)
  
diff --git a/contrib/src/foldbar/Makefile.in b/contrib/src/foldbar/Makefile.in

index 08be9cbc9299291788b5c639c7a7032b4d04dc62..b1ff639aa1912c16170c68fff739c331da46a716 100644 (file)
--- a/contrib/src/foldbar/Makefile.in
+++ b/contrib/src/foldbar/Makefile.in
@@ -87,6 +87,10 @@ FOLDBARLIB_ODEP =  $(___pch_wxprec_foldbarlib_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_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)
  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)
@@ -209,7 +213,7 @@ distclean: clean
         rm -f configure 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)
         rm -f configure 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@        
  @COND_SHARED_1@        $(__foldbardll___so_symlinks_cmd)
  
diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in

index a5bb6ab25721b6e74089f8fb21ee649c3b422837..78bbe149ff8a8101c0898c99988a0727e94136e3 100644 (file)
--- a/contrib/src/gizmos/Makefile.in
+++ b/contrib/src/gizmos/Makefile.in
@@ -93,6 +93,10 @@ GIZMOSLIB_ODEP =  $(___pch_wxprec_gizmoslib_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_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___gizmosdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3)
  @COND_SHARED_1@__gizmosdll___depname = $(COND_SHARED_1___gizmosdll___depname)
  COND_SHARED_1___gizmosdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3)
  @COND_SHARED_1@__gizmosdll___depname = $(COND_SHARED_1___gizmosdll___depname)
@@ -214,7 +218,7 @@ distclean: clean
         rm -f configure 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)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3): $(GIZMOSDLL_OBJECTS)
         rm -f configure 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)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3): $(GIZMOSDLL_OBJECTS)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__gizmosdll___macinstnamecmd) $(__gizmosdll___importlib) $(__gizmosdll___soname_flags) $(__gizmosdll___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_BASE_p)  $(__WXLIB_CORE_p)
+@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__gizmosdll___macinstnamecmd) $(__gizmosdll___importlib) $(__gizmosdll___soname_flags) $(__gizmosdll___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_BASE_p)  $(__WXLIB_CORE_p)
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__gizmosdll___so_symlinks_cmd)
  
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__gizmosdll___so_symlinks_cmd)
  
diff --git a/contrib/src/mmedia/Makefile.in b/contrib/src/mmedia/Makefile.in

index 60b684f3093a4aae2fc2d6c1aa4f7f7369400cbd..8c0f9c508fb72a70b4ace06cd2d5f4fbfff72837 100644 (file)
--- a/contrib/src/mmedia/Makefile.in
+++ b/contrib/src/mmedia/Makefile.in
@@ -118,6 +118,10 @@ MMEDIALIB_ODEP =  $(___pch_wxprec_mmedialib_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_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___mmediadll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
  @COND_SHARED_1@__mmediadll___depname = $(COND_SHARED_1___mmediadll___depname)
  COND_SHARED_1___mmediadll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3)
  @COND_SHARED_1@__mmediadll___depname = $(COND_SHARED_1___mmediadll___depname)
@@ -257,7 +261,7 @@ distclean: clean
         rm -f configure 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)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3): $(MMEDIADLL_OBJECTS)
         rm -f configure 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)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3): $(MMEDIADLL_OBJECTS)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__mmediadll___macinstnamecmd) $(__mmediadll___importlib) $(__mmediadll___soname_flags) $(__mmediadll___macver) $(EXTRALIBS_ESD)  $(__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) $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__mmediadll___macinstnamecmd) $(__mmediadll___importlib) $(__mmediadll___soname_flags) $(__mmediadll___macver) $(EXTRALIBS_ESD)  $(__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@        $(__mmediadll___so_symlinks_cmd)
  
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__mmediadll___so_symlinks_cmd)
  
diff --git a/contrib/src/net/Makefile.in b/contrib/src/net/Makefile.in

index 3c3f2eec0905da9e59b6a6e53fba1e20dc4ea671..46d52a1f89d958f58a5c441f455032cb405434f9 100644 (file)
--- a/contrib/src/net/Makefile.in
+++ b/contrib/src/net/Makefile.in
@@ -87,6 +87,10 @@ NETUTILSLIB_ODEP =  $(___pch_wxprec_netutilslib_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_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___netutilsdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3)
  @COND_SHARED_1@__netutilsdll___depname = $(COND_SHARED_1___netutilsdll___depname)
  COND_SHARED_1___netutilsdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3)
  @COND_SHARED_1@__netutilsdll___depname = $(COND_SHARED_1___netutilsdll___depname)
@@ -209,7 +213,7 @@ distclean: clean
         rm -f configure 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)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3): $(NETUTILSDLL_OBJECTS)
         rm -f configure 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)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3): $(NETUTILSDLL_OBJECTS)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__netutilsdll___macinstnamecmd) $(__netutilsdll___importlib) $(__netutilsdll___soname_flags) $(__netutilsdll___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) $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__netutilsdll___macinstnamecmd) $(__netutilsdll___importlib) $(__netutilsdll___soname_flags) $(__netutilsdll___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@        $(__netutilsdll___so_symlinks_cmd)
  
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__netutilsdll___so_symlinks_cmd)
  
diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in

index e927958e4bd5be705084e14376ddf93db7fe40a6..5396cc718b3aa87ecc29f4651256b130143576f2 100644 (file)
--- a/contrib/src/ogl/Makefile.in
+++ b/contrib/src/ogl/Makefile.in
@@ -105,6 +105,10 @@ OGLLIB_ODEP =  $(___pch_wxprec_ogllib_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_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___ogldll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
  @COND_SHARED_1@__ogldll___depname = $(COND_SHARED_1___ogldll___depname)
  COND_SHARED_1___ogldll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3)
  @COND_SHARED_1@__ogldll___depname = $(COND_SHARED_1___ogldll___depname)
@@ -226,7 +230,7 @@ distclean: clean
         rm -f configure 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)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(OGLDLL_OBJECTS)
         rm -f configure 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)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(OGLDLL_OBJECTS)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(__ogldll___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) $@ $(OGLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(__ogldll___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@        $(__ogldll___so_symlinks_cmd)
  
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__ogldll___so_symlinks_cmd)
  
diff --git a/contrib/src/plot/Makefile.in b/contrib/src/plot/Makefile.in

index 239f0850ca1fdaa38ad148885b83dbe7bb27757d..45cc44a6e0ba9c985a1c525b138e3670839d6ab4 100644 (file)
--- a/contrib/src/plot/Makefile.in
+++ b/contrib/src/plot/Makefile.in
@@ -83,6 +83,10 @@ PLOTLIB_ODEP =  $(___pch_wxprec_plotlib_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_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___plotdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3)
  @COND_SHARED_1@__plotdll___depname = $(COND_SHARED_1___plotdll___depname)
  COND_SHARED_1___plotdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3)
  @COND_SHARED_1@__plotdll___depname = $(COND_SHARED_1___plotdll___depname)
@@ -204,7 +208,7 @@ distclean: clean
         rm -f configure 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)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3): $(PLOTDLL_OBJECTS)
         rm -f configure 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)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3): $(PLOTDLL_OBJECTS)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(PLOTDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__plotdll___macinstnamecmd) $(__plotdll___importlib) $(__plotdll___soname_flags) $(__plotdll___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) $@ $(PLOTDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__plotdll___macinstnamecmd) $(__plotdll___importlib) $(__plotdll___soname_flags) $(__plotdll___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@        $(__plotdll___so_symlinks_cmd)
  
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__plotdll___so_symlinks_cmd)
  
diff --git a/contrib/src/stc/Makefile.in b/contrib/src/stc/Makefile.in

index be11afaf21300d660505b602281945f2a688d8f8..77751156071d72bec2ea565054aea9e7e9f11947 100644 (file)
--- a/contrib/src/stc/Makefile.in
+++ b/contrib/src/stc/Makefile.in
@@ -220,6 +220,10 @@ STCLIB_OBJECTS =  \
  @COND_PLATFORM_WIN32_1@        wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
  @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
  @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
  @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___stcdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
  @COND_SHARED_1@__stcdll___depname = $(COND_SHARED_1___stcdll___depname)
  COND_SHARED_1___stcdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
  @COND_SHARED_1@__stcdll___depname = $(COND_SHARED_1___stcdll___depname)
@@ -335,7 +339,7 @@ distclean: clean
         rm -f configure 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)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): $(STCDLL_OBJECTS)
         rm -f configure 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)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): $(STCDLL_OBJECTS)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(__stcdll___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) $@ $(STCDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(__stcdll___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@        $(__stcdll___so_symlinks_cmd)
  
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__stcdll___so_symlinks_cmd)
  
diff --git a/contrib/src/svg/Makefile.in b/contrib/src/svg/Makefile.in

index 200ee5688b2aebdda11c9411e4a40e13c30bed1e..00c93a327411b6b53a8b01750aa2712dc38a6f9e 100644 (file)
--- a/contrib/src/svg/Makefile.in
+++ b/contrib/src/svg/Makefile.in
@@ -83,6 +83,10 @@ SVGLIB_ODEP =  $(___pch_wxprec_svglib_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_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___svgdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3)
  @COND_SHARED_1@__svgdll___depname = $(COND_SHARED_1___svgdll___depname)
  COND_SHARED_1___svgdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3)
  @COND_SHARED_1@__svgdll___depname = $(COND_SHARED_1___svgdll___depname)
@@ -204,7 +208,7 @@ distclean: clean
         rm -f configure 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)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3): $(SVGDLL_OBJECTS)
         rm -f configure 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)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3): $(SVGDLL_OBJECTS)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(SVGDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__svgdll___macinstnamecmd) $(__svgdll___importlib) $(__svgdll___soname_flags) $(__svgdll___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) $@ $(SVGDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__svgdll___macinstnamecmd) $(__svgdll___importlib) $(__svgdll___soname_flags) $(__svgdll___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@        $(__svgdll___so_symlinks_cmd)
  
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__svgdll___so_symlinks_cmd)
  
diff --git a/contrib/utils/convertrc/Makefile.in b/contrib/utils/convertrc/Makefile.in

index 37e347117d07da3319d8c09e0d6741add5901ebe..ee0b68025ddbb3e0150711dc9fa219b38993a7ac 100644 (file)
--- a/contrib/utils/convertrc/Makefile.in
+++ b/contrib/utils/convertrc/Makefile.in
@@ -63,6 +63,10 @@ CONVERTRC_OBJECTS =  \
  @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_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@__convertrc___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C convertrc$(EXEEXT)
  @COND_PLATFORM_MAC_1@__convertrc___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__convertrc___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C convertrc$(EXEEXT)
  @COND_PLATFORM_MAC_1@__convertrc___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -135,7 +139,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  convertrc$(EXEEXT): $(CONVERTRC_OBJECTS) $(__convertrc___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  convertrc$(EXEEXT): $(CONVERTRC_OBJECTS) $(__convertrc___win32rc)
-       $(CXX) -o $@ $(CONVERTRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(EXTRALIBS_XML) $(__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 $@ $(CONVERTRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated-$(WX_RELEASE)$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(EXTRALIBS_XML) $(__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)
         $(__convertrc___mac_rezcmd)
         $(__convertrc___mac_setfilecmd)
         $(__convertrc___os2_emxbindcmd)
         $(__convertrc___mac_rezcmd)
         $(__convertrc___mac_setfilecmd)
         $(__convertrc___os2_emxbindcmd)
diff --git a/contrib/utils/wxrcedit/Makefile.in b/contrib/utils/wxrcedit/Makefile.in

index 3a8068a311b323b23f0d3d25420be696e98e584b..c196ac8e68bcd14980c6bda729c631bb2a9177f8 100644 (file)
--- a/contrib/utils/wxrcedit/Makefile.in
+++ b/contrib/utils/wxrcedit/Makefile.in
@@ -73,6 +73,10 @@ WXRCEDIT_OBJECTS =  \
  @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_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@__wxrcedit___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C wxrcedit$(EXEEXT)
  @COND_PLATFORM_MAC_1@__wxrcedit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__wxrcedit___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C wxrcedit$(EXEEXT)
  @COND_PLATFORM_MAC_1@__wxrcedit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -154,7 +158,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  wxrcedit$(EXEEXT): $(WXRCEDIT_OBJECTS) $(__wxrcedit___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  wxrcedit$(EXEEXT): $(WXRCEDIT_OBJECTS) $(__wxrcedit___win32rc)
-       $(CXX) -o $@ $(WXRCEDIT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(__WXLIB_XRC_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(EXTRALIBS_XML) $(__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 $@ $(WXRCEDIT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(__WXLIB_XRC_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(EXTRALIBS_XML) $(__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)
         $(__wxrcedit___mac_rezcmd)
         $(__wxrcedit___mac_setfilecmd)
         $(__wxrcedit___os2_emxbindcmd)
         $(__wxrcedit___mac_rezcmd)
         $(__wxrcedit___mac_setfilecmd)
         $(__wxrcedit___os2_emxbindcmd)
diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in

index a42b05c51b36121bf1c2beb9b0fe67cbac5a6b81..db6637edc8ba2e71a2c4dabac7f3f2304f7575cf 100644 (file)
--- a/demos/bombs/Makefile.in
+++ b/demos/bombs/Makefile.in
@@ -59,6 +59,10 @@ BOMBS_OBJECTS =  \
  @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_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@__bombs___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C bombs$(EXEEXT)
  @COND_PLATFORM_MAC_1@__bombs___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__bombs___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C bombs$(EXEEXT)
  @COND_PLATFORM_MAC_1@__bombs___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -131,7 +135,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  bombs$(EXEEXT): $(BOMBS_OBJECTS) $(__bombs___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  bombs$(EXEEXT): $(BOMBS_OBJECTS) $(__bombs___win32rc)
-       $(CXX) -o $@ $(BOMBS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(BOMBS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__bombs___mac_rezcmd)
         $(__bombs___mac_setfilecmd)
         $(__bombs___os2_emxbindcmd)
         $(__bombs___mac_rezcmd)
         $(__bombs___mac_setfilecmd)
         $(__bombs___os2_emxbindcmd)
diff --git a/demos/dbbrowse/Makefile.in b/demos/dbbrowse/Makefile.in

index 43eab135fe3d811108eb2d3bfb24952c57582af3..415769e6b98400327a048f9dfdf1601ed7dbd8e2 100644 (file)
--- a/demos/dbbrowse/Makefile.in
+++ b/demos/dbbrowse/Makefile.in
@@ -68,6 +68,11 @@ DBBROWSE_OBJECTS =  \
  @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_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_USE_ODBC_1@__dbbrowse___depname = dbbrowse$(EXEEXT)
  @COND_PLATFORM_MAC_1@__dbbrowse___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C dbbrowse$(EXEEXT)
  @COND_PLATFORM_MAC_1@__dbbrowse___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__dbbrowse___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C dbbrowse$(EXEEXT)
  @COND_PLATFORM_MAC_1@__dbbrowse___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -135,7 +140,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
  
  ### Targets: ###
  
  
  ### Targets: ###
  
-all: dbbrowse$(EXEEXT) $(__dbbrowse_bundle___depname) data_help_std data_help_png
+all: $(__dbbrowse___depname) $(__dbbrowse_bundle___depname) data_help_std data_help_png
  
  install: all
  
  
  install: all
  
@@ -152,14 +157,14 @@ clean:
  distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
-dbbrowse$(EXEEXT): $(DBBROWSE_OBJECTS) $(__dbbrowse___win32rc)
-       $(CXX) -o $@ $(DBBROWSE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_DBGRID_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
-       $(__dbbrowse___mac_rezcmd)
-       $(__dbbrowse___mac_setfilecmd)
-       $(__dbbrowse___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
+@COND_USE_ODBC_1@dbbrowse$(EXEEXT): $(DBBROWSE_OBJECTS) $(__dbbrowse___win32rc)
+@COND_USE_ODBC_1@      $(CXX) -o $@ $(DBBROWSE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_DBGRID_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
+@COND_USE_ODBC_1@      $(__dbbrowse___mac_rezcmd)
+@COND_USE_ODBC_1@      $(__dbbrowse___mac_setfilecmd)
+@COND_USE_ODBC_1@      $(__dbbrowse___os2_emxbindcmd)
+@COND_USE_ODBC_1@      $(SAMPLES_RPATH_POSTLINK)
  
  
-dbbrowse.app/Contents/PkgInfo: dbbrowse$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+dbbrowse.app/Contents/PkgInfo: $(__dbbrowse___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
         mkdir -p dbbrowse.app/Contents
         mkdir -p dbbrowse.app/Contents/MacOS
         mkdir -p dbbrowse.app/Contents/Resources
         mkdir -p dbbrowse.app/Contents
         mkdir -p dbbrowse.app/Contents/MacOS
         mkdir -p dbbrowse.app/Contents/Resources
diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in

index d667e8eac50a7e1d5e19c24f4997303312329c45..da66d4c1900b20728970416085f263ef576516ce 100644 (file)
--- a/demos/forty/Makefile.in
+++ b/demos/forty/Makefile.in
@@ -67,6 +67,10 @@ FORTY_OBJECTS =  \
  @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_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@__forty___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C forty$(EXEEXT)
  @COND_PLATFORM_MAC_1@__forty___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__forty___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C forty$(EXEEXT)
  @COND_PLATFORM_MAC_1@__forty___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -145,7 +149,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc)
-       $(CXX) -o $@ $(FORTY_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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 $@ $(FORTY_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
         $(__forty___mac_rezcmd)
         $(__forty___mac_setfilecmd)
         $(__forty___os2_emxbindcmd)
         $(__forty___mac_rezcmd)
         $(__forty___mac_setfilecmd)
         $(__forty___os2_emxbindcmd)
diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in

index 71c147f46986035a0453ce84365e075a9287159e..f96333ab77a122c4ac7a7a4c6391cec2dcc27bd4 100644 (file)
--- a/demos/fractal/Makefile.in
+++ b/demos/fractal/Makefile.in
@@ -57,6 +57,10 @@ FRACTAL_OBJECTS =  \
  @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_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@__fractal___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C fractal$(EXEEXT)
  @COND_PLATFORM_MAC_1@__fractal___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__fractal___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C fractal$(EXEEXT)
  @COND_PLATFORM_MAC_1@__fractal___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc)
-       $(CXX) -o $@ $(FRACTAL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(FRACTAL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__fractal___mac_rezcmd)
         $(__fractal___mac_setfilecmd)
         $(__fractal___os2_emxbindcmd)
         $(__fractal___mac_rezcmd)
         $(__fractal___mac_setfilecmd)
         $(__fractal___os2_emxbindcmd)
diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in

index fc66ba6a6c393f58199b2fc0d072cbb8671305c5..e8a7a4bf2a295649d015bbb82fe3820caafa0e96 100644 (file)
--- a/demos/life/Makefile.in
+++ b/demos/life/Makefile.in
@@ -60,6 +60,10 @@ LIFE_OBJECTS =  \
  @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_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@__life___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C life$(EXEEXT)
  @COND_PLATFORM_MAC_1@__life___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__life___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C life$(EXEEXT)
  @COND_PLATFORM_MAC_1@__life___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -131,7 +135,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  life$(EXEEXT): $(LIFE_OBJECTS) $(__life___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  life$(EXEEXT): $(LIFE_OBJECTS) $(__life___win32rc)
-       $(CXX) -o $@ $(LIFE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(LIFE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__life___mac_rezcmd)
         $(__life___mac_setfilecmd)
         $(__life___os2_emxbindcmd)
         $(__life___mac_rezcmd)
         $(__life___mac_setfilecmd)
         $(__life___os2_emxbindcmd)
diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in

index b00b8886e91146dff24008f90bb683022841f403..b3a7b763786b5beed6c8fc343ee17844177f347a 100644 (file)
--- a/demos/poem/Makefile.in
+++ b/demos/poem/Makefile.in
@@ -58,6 +58,10 @@ WXPOEM_OBJECTS =  \
  @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_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@__wxpoem___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C wxpoem$(EXEEXT)
  @COND_PLATFORM_MAC_1@__wxpoem___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__wxpoem___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C wxpoem$(EXEEXT)
  @COND_PLATFORM_MAC_1@__wxpoem___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -134,7 +138,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  wxpoem$(EXEEXT): $(WXPOEM_OBJECTS) $(__wxpoem___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  wxpoem$(EXEEXT): $(WXPOEM_OBJECTS) $(__wxpoem___win32rc)
-       $(CXX) -o $@ $(WXPOEM_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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 $@ $(WXPOEM_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
         $(__wxpoem___mac_rezcmd)
         $(__wxpoem___mac_setfilecmd)
         $(__wxpoem___os2_emxbindcmd)
         $(__wxpoem___mac_rezcmd)
         $(__wxpoem___mac_setfilecmd)
         $(__wxpoem___os2_emxbindcmd)
diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in

index cf7f012819e49a7a4a1e8d6289e3a2d65ee2841f..04cda1cb58fa3d125b4e8ff26eb15c9ea1d4a996 100644 (file)
--- a/samples/access/Makefile.in
+++ b/samples/access/Makefile.in
@@ -57,6 +57,10 @@ ACCESSTEST_OBJECTS =  \
  @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_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@__accesstest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C accesstest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__accesstest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__accesstest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C accesstest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__accesstest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  accesstest$(EXEEXT): $(ACCESSTEST_OBJECTS) $(__accesstest___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  accesstest$(EXEEXT): $(ACCESSTEST_OBJECTS) $(__accesstest___win32rc)
-       $(CXX) -o $@ $(ACCESSTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(ACCESSTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__accesstest___mac_rezcmd)
         $(__accesstest___mac_setfilecmd)
         $(__accesstest___os2_emxbindcmd)
         $(__accesstest___mac_rezcmd)
         $(__accesstest___mac_setfilecmd)
         $(__accesstest___os2_emxbindcmd)
diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in

index a182421bd7223a4ac7c1abdc5ca99e8394cb6f6a..1e3e689440c91d333051cea9d1c10f413c9b46be 100644 (file)
--- a/samples/artprov/Makefile.in
+++ b/samples/artprov/Makefile.in
@@ -58,6 +58,10 @@ ARTTEST_OBJECTS =  \
  @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_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@__arttest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C arttest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__arttest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__arttest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C arttest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__arttest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -131,7 +135,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  arttest$(EXEEXT): $(ARTTEST_OBJECTS) $(__arttest___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  arttest$(EXEEXT): $(ARTTEST_OBJECTS) $(__arttest___win32rc)
-       $(CXX) -o $@ $(ARTTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(ARTTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__arttest___mac_rezcmd)
         $(__arttest___mac_setfilecmd)
         $(__arttest___os2_emxbindcmd)
         $(__arttest___mac_rezcmd)
         $(__arttest___mac_setfilecmd)
         $(__arttest___os2_emxbindcmd)
diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in

index e8b5ba2fd4d2b0d991d65eef7c4c29b2ddb5fceb..b00ac15450e34166d9ae51da4cadf07ef0d833d6 100644 (file)
--- a/samples/calendar/Makefile.in
+++ b/samples/calendar/Makefile.in
@@ -59,6 +59,10 @@ CALENDAR_OBJECTS =  \
  @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_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@__calendar___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C calendar$(EXEEXT)
  @COND_PLATFORM_MAC_1@__calendar___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__calendar___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C calendar$(EXEEXT)
  @COND_PLATFORM_MAC_1@__calendar___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -135,7 +139,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___win32rc)
-       $(CXX) -o $@ $(CALENDAR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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 $@ $(CALENDAR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
         $(__calendar___mac_rezcmd)
         $(__calendar___mac_setfilecmd)
         $(__calendar___os2_emxbindcmd)
         $(__calendar___mac_rezcmd)
         $(__calendar___mac_setfilecmd)
         $(__calendar___os2_emxbindcmd)
diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in

index 4ec2b6414228a2fa6d431283fa6c89465e5071b4..1abb4d41def0d775fc26d459b258446267a3a915 100644 (file)
--- a/samples/caret/Makefile.in
+++ b/samples/caret/Makefile.in
@@ -57,6 +57,10 @@ CARET_OBJECTS =  \
  @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_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@__caret___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C caret$(EXEEXT)
  @COND_PLATFORM_MAC_1@__caret___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__caret___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C caret$(EXEEXT)
  @COND_PLATFORM_MAC_1@__caret___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -129,7 +133,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  caret$(EXEEXT): $(CARET_OBJECTS) $(__caret___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  caret$(EXEEXT): $(CARET_OBJECTS) $(__caret___win32rc)
-       $(CXX) -o $@ $(CARET_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(CARET_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__caret___mac_rezcmd)
         $(__caret___mac_setfilecmd)
         $(__caret___os2_emxbindcmd)
         $(__caret___mac_rezcmd)
         $(__caret___mac_setfilecmd)
         $(__caret___os2_emxbindcmd)
diff --git a/samples/checklst/Makefile.in b/samples/checklst/Makefile.in

index bba16fa67784c01fd8b121e7ca96dc2e1ed4d263..78cf29cc00c3d4b8d6b42d97bcaaeb6259ff30be 100644 (file)
--- a/samples/checklst/Makefile.in
+++ b/samples/checklst/Makefile.in
@@ -57,6 +57,10 @@ CHECKLST_OBJECTS =  \
  @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_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@__checklst___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C checklst$(EXEEXT)
  @COND_PLATFORM_MAC_1@__checklst___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__checklst___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C checklst$(EXEEXT)
  @COND_PLATFORM_MAC_1@__checklst___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  checklst$(EXEEXT): $(CHECKLST_OBJECTS) $(__checklst___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  checklst$(EXEEXT): $(CHECKLST_OBJECTS) $(__checklst___win32rc)
-       $(CXX) -o $@ $(CHECKLST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(CHECKLST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__checklst___mac_rezcmd)
         $(__checklst___mac_setfilecmd)
         $(__checklst___os2_emxbindcmd)
         $(__checklst___mac_rezcmd)
         $(__checklst___mac_setfilecmd)
         $(__checklst___os2_emxbindcmd)
diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in

index c0090f47fafef196892047119808d3dfd2c9f5a8..b421769fbde13b32883e440d8208758f11ce11e8 100644 (file)
--- a/samples/config/Makefile.in
+++ b/samples/config/Makefile.in
@@ -57,6 +57,10 @@ CONFTEST_OBJECTS =  \
  @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_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@__conftest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C conftest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__conftest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__conftest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C conftest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__conftest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc)
-       $(CXX) -o $@ $(CONFTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(CONFTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__conftest___mac_rezcmd)
         $(__conftest___mac_setfilecmd)
         $(__conftest___os2_emxbindcmd)
         $(__conftest___mac_rezcmd)
         $(__conftest___mac_setfilecmd)
         $(__conftest___os2_emxbindcmd)
diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in

index a5909ad012307f8c6b2504190b9d5ac217b0ba41..d4a594598c3361d05accaa68ab4aa1ddfa10d46e 100644 (file)
--- a/samples/console/Makefile.in
+++ b/samples/console/Makefile.in
@@ -25,6 +25,7 @@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
  TOOLKIT_VERSION = @TOOLKIT_VERSION@
  EXTRALIBS = @EXTRALIBS@
  EXTRALIBS_ODBC = @EXTRALIBS_ODBC@
  TOOLKIT_VERSION = @TOOLKIT_VERSION@
  EXTRALIBS = @EXTRALIBS@
  EXTRALIBS_ODBC = @EXTRALIBS_ODBC@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
@@ -50,6 +51,8 @@ CONSOLE_OBJECTS =  \
  @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_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
  @COND_PLATFORM_MAC_1@__console___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL console$(EXEEXT)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
  @COND_PLATFORM_MAC_1@__console___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL console$(EXEEXT)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -104,9 +107,10 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  console$(EXEEXT): $(CONSOLE_OBJECTS)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  console$(EXEEXT): $(CONSOLE_OBJECTS)
-       $(CXX) -o $@ $(CONSOLE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(__WXLIB_NET_p)  $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__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)
+       $(CXX) -o $@ $(CONSOLE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(__WXLIB_NET_p)  $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__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)
         
         
-       $(__console___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK)
+       $(__console___mac_setfilecmd)
+       $(SAMPLES_RPATH_POSTLINK)
  
  data: 
         @mkdir -p .
  
  data: 
         @mkdir -p .
diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in

index 5ca853aa8f847c16686f716dc582a09c106ff14c..c5fe92508bc15488fde1ea3409bbcdac71e7a933 100644 (file)
--- a/samples/controls/Makefile.in
+++ b/samples/controls/Makefile.in
@@ -57,6 +57,10 @@ CONTROLS_OBJECTS =  \
  @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_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@__controls___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C controls$(EXEEXT)
  @COND_PLATFORM_MAC_1@__controls___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__controls___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C controls$(EXEEXT)
  @COND_PLATFORM_MAC_1@__controls___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  controls$(EXEEXT): $(CONTROLS_OBJECTS) $(__controls___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  controls$(EXEEXT): $(CONTROLS_OBJECTS) $(__controls___win32rc)
-       $(CXX) -o $@ $(CONTROLS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(CONTROLS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__controls___mac_rezcmd)
         $(__controls___mac_setfilecmd)
         $(__controls___os2_emxbindcmd)
         $(__controls___mac_rezcmd)
         $(__controls___mac_setfilecmd)
         $(__controls___os2_emxbindcmd)
diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in

index 049e1aff23a5e56bd2f2e244dbf35c8ba7fca43c..50dcc18a508a161ffedf54bcc1ec77b0cc15db4e 100644 (file)
--- a/samples/db/Makefile.in
+++ b/samples/db/Makefile.in
@@ -61,6 +61,10 @@ DBTEST_OBJECTS =  \
  @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_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_USE_ODBC_1@__dbtest___depname = dbtest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__dbtest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C dbtest$(EXEEXT)
  @COND_USE_ODBC_1@__dbtest___depname = dbtest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__dbtest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C dbtest$(EXEEXT)
@@ -144,7 +148,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_USE_ODBC_1@dbtest$(EXEEXT): $(DBTEST_OBJECTS) $(__dbtest___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_USE_ODBC_1@dbtest$(EXEEXT): $(DBTEST_OBJECTS) $(__dbtest___win32rc)
-@COND_USE_ODBC_1@      $(CXX) -o $@ $(DBTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_DBGRID_p)  $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
+@COND_USE_ODBC_1@      $(CXX) -o $@ $(DBTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_DBGRID_p)  $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
  @COND_USE_ODBC_1@      $(__dbtest___mac_rezcmd)
  @COND_USE_ODBC_1@      $(__dbtest___mac_setfilecmd)
  @COND_USE_ODBC_1@      $(__dbtest___os2_emxbindcmd)
  @COND_USE_ODBC_1@      $(__dbtest___mac_rezcmd)
  @COND_USE_ODBC_1@      $(__dbtest___mac_setfilecmd)
  @COND_USE_ODBC_1@      $(__dbtest___os2_emxbindcmd)
diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in

index acce526b733c16ad345c3de4c05693dcd53dcd33..d2b1a9a1d29c6ce84c6e7ff90a503175efdcf160 100644 (file)
--- a/samples/dialogs/Makefile.in
+++ b/samples/dialogs/Makefile.in
@@ -60,6 +60,10 @@ DIALOGS_OBJECTS =  \
  @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_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@__dialogs___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C dialogs$(EXEEXT)
  @COND_PLATFORM_MAC_1@__dialogs___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__dialogs___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C dialogs$(EXEEXT)
  @COND_PLATFORM_MAC_1@__dialogs___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -144,7 +148,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  dialogs$(EXEEXT): $(DIALOGS_OBJECTS) $(__dialogs___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  dialogs$(EXEEXT): $(DIALOGS_OBJECTS) $(__dialogs___win32rc)
-       $(CXX) -o $@ $(DIALOGS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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 $@ $(DIALOGS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
         $(__dialogs___mac_rezcmd)
         $(__dialogs___mac_setfilecmd)
         $(__dialogs___os2_emxbindcmd)
         $(__dialogs___mac_rezcmd)
         $(__dialogs___mac_setfilecmd)
         $(__dialogs___os2_emxbindcmd)
diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in

index fa817f44b17e5a23f5090133701ac3fc78369ea5..1661c328b1aaf5d2dff8ad2a7eb33a01af6c3759 100644 (file)
--- a/samples/dialup/Makefile.in
+++ b/samples/dialup/Makefile.in
@@ -57,6 +57,10 @@ NETTEST_OBJECTS =  \
  @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_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@__nettest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C nettest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__nettest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__nettest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C nettest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__nettest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc)
-       $(CXX) -o $@ $(NETTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(NETTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__nettest___mac_rezcmd)
         $(__nettest___mac_setfilecmd)
         $(__nettest___os2_emxbindcmd)
         $(__nettest___mac_rezcmd)
         $(__nettest___mac_setfilecmd)
         $(__nettest___os2_emxbindcmd)
diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in

index 3df3e3a84ec6ff7b1b89ee9bd8304fef042c8319..7cce3340af20a83547517106941acdf2bf4ecbb6 100644 (file)
--- a/samples/display/Makefile.in
+++ b/samples/display/Makefile.in
@@ -57,6 +57,10 @@ DISPLAY_OBJECTS =  \
  @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_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@__display___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C display$(EXEEXT)
  @COND_PLATFORM_MAC_1@__display___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__display___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C display$(EXEEXT)
  @COND_PLATFORM_MAC_1@__display___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  display$(EXEEXT): $(DISPLAY_OBJECTS) $(__display___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  display$(EXEEXT): $(DISPLAY_OBJECTS) $(__display___win32rc)
-       $(CXX) -o $@ $(DISPLAY_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(DISPLAY_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__display___mac_rezcmd)
         $(__display___mac_setfilecmd)
         $(__display___os2_emxbindcmd)
         $(__display___mac_rezcmd)
         $(__display___mac_setfilecmd)
         $(__display___os2_emxbindcmd)
diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in

index 931558bea8694ffeefa8c6c9e26d6c5c00936fd3..0341b7b650b1bc323e121821a1f82393b97b107d 100644 (file)
--- a/samples/dnd/Makefile.in
+++ b/samples/dnd/Makefile.in
@@ -57,6 +57,10 @@ DND_OBJECTS =  \
  @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_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@__dnd___mac_setfilecmd = $(SETFILE) -a C dnd$(EXEEXT)
  @COND_PLATFORM_MAC_1@__dnd___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
  @COND_PLATFORM_MAC_1@__dnd___mac_setfilecmd = $(SETFILE) -a C dnd$(EXEEXT)
  @COND_PLATFORM_MAC_1@__dnd___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -127,7 +131,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  dnd$(EXEEXT): $(DND_OBJECTS) $(__dnd___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  dnd$(EXEEXT): $(DND_OBJECTS) $(__dnd___win32rc)
-       $(CXX) -o $@ $(DND_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(DND_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__dnd___mac_rezcmd)
         $(__dnd___mac_setfilecmd)
         $(__dnd___os2_emxbindcmd)
         $(__dnd___mac_rezcmd)
         $(__dnd___mac_setfilecmd)
         $(__dnd___os2_emxbindcmd)
diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in

index 836fef9bbe257eaf0b3ea37e4195fee8b90e2982..6f9f226b49ee2c1d137c070ba1acc6861dce78e2 100644 (file)
--- a/samples/docview/Makefile.in
+++ b/samples/docview/Makefile.in
@@ -59,6 +59,10 @@ DOCVIEW_OBJECTS =  \
  @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_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_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r \
  @COND_TOOLKIT_MAC@     $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
  @COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = \
  @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r \
  @COND_TOOLKIT_MAC@     $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
  @COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = \
@@ -133,7 +137,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc)
-       $(CXX) -o $@ $(DOCVIEW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(DOCVIEW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__docview___mac_rezcmd)
         $(__docview___mac_setfilecmd)
         $(__docview___os2_emxbindcmd)
         $(__docview___mac_rezcmd)
         $(__docview___mac_setfilecmd)
         $(__docview___os2_emxbindcmd)
diff --git a/samples/docvwmdi/Makefile.in b/samples/docvwmdi/Makefile.in

index 7779a5fb13f4325cab3428f1d83cbf5d9836b8f4..a768c6fa6de452e953c2b8565c09165288920446 100644 (file)
--- a/samples/docvwmdi/Makefile.in
+++ b/samples/docvwmdi/Makefile.in
@@ -59,6 +59,10 @@ DOCVIEW_OBJECTS =  \
  @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_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@__docview___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C docview$(EXEEXT)
  @COND_PLATFORM_MAC_1@__docview___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C docview$(EXEEXT)
  @COND_PLATFORM_MAC_1@__docview___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -132,7 +136,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc)
-       $(CXX) -o $@ $(DOCVIEW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(DOCVIEW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__docview___mac_rezcmd)
         $(__docview___mac_setfilecmd)
         $(__docview___os2_emxbindcmd)
         $(__docview___mac_rezcmd)
         $(__docview___mac_setfilecmd)
         $(__docview___os2_emxbindcmd)
diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in

index dac1e264788efea4e9afe9623dcdef256ea6284f..6df614a271774367c94bcc8f6873b6b050aca3f7 100644 (file)
--- a/samples/dragimag/Makefile.in
+++ b/samples/dragimag/Makefile.in
@@ -57,6 +57,10 @@ DRAGIMAG_OBJECTS =  \
  @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_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@__dragimag___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C dragimag$(EXEEXT)
  @COND_PLATFORM_MAC_1@__dragimag___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__dragimag___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C dragimag$(EXEEXT)
  @COND_PLATFORM_MAC_1@__dragimag___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  dragimag$(EXEEXT): $(DRAGIMAG_OBJECTS) $(__dragimag___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  dragimag$(EXEEXT): $(DRAGIMAG_OBJECTS) $(__dragimag___win32rc)
-       $(CXX) -o $@ $(DRAGIMAG_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(DRAGIMAG_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__dragimag___mac_rezcmd)
         $(__dragimag___mac_setfilecmd)
         $(__dragimag___os2_emxbindcmd)
         $(__dragimag___mac_rezcmd)
         $(__dragimag___mac_setfilecmd)
         $(__dragimag___os2_emxbindcmd)
diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in

index 9dd1bab73768d7778d48ec7ee9dcaf158467304d..b37b0be983fcc7135ae0a990143f7b2414060ae9 100644 (file)
--- a/samples/drawing/Makefile.in
+++ b/samples/drawing/Makefile.in
@@ -57,6 +57,10 @@ DRAWING_OBJECTS =  \
  @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_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@__drawing___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C drawing$(EXEEXT)
  @COND_PLATFORM_MAC_1@__drawing___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__drawing___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C drawing$(EXEEXT)
  @COND_PLATFORM_MAC_1@__drawing___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  drawing$(EXEEXT): $(DRAWING_OBJECTS) $(__drawing___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  drawing$(EXEEXT): $(DRAWING_OBJECTS) $(__drawing___win32rc)
-       $(CXX) -o $@ $(DRAWING_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(DRAWING_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__drawing___mac_rezcmd)
         $(__drawing___mac_setfilecmd)
         $(__drawing___os2_emxbindcmd)
         $(__drawing___mac_rezcmd)
         $(__drawing___mac_setfilecmd)
         $(__drawing___os2_emxbindcmd)
diff --git a/samples/dynamic/Makefile.in b/samples/dynamic/Makefile.in

index 717dce385a6f811b7c832f360231bfe6211b9e2c..215842fd663faef8d81e84d12ab8a4849352c9cb 100644 (file)
--- a/samples/dynamic/Makefile.in
+++ b/samples/dynamic/Makefile.in
@@ -57,6 +57,10 @@ DYNAMIC_OBJECTS =  \
  @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_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@__dynamic___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C dynamic$(EXEEXT)
  @COND_PLATFORM_MAC_1@__dynamic___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__dynamic___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C dynamic$(EXEEXT)
  @COND_PLATFORM_MAC_1@__dynamic___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  dynamic$(EXEEXT): $(DYNAMIC_OBJECTS) $(__dynamic___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  dynamic$(EXEEXT): $(DYNAMIC_OBJECTS) $(__dynamic___win32rc)
-       $(CXX) -o $@ $(DYNAMIC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(DYNAMIC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__dynamic___mac_rezcmd)
         $(__dynamic___mac_setfilecmd)
         $(__dynamic___os2_emxbindcmd)
         $(__dynamic___mac_rezcmd)
         $(__dynamic___mac_setfilecmd)
         $(__dynamic___os2_emxbindcmd)
diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in

index c24f8efbfb595039210d5cddd784cd75ee967f33..14bf3e4f4ab855b2c03aabbf0d0d3ba396d2ef8d 100644 (file)
--- a/samples/erase/Makefile.in
+++ b/samples/erase/Makefile.in
@@ -57,6 +57,10 @@ ERASE_OBJECTS =  \
  @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_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@__erase___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C erase$(EXEEXT)
  @COND_PLATFORM_MAC_1@__erase___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__erase___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C erase$(EXEEXT)
  @COND_PLATFORM_MAC_1@__erase___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -129,7 +133,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  erase$(EXEEXT): $(ERASE_OBJECTS) $(__erase___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  erase$(EXEEXT): $(ERASE_OBJECTS) $(__erase___win32rc)
-       $(CXX) -o $@ $(ERASE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(ERASE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__erase___mac_rezcmd)
         $(__erase___mac_setfilecmd)
         $(__erase___os2_emxbindcmd)
         $(__erase___mac_rezcmd)
         $(__erase___mac_setfilecmd)
         $(__erase___os2_emxbindcmd)
diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in

index 7c93b40ba95c2a46319cfd473dd8c1f78ea88caa..828ea19f2f58d890a790f508a17a311d671b0d90 100644 (file)
--- a/samples/event/Makefile.in
+++ b/samples/event/Makefile.in
@@ -57,6 +57,10 @@ EVENT_OBJECTS =  \
  @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_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@__event___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C event$(EXEEXT)
  @COND_PLATFORM_MAC_1@__event___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__event___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C event$(EXEEXT)
  @COND_PLATFORM_MAC_1@__event___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -129,7 +133,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  event$(EXEEXT): $(EVENT_OBJECTS) $(__event___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  event$(EXEEXT): $(EVENT_OBJECTS) $(__event___win32rc)
-       $(CXX) -o $@ $(EVENT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(EVENT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__event___mac_rezcmd)
         $(__event___mac_setfilecmd)
         $(__event___os2_emxbindcmd)
         $(__event___mac_rezcmd)
         $(__event___mac_setfilecmd)
         $(__event___os2_emxbindcmd)
diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in

index 7aaae12a3f2bf60c545e2d4ecd138a582f7abe02..3dd8afdaae7e0dcd408fb82620e4ee45eb0b271f 100644 (file)
--- a/samples/except/Makefile.in
+++ b/samples/except/Makefile.in
@@ -57,6 +57,10 @@ EXCEPT_OBJECTS =  \
  @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_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@__except___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C except$(EXEEXT)
  @COND_PLATFORM_MAC_1@__except___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__except___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C except$(EXEEXT)
  @COND_PLATFORM_MAC_1@__except___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  except$(EXEEXT): $(EXCEPT_OBJECTS) $(__except___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  except$(EXEEXT): $(EXCEPT_OBJECTS) $(__except___win32rc)
-       $(CXX) -o $@ $(EXCEPT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(EXCEPT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__except___mac_rezcmd)
         $(__except___mac_setfilecmd)
         $(__except___os2_emxbindcmd)
         $(__except___mac_rezcmd)
         $(__except___mac_setfilecmd)
         $(__except___os2_emxbindcmd)
diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in

index b9230d06beeb8d468bf0d22930223c6269b2620e..2e055a6a4c6f05eeb578275c0dc1c406fbce82fc 100644 (file)
--- a/samples/exec/Makefile.in
+++ b/samples/exec/Makefile.in
@@ -57,6 +57,10 @@ EXEC_OBJECTS =  \
  @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_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@__exec___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C exec$(EXEEXT)
  @COND_PLATFORM_MAC_1@__exec___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__exec___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C exec$(EXEEXT)
  @COND_PLATFORM_MAC_1@__exec___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -128,7 +132,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc)
-       $(CXX) -o $@ $(EXEC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(EXEC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__exec___mac_rezcmd)
         $(__exec___mac_setfilecmd)
         $(__exec___os2_emxbindcmd)
         $(__exec___mac_rezcmd)
         $(__exec___mac_setfilecmd)
         $(__exec___os2_emxbindcmd)
diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in

index 1383c389a22f7fdf6da4ba2d4a77dd639979fe01..8552141cfd67cc14f7b7c2070fecc112b69bdf9d 100644 (file)
--- a/samples/font/Makefile.in
+++ b/samples/font/Makefile.in
@@ -57,6 +57,10 @@ FONT_OBJECTS =  \
  @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_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@__font___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C font$(EXEEXT)
  @COND_PLATFORM_MAC_1@__font___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__font___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C font$(EXEEXT)
  @COND_PLATFORM_MAC_1@__font___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -128,7 +132,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  font$(EXEEXT): $(FONT_OBJECTS) $(__font___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  font$(EXEEXT): $(FONT_OBJECTS) $(__font___win32rc)
-       $(CXX) -o $@ $(FONT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(FONT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__font___mac_rezcmd)
         $(__font___mac_setfilecmd)
         $(__font___os2_emxbindcmd)
         $(__font___mac_rezcmd)
         $(__font___mac_setfilecmd)
         $(__font___os2_emxbindcmd)
diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in

index 1285eedcd9c5b1ed25e1a1e2036f6733270c4ea3..428e9e69c0f3e4cb805009f0f6ef88f2bd4133d0 100644 (file)
--- a/samples/grid/Makefile.in
+++ b/samples/grid/Makefile.in
@@ -59,6 +59,10 @@ GRID_OBJECTS =  \
  @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_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@__grid___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C grid$(EXEEXT)
  @COND_PLATFORM_MAC_1@__grid___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__grid___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C grid$(EXEEXT)
  @COND_PLATFORM_MAC_1@__grid___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -133,7 +137,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc)
-       $(CXX) -o $@ $(GRID_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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 $@ $(GRID_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
         $(__grid___mac_rezcmd)
         $(__grid___mac_setfilecmd)
         $(__grid___os2_emxbindcmd)
         $(__grid___mac_rezcmd)
         $(__grid___mac_setfilecmd)
         $(__grid___os2_emxbindcmd)
diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in

index faf8da27dbb17850e8a654bb58f3d6cedb2e733d..2497bfcf6fc7784b422105a74694ab9c5ff511ec 100644 (file)
--- a/samples/help/Makefile.in
+++ b/samples/help/Makefile.in
@@ -58,6 +58,10 @@ HELP_OBJECTS =  \
  @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_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@__help___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C help$(EXEEXT)
  @COND_PLATFORM_MAC_1@__help___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__help___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C help$(EXEEXT)
  @COND_PLATFORM_MAC_1@__help___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -132,7 +136,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc)
-       $(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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 $@ $(HELP_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
         $(__help___mac_rezcmd)
         $(__help___mac_setfilecmd)
         $(__help___os2_emxbindcmd)
         $(__help___mac_rezcmd)
         $(__help___mac_setfilecmd)
         $(__help___os2_emxbindcmd)
diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in

index 3f37d66159adb6f776704d51983446776c1d695b..b9fccf1865261c29184b300c292358744fe5dc27 100644 (file)
--- a/samples/htlbox/Makefile.in
+++ b/samples/htlbox/Makefile.in
@@ -58,6 +58,10 @@ HTLBOX_OBJECTS =  \
  @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_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@__htlbox___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C htlbox$(EXEEXT)
  @COND_PLATFORM_MAC_1@__htlbox___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__htlbox___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C htlbox$(EXEEXT)
  @COND_PLATFORM_MAC_1@__htlbox___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -134,7 +138,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc)
-       $(CXX) -o $@ $(HTLBOX_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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 $@ $(HTLBOX_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
         $(__htlbox___mac_rezcmd)
         $(__htlbox___mac_setfilecmd)
         $(__htlbox___os2_emxbindcmd)
         $(__htlbox___mac_rezcmd)
         $(__htlbox___mac_setfilecmd)
         $(__htlbox___os2_emxbindcmd)
diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in

index a4da648fc6ee185fce28b4122ab064d109960e60..4b340ebaaa51c3fdd617e0e7ca026c484ce247d8 100644 (file)
--- a/samples/html/about/Makefile.in
+++ b/samples/html/about/Makefile.in
@@ -58,6 +58,10 @@ ABOUT_OBJECTS =  \
  @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_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@__about___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C about$(EXEEXT)
  @COND_PLATFORM_MAC_1@__about___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__about___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C about$(EXEEXT)
  @COND_PLATFORM_MAC_1@__about___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -133,7 +137,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc)
-       $(CXX) -o $@ $(ABOUT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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 $@ $(ABOUT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
         $(__about___mac_rezcmd)
         $(__about___mac_setfilecmd)
         $(__about___os2_emxbindcmd)
         $(__about___mac_rezcmd)
         $(__about___mac_setfilecmd)
         $(__about___os2_emxbindcmd)
diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in

index 7fa5b67572a41b0d0bae0707276b22f980cb0dcc..de3e4248c79099f1ddc85f7a866a62192dd9a604 100644 (file)
--- a/samples/html/help/Makefile.in
+++ b/samples/html/help/Makefile.in
@@ -58,6 +58,10 @@ HELP_OBJECTS =  \
  @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_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@__help___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C help$(EXEEXT)
  @COND_PLATFORM_MAC_1@__help___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__help___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C help$(EXEEXT)
  @COND_PLATFORM_MAC_1@__help___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -132,7 +136,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc)
-       $(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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 $@ $(HELP_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
         $(__help___mac_rezcmd)
         $(__help___mac_setfilecmd)
         $(__help___os2_emxbindcmd)
         $(__help___mac_rezcmd)
         $(__help___mac_setfilecmd)
         $(__help___os2_emxbindcmd)
diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in

index fc52509aef5725e11e19dcf10047394483d614e7..17a5a806e567cbbcfaa67811e6fad961a890871d 100644 (file)
--- a/samples/html/helpview/Makefile.in
+++ b/samples/html/helpview/Makefile.in
@@ -58,6 +58,10 @@ HELPVIEW_OBJECTS =  \
  @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_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@__helpview___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C helpview$(EXEEXT)
  @COND_PLATFORM_MAC_1@__helpview___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__helpview___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C helpview$(EXEEXT)
  @COND_PLATFORM_MAC_1@__helpview___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -134,7 +138,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
-       $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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 $@ $(HELPVIEW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
         $(__helpview___mac_rezcmd)
         $(__helpview___mac_setfilecmd)
         $(__helpview___os2_emxbindcmd)
         $(__helpview___mac_rezcmd)
         $(__helpview___mac_setfilecmd)
         $(__helpview___os2_emxbindcmd)
diff --git a/samples/html/htmlctrl/Makefile.in b/samples/html/htmlctrl/Makefile.in

index ce909a081cb403c40b3d5e81b1131c94be5af3ef..a22ec146b6e66b03a2b88a443c2ecc5c3acf23f9 100644 (file)
--- a/samples/html/htmlctrl/Makefile.in
+++ b/samples/html/htmlctrl/Makefile.in
@@ -57,6 +57,10 @@ HTMLCTRL_OBJECTS =  \
  @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_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@__htmlctrl___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C htmlctrl$(EXEEXT)
  @COND_PLATFORM_MAC_1@__htmlctrl___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__htmlctrl___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C htmlctrl$(EXEEXT)
  @COND_PLATFORM_MAC_1@__htmlctrl___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  htmlctrl$(EXEEXT): $(HTMLCTRL_OBJECTS) $(__htmlctrl___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  htmlctrl$(EXEEXT): $(HTMLCTRL_OBJECTS) $(__htmlctrl___win32rc)
-       $(CXX) -o $@ $(HTMLCTRL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(HTMLCTRL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__htmlctrl___mac_rezcmd)
         $(__htmlctrl___mac_setfilecmd)
         $(__htmlctrl___os2_emxbindcmd)
         $(__htmlctrl___mac_rezcmd)
         $(__htmlctrl___mac_setfilecmd)
         $(__htmlctrl___os2_emxbindcmd)
diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in

index 7d95b0f3a5b3c09eec537e281f445e625fbd27c0..1f49b4ecfca63fa8bb92107e21b858f1a2ceb363 100644 (file)
--- a/samples/html/printing/Makefile.in
+++ b/samples/html/printing/Makefile.in
@@ -58,6 +58,10 @@ PRINTING_OBJECTS =  \
  @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_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@__printing___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C printing$(EXEEXT)
  @COND_PLATFORM_MAC_1@__printing___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__printing___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C printing$(EXEEXT)
  @COND_PLATFORM_MAC_1@__printing___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -134,7 +138,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc)
-       $(CXX) -o $@ $(PRINTING_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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 $@ $(PRINTING_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
         $(__printing___mac_rezcmd)
         $(__printing___mac_setfilecmd)
         $(__printing___os2_emxbindcmd)
         $(__printing___mac_rezcmd)
         $(__printing___mac_setfilecmd)
         $(__printing___os2_emxbindcmd)
diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in

index 1aaa7e2131c2f29e01fa2153232ef03578cc801a..bc20baaeb2015a240ad82413802899e22f86c4b4 100644 (file)
--- a/samples/html/test/Makefile.in
+++ b/samples/html/test/Makefile.in
@@ -58,6 +58,10 @@ TEST_OBJECTS =  \
  @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_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@__test___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C test$(EXEEXT)
  @COND_PLATFORM_MAC_1@__test___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__test___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C test$(EXEEXT)
  @COND_PLATFORM_MAC_1@__test___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -135,7 +139,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
-       $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_NET_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 $@ $(TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_NET_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)
         $(__test___mac_rezcmd)
         $(__test___mac_setfilecmd)
         $(__test___os2_emxbindcmd)
         $(__test___mac_rezcmd)
         $(__test___mac_setfilecmd)
         $(__test___os2_emxbindcmd)
diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in

index 367ca6e79aa3f04ee3ac798e91c0f07024adcac4..a4b5b51c091862ca2b8cab42832408d99043c822 100644 (file)
--- a/samples/html/virtual/Makefile.in
+++ b/samples/html/virtual/Makefile.in
@@ -58,6 +58,10 @@ VIRTUAL_OBJECTS =  \
  @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_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@__virtual___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C virtual$(EXEEXT)
  @COND_PLATFORM_MAC_1@__virtual___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__virtual___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C virtual$(EXEEXT)
  @COND_PLATFORM_MAC_1@__virtual___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -134,7 +138,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc)
-       $(CXX) -o $@ $(VIRTUAL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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 $@ $(VIRTUAL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
         $(__virtual___mac_rezcmd)
         $(__virtual___mac_setfilecmd)
         $(__virtual___os2_emxbindcmd)
         $(__virtual___mac_rezcmd)
         $(__virtual___mac_setfilecmd)
         $(__virtual___os2_emxbindcmd)
diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in

index aad216c5246b8709c83959d841a2c9e285e186a0..b2ac2e4db259a49dc50e2dc8a5d24d854d0b6c28 100644 (file)
--- a/samples/html/widget/Makefile.in
+++ b/samples/html/widget/Makefile.in
@@ -58,6 +58,10 @@ WIDGET_OBJECTS =  \
  @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_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@__widget___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C widget$(EXEEXT)
  @COND_PLATFORM_MAC_1@__widget___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__widget___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C widget$(EXEEXT)
  @COND_PLATFORM_MAC_1@__widget___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -134,7 +138,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc)
-       $(CXX) -o $@ $(WIDGET_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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 $@ $(WIDGET_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
         $(__widget___mac_rezcmd)
         $(__widget___mac_setfilecmd)
         $(__widget___os2_emxbindcmd)
         $(__widget___mac_rezcmd)
         $(__widget___mac_setfilecmd)
         $(__widget___os2_emxbindcmd)
diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in

index 39f8041aa4271b91186a6eadb79907a519cd3865..150834dc4f85cf6b5d536e29096636ccec404264 100644 (file)
--- a/samples/html/zip/Makefile.in
+++ b/samples/html/zip/Makefile.in
@@ -58,6 +58,10 @@ ZIP_OBJECTS =  \
  @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_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@__zip___mac_setfilecmd = $(SETFILE) -a C zip$(EXEEXT)
  @COND_PLATFORM_MAC_1@__zip___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
  @COND_PLATFORM_MAC_1@__zip___mac_setfilecmd = $(SETFILE) -a C zip$(EXEEXT)
  @COND_PLATFORM_MAC_1@__zip___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -131,7 +135,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc)
-       $(CXX) -o $@ $(ZIP_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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 $@ $(ZIP_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
         $(__zip___mac_rezcmd)
         $(__zip___mac_setfilecmd)
         $(__zip___os2_emxbindcmd)
         $(__zip___mac_rezcmd)
         $(__zip___mac_setfilecmd)
         $(__zip___os2_emxbindcmd)
diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in

index 55931cab5093fc98dafe2ac3ea6ad8918fc70b8f..bac3b58afc040061d20ff6d3b26b8cd27e660bcc 100644 (file)
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -57,6 +57,10 @@ IMAGE_OBJECTS =  \
  @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_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@__image___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C image$(EXEEXT)
  @COND_PLATFORM_MAC_1@__image___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__image___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C image$(EXEEXT)
  @COND_PLATFORM_MAC_1@__image___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -129,7 +133,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc)
-       $(CXX) -o $@ $(IMAGE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(IMAGE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__image___mac_rezcmd)
         $(__image___mac_setfilecmd)
         $(__image___os2_emxbindcmd)
         $(__image___mac_rezcmd)
         $(__image___mac_setfilecmd)
         $(__image___os2_emxbindcmd)
diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in

index ab59e0158808f99c6d6fedd1f547920dd03e4c28..c79c637725fd4ffcc008c43b24f7ad4155c79328 100644 (file)
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@@ -57,6 +57,10 @@ INTERNAT_OBJECTS =  \
  @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_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@__internat___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C internat$(EXEEXT)
  @COND_PLATFORM_MAC_1@__internat___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__internat___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C internat$(EXEEXT)
  @COND_PLATFORM_MAC_1@__internat___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc)
-       $(CXX) -o $@ $(INTERNAT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(INTERNAT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__internat___mac_rezcmd)
         $(__internat___mac_setfilecmd)
         $(__internat___os2_emxbindcmd)
         $(__internat___mac_rezcmd)
         $(__internat___mac_setfilecmd)
         $(__internat___os2_emxbindcmd)
diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in

index 872aa27d7b23d983319add41b12873c6eb1ecc44..e2189b0b074dc709c1d58a7e136e303810e2ec6d 100644 (file)
--- a/samples/ipc/Makefile.in
+++ b/samples/ipc/Makefile.in
@@ -63,6 +63,10 @@ SERVER_OBJECTS =  \
  @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_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@__client___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C client$(EXEEXT)
  @COND_PLATFORM_MAC_1@__client___mac_rezcmd = $(__MACOSX_RESOURCES_p_2)
  @COND_PLATFORM_MAC_1@__client___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C client$(EXEEXT)
  @COND_PLATFORM_MAC_1@__client___mac_rezcmd = $(__MACOSX_RESOURCES_p_2)
@@ -157,7 +161,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc)
-       $(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_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 $@ $(CLIENT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_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)
         $(__client___mac_rezcmd)
         $(__client___mac_setfilecmd)
         $(__client___os2_emxbindcmd)
         $(__client___mac_rezcmd)
         $(__client___mac_setfilecmd)
         $(__client___os2_emxbindcmd)
@@ -187,7 +191,7 @@ client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
  @COND_PLATFORM_MACOSX_1@client_bundle: $(____client_BUNDLE_TGT_REF_DEP)
  
  server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc)
  @COND_PLATFORM_MACOSX_1@client_bundle: $(____client_BUNDLE_TGT_REF_DEP)
  
  server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc)
-       $(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_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 $@ $(SERVER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_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)
         $(__server___mac_rezcmd)
         $(__server___mac_setfilecmd)
         $(__server___os2_emxbindcmd)
         $(__server___mac_rezcmd)
         $(__server___mac_setfilecmd)
         $(__server___os2_emxbindcmd)
diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in

index bc310a530ba25848f274f6185bfeee6c57512fc4..86c6da976f0bc6e3986d50ebcb598abe6d0d6865 100644 (file)
--- a/samples/joytest/Makefile.in
+++ b/samples/joytest/Makefile.in
@@ -59,6 +59,10 @@ JOYTEST_OBJECTS =  \
  @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_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@__joytest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C joytest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__joytest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__joytest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C joytest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__joytest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -135,7 +139,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc)
-       $(CXX) -o $@ $(JOYTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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 $@ $(JOYTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
         $(__joytest___mac_rezcmd)
         $(__joytest___mac_setfilecmd)
         $(__joytest___os2_emxbindcmd)
         $(__joytest___mac_rezcmd)
         $(__joytest___mac_setfilecmd)
         $(__joytest___os2_emxbindcmd)
diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in

index 9be1a2ede74e0a51c99601dbfb4b654b1978df84..9dc4c9461099a9d53bc05928b117b87bc1a385e1 100644 (file)
--- a/samples/keyboard/Makefile.in
+++ b/samples/keyboard/Makefile.in
@@ -57,6 +57,10 @@ KEYBOARD_OBJECTS =  \
  @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_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@__keyboard___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C keyboard$(EXEEXT)
  @COND_PLATFORM_MAC_1@__keyboard___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__keyboard___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C keyboard$(EXEEXT)
  @COND_PLATFORM_MAC_1@__keyboard___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc)
-       $(CXX) -o $@ $(KEYBOARD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(KEYBOARD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__keyboard___mac_rezcmd)
         $(__keyboard___mac_setfilecmd)
         $(__keyboard___os2_emxbindcmd)
         $(__keyboard___mac_rezcmd)
         $(__keyboard___mac_setfilecmd)
         $(__keyboard___os2_emxbindcmd)
diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in

index c441baac101d1f432df9e89038dcc4c5c50461d6..d01b7a95a3d0ed7870d2eb55a244a7c759bdb999 100644 (file)
--- a/samples/layout/Makefile.in
+++ b/samples/layout/Makefile.in
@@ -57,6 +57,10 @@ LAYOUT_OBJECTS =  \
  @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_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@__layout___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C layout$(EXEEXT)
  @COND_PLATFORM_MAC_1@__layout___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__layout___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C layout$(EXEEXT)
  @COND_PLATFORM_MAC_1@__layout___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc)
-       $(CXX) -o $@ $(LAYOUT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(LAYOUT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__layout___mac_rezcmd)
         $(__layout___mac_setfilecmd)
         $(__layout___os2_emxbindcmd)
         $(__layout___mac_rezcmd)
         $(__layout___mac_setfilecmd)
         $(__layout___os2_emxbindcmd)
diff --git a/samples/listbox/Makefile.in b/samples/listbox/Makefile.in

index 2d44827f7b0f4542c104aa84eb62e141df2968d8..8b9cb074e9f8ffb9287180b117af9f7820798b35 100644 (file)
--- a/samples/listbox/Makefile.in
+++ b/samples/listbox/Makefile.in
@@ -57,6 +57,10 @@ LISTBOX_OBJECTS =  \
  @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_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@__listbox___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C listbox$(EXEEXT)
  @COND_PLATFORM_MAC_1@__listbox___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__listbox___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C listbox$(EXEEXT)
  @COND_PLATFORM_MAC_1@__listbox___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  listbox$(EXEEXT): $(LISTBOX_OBJECTS) $(__listbox___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  listbox$(EXEEXT): $(LISTBOX_OBJECTS) $(__listbox___win32rc)
-       $(CXX) -o $@ $(LISTBOX_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(LISTBOX_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__listbox___mac_rezcmd)
         $(__listbox___mac_setfilecmd)
         $(__listbox___os2_emxbindcmd)
         $(__listbox___mac_rezcmd)
         $(__listbox___mac_setfilecmd)
         $(__listbox___os2_emxbindcmd)
diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in

index a046b62dae029122050e5bce52794c520e86b48c..9e9009ddc94189d56c26b7d534fdc270359d698b 100644 (file)
--- a/samples/listctrl/Makefile.in
+++ b/samples/listctrl/Makefile.in
@@ -57,6 +57,10 @@ LISTCTRL_OBJECTS =  \
  @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_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@__listctrl___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C listctrl$(EXEEXT)
  @COND_PLATFORM_MAC_1@__listctrl___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__listctrl___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C listctrl$(EXEEXT)
  @COND_PLATFORM_MAC_1@__listctrl___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  listctrl$(EXEEXT): $(LISTCTRL_OBJECTS) $(__listctrl___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  listctrl$(EXEEXT): $(LISTCTRL_OBJECTS) $(__listctrl___win32rc)
-       $(CXX) -o $@ $(LISTCTRL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(LISTCTRL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__listctrl___mac_rezcmd)
         $(__listctrl___mac_setfilecmd)
         $(__listctrl___os2_emxbindcmd)
         $(__listctrl___mac_rezcmd)
         $(__listctrl___mac_setfilecmd)
         $(__listctrl___os2_emxbindcmd)
diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in

index da256ec6b102c81624a4487715580ea384d0399e..2a57cfcd01ea83a529fa4ee9dfd14300e3da929d 100644 (file)
--- a/samples/mdi/Makefile.in
+++ b/samples/mdi/Makefile.in
@@ -57,6 +57,10 @@ MDI_OBJECTS =  \
  @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_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@__mdi___mac_setfilecmd = $(SETFILE) -a C mdi$(EXEEXT)
  @COND_PLATFORM_MAC_1@__mdi___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
  @COND_PLATFORM_MAC_1@__mdi___mac_setfilecmd = $(SETFILE) -a C mdi$(EXEEXT)
  @COND_PLATFORM_MAC_1@__mdi___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -127,7 +131,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  mdi$(EXEEXT): $(MDI_OBJECTS) $(__mdi___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  mdi$(EXEEXT): $(MDI_OBJECTS) $(__mdi___win32rc)
-       $(CXX) -o $@ $(MDI_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(MDI_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__mdi___mac_rezcmd)
         $(__mdi___mac_setfilecmd)
         $(__mdi___os2_emxbindcmd)
         $(__mdi___mac_rezcmd)
         $(__mdi___mac_setfilecmd)
         $(__mdi___os2_emxbindcmd)
diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in

index 2db37c973f9b6f9589dd01c116a00e2aa0d76960..18f5e3c661270d7575ffaea7c971a71587888662 100644 (file)
--- a/samples/memcheck/Makefile.in
+++ b/samples/memcheck/Makefile.in
@@ -57,6 +57,10 @@ MEMCHECK_OBJECTS =  \
  @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_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@__memcheck___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C memcheck$(EXEEXT)
  @COND_PLATFORM_MAC_1@__memcheck___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__memcheck___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C memcheck$(EXEEXT)
  @COND_PLATFORM_MAC_1@__memcheck___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  memcheck$(EXEEXT): $(MEMCHECK_OBJECTS) $(__memcheck___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  memcheck$(EXEEXT): $(MEMCHECK_OBJECTS) $(__memcheck___win32rc)
-       $(CXX) -o $@ $(MEMCHECK_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(MEMCHECK_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__memcheck___mac_rezcmd)
         $(__memcheck___mac_setfilecmd)
         $(__memcheck___os2_emxbindcmd)
         $(__memcheck___mac_rezcmd)
         $(__memcheck___mac_setfilecmd)
         $(__memcheck___os2_emxbindcmd)
diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in

index a51c92e6de02e588240e5bc36803488723e7907f..db4db9b7a6e331de476d225bf5de1eaaa4bb1987 100644 (file)
--- a/samples/menu/Makefile.in
+++ b/samples/menu/Makefile.in
@@ -57,6 +57,10 @@ MENU_OBJECTS =  \
  @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_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@__menu___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C menu$(EXEEXT)
  @COND_PLATFORM_MAC_1@__menu___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__menu___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C menu$(EXEEXT)
  @COND_PLATFORM_MAC_1@__menu___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -128,7 +132,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc)
-       $(CXX) -o $@ $(MENU_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(MENU_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__menu___mac_rezcmd)
         $(__menu___mac_setfilecmd)
         $(__menu___os2_emxbindcmd)
         $(__menu___mac_rezcmd)
         $(__menu___mac_setfilecmd)
         $(__menu___os2_emxbindcmd)
diff --git a/samples/mfc/Makefile.in b/samples/mfc/Makefile.in

index 0b23dc07395eb67aeae3092b110241fe9c31322b..f93f9eeaf3019e8b1a3fb032c8f0613e04ac2acf 100644 (file)
--- a/samples/mfc/Makefile.in
+++ b/samples/mfc/Makefile.in
@@ -57,6 +57,10 @@ MFCTEST_OBJECTS =  \
  @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_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@__mfctest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C mfctest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__mfctest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__mfctest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C mfctest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__mfctest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  mfctest$(EXEEXT): $(MFCTEST_OBJECTS) $(__mfctest___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  mfctest$(EXEEXT): $(MFCTEST_OBJECTS) $(__mfctest___win32rc)
-       $(CXX) -o $@ $(MFCTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(MFCTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__mfctest___mac_rezcmd)
         $(__mfctest___mac_setfilecmd)
         $(__mfctest___os2_emxbindcmd)
         $(__mfctest___mac_rezcmd)
         $(__mfctest___mac_setfilecmd)
         $(__mfctest___os2_emxbindcmd)
diff --git a/samples/minifram/Makefile.in b/samples/minifram/Makefile.in

index b14923caf13e8fb511d561436788050e3e7a8faa..60a650f8da359331a4c04b3d6c1a2c9bcdec5ef2 100644 (file)
--- a/samples/minifram/Makefile.in
+++ b/samples/minifram/Makefile.in
@@ -57,6 +57,10 @@ MINIFRAM_OBJECTS =  \
  @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_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@__minifram___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C minifram$(EXEEXT)
  @COND_PLATFORM_MAC_1@__minifram___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__minifram___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C minifram$(EXEEXT)
  @COND_PLATFORM_MAC_1@__minifram___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  minifram$(EXEEXT): $(MINIFRAM_OBJECTS) $(__minifram___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  minifram$(EXEEXT): $(MINIFRAM_OBJECTS) $(__minifram___win32rc)
-       $(CXX) -o $@ $(MINIFRAM_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(MINIFRAM_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__minifram___mac_rezcmd)
         $(__minifram___mac_setfilecmd)
         $(__minifram___os2_emxbindcmd)
         $(__minifram___mac_rezcmd)
         $(__minifram___mac_setfilecmd)
         $(__minifram___os2_emxbindcmd)
diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in

index d78eb7c04a4bd6e4f3831d6aac92e59b9af0efa6..918aea4eebfd40ea2a4e2ae437b78efbd9f809a7 100644 (file)
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -57,6 +57,10 @@ MINIMAL_OBJECTS =  \
  @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_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@__minimal___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C minimal$(EXEEXT)
  @COND_PLATFORM_MAC_1@__minimal___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__minimal___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C minimal$(EXEEXT)
  @COND_PLATFORM_MAC_1@__minimal___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc)
-       $(CXX) -o $@ $(MINIMAL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(MINIMAL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__minimal___mac_rezcmd)
         $(__minimal___mac_setfilecmd)
         $(__minimal___os2_emxbindcmd)
         $(__minimal___mac_rezcmd)
         $(__minimal___mac_setfilecmd)
         $(__minimal___os2_emxbindcmd)
diff --git a/samples/mobile/styles/Makefile.in b/samples/mobile/styles/Makefile.in

index 6b4d27cbe0719492aa0d3f2671eb9f91fc7a8fee..48d5ab5b01ba8a489f4f96bdaa927615099d5bb5 100644 (file)
--- a/samples/mobile/styles/Makefile.in
+++ b/samples/mobile/styles/Makefile.in
@@ -57,6 +57,10 @@ STYLES_OBJECTS =  \
  @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_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@__styles___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C styles$(EXEEXT)
  @COND_PLATFORM_MAC_1@__styles___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__styles___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C styles$(EXEEXT)
  @COND_PLATFORM_MAC_1@__styles___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  styles$(EXEEXT): $(STYLES_OBJECTS) $(__styles___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  styles$(EXEEXT): $(STYLES_OBJECTS) $(__styles___win32rc)
-       $(CXX) -o $@ $(STYLES_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(STYLES_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__styles___mac_rezcmd)
         $(__styles___mac_setfilecmd)
         $(__styles___os2_emxbindcmd)
         $(__styles___mac_rezcmd)
         $(__styles___mac_setfilecmd)
         $(__styles___os2_emxbindcmd)
diff --git a/samples/mobile/wxedit/Makefile.in b/samples/mobile/wxedit/Makefile.in

index 870754d37cd3dd27e81b5b3e493a6d0d07d79305..f514906fbb7133cf636dd0aed7bfa5e0f934e8db 100644 (file)
--- a/samples/mobile/wxedit/Makefile.in
+++ b/samples/mobile/wxedit/Makefile.in
@@ -57,6 +57,10 @@ WXEDIT_OBJECTS =  \
  @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_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@__wxedit___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C wxedit$(EXEEXT)
  @COND_PLATFORM_MAC_1@__wxedit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__wxedit___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C wxedit$(EXEEXT)
  @COND_PLATFORM_MAC_1@__wxedit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  wxedit$(EXEEXT): $(WXEDIT_OBJECTS) $(__wxedit___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  wxedit$(EXEEXT): $(WXEDIT_OBJECTS) $(__wxedit___win32rc)
-       $(CXX) -o $@ $(WXEDIT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(WXEDIT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__wxedit___mac_rezcmd)
         $(__wxedit___mac_setfilecmd)
         $(__wxedit___os2_emxbindcmd)
         $(__wxedit___mac_rezcmd)
         $(__wxedit___mac_setfilecmd)
         $(__wxedit___os2_emxbindcmd)
diff --git a/samples/multimon/Makefile.in b/samples/multimon/Makefile.in

index 5126500b3a4b9158904726c5cd8afafb01227633..f0e4cd4b3dea432fcc0c20ad3f2cca6abdab59c2 100644 (file)
--- a/samples/multimon/Makefile.in
+++ b/samples/multimon/Makefile.in
@@ -57,6 +57,10 @@ MULTIMON_TEST_OBJECTS =  \
  @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_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@__multimon_test___mac_setfilecmd \
  @COND_PLATFORM_MAC_1@  = $(SETFILE) -a C multimon_test$(EXEEXT)
  @COND_PLATFORM_MAC_1@__multimon_test___mac_rezcmd = \
  @COND_PLATFORM_MAC_1@__multimon_test___mac_setfilecmd \
  @COND_PLATFORM_MAC_1@  = $(SETFILE) -a C multimon_test$(EXEEXT)
  @COND_PLATFORM_MAC_1@__multimon_test___mac_rezcmd = \
@@ -134,7 +138,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  multimon_test$(EXEEXT): $(MULTIMON_TEST_OBJECTS) $(__multimon_test___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  multimon_test$(EXEEXT): $(MULTIMON_TEST_OBJECTS) $(__multimon_test___win32rc)
-       $(CXX) -o $@ $(MULTIMON_TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(MULTIMON_TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__multimon_test___mac_rezcmd)
         $(__multimon_test___mac_setfilecmd)
         $(__multimon_test___os2_emxbindcmd)
         $(__multimon_test___mac_rezcmd)
         $(__multimon_test___mac_setfilecmd)
         $(__multimon_test___os2_emxbindcmd)
diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in

index d573c86833de7c82ba5264ecd705493bfe0bf2ae..b6e40abdbbf2d28cc42b3ff9aea6a68807a64b55 100644 (file)
--- a/samples/nativdlg/Makefile.in
+++ b/samples/nativdlg/Makefile.in
@@ -57,6 +57,10 @@ NATIVDLG_OBJECTS =  \
  @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_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@__nativdlg___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C nativdlg$(EXEEXT)
  @COND_PLATFORM_MAC_1@__nativdlg___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__nativdlg___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C nativdlg$(EXEEXT)
  @COND_PLATFORM_MAC_1@__nativdlg___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  nativdlg$(EXEEXT): $(NATIVDLG_OBJECTS) $(__nativdlg___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  nativdlg$(EXEEXT): $(NATIVDLG_OBJECTS) $(__nativdlg___win32rc)
-       $(CXX) -o $@ $(NATIVDLG_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(NATIVDLG_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__nativdlg___mac_rezcmd)
         $(__nativdlg___mac_setfilecmd)
         $(__nativdlg___os2_emxbindcmd)
         $(__nativdlg___mac_rezcmd)
         $(__nativdlg___mac_setfilecmd)
         $(__nativdlg___os2_emxbindcmd)
diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in

index bc927e9002b6464587500f07d83e8d4bc041492b..ee05927fc0aed79e0a7b9ecb99c6b4d5ee097b3f 100644 (file)
--- a/samples/notebook/Makefile.in
+++ b/samples/notebook/Makefile.in
@@ -57,6 +57,10 @@ NOTEBOOK_OBJECTS =  \
  @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_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@__notebook___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C notebook$(EXEEXT)
  @COND_PLATFORM_MAC_1@__notebook___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__notebook___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C notebook$(EXEEXT)
  @COND_PLATFORM_MAC_1@__notebook___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  notebook$(EXEEXT): $(NOTEBOOK_OBJECTS) $(__notebook___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  notebook$(EXEEXT): $(NOTEBOOK_OBJECTS) $(__notebook___win32rc)
-       $(CXX) -o $@ $(NOTEBOOK_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(NOTEBOOK_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__notebook___mac_rezcmd)
         $(__notebook___mac_setfilecmd)
         $(__notebook___os2_emxbindcmd)
         $(__notebook___mac_rezcmd)
         $(__notebook___mac_setfilecmd)
         $(__notebook___os2_emxbindcmd)
diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in

index 7d1d51ef8dc3806b00630fbe9ade8b5074bdb5f0..1bb1c679049f5312287960819ac1b0cc534580d2 100644 (file)
--- a/samples/oleauto/Makefile.in
+++ b/samples/oleauto/Makefile.in
@@ -57,6 +57,10 @@ OLEAUTO_OBJECTS =  \
  @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_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@__oleauto___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C oleauto$(EXEEXT)
  @COND_PLATFORM_MAC_1@__oleauto___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__oleauto___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C oleauto$(EXEEXT)
  @COND_PLATFORM_MAC_1@__oleauto___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  oleauto$(EXEEXT): $(OLEAUTO_OBJECTS) $(__oleauto___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  oleauto$(EXEEXT): $(OLEAUTO_OBJECTS) $(__oleauto___win32rc)
-       $(CXX) -o $@ $(OLEAUTO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(OLEAUTO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__oleauto___mac_rezcmd)
         $(__oleauto___mac_setfilecmd)
         $(__oleauto___os2_emxbindcmd)
         $(__oleauto___mac_rezcmd)
         $(__oleauto___mac_setfilecmd)
         $(__oleauto___os2_emxbindcmd)
diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in

index 966724af41d44de4c89c5b4cea292d3ef72f54eb..f977cff4f567607d02b9bcd21d7a9f8d2ef86aa7 100644 (file)
--- a/samples/opengl/cube/Makefile.in
+++ b/samples/opengl/cube/Makefile.in
@@ -58,6 +58,11 @@ CUBE_OBJECTS =  \
  @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_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_USE_OPENGL_1@__cube___depname = cube$(EXEEXT)
  @COND_PLATFORM_MAC_1@__cube___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C cube$(EXEEXT)
  @COND_PLATFORM_MAC_1@__cube___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__cube___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C cube$(EXEEXT)
  @COND_PLATFORM_MAC_1@__cube___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -111,7 +116,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
  
  ### Targets: ###
  
  
  ### Targets: ###
  
-all: cube$(EXEEXT) $(__cube_bundle___depname)
+all: $(__cube___depname) $(__cube_bundle___depname)
  
  install: all
  
  
  install: all
  
@@ -128,14 +133,14 @@ clean:
  distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
-cube$(EXEEXT): $(CUBE_OBJECTS) $(__cube___win32rc)
-       $(CXX) -o $@ $(CUBE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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)
-       $(__cube___mac_rezcmd)
-       $(__cube___mac_setfilecmd)
-       $(__cube___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
+@COND_USE_OPENGL_1@cube$(EXEEXT): $(CUBE_OBJECTS) $(__cube___win32rc)
+@COND_USE_OPENGL_1@    $(CXX) -o $@ $(CUBE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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)
+@COND_USE_OPENGL_1@    $(__cube___mac_rezcmd)
+@COND_USE_OPENGL_1@    $(__cube___mac_setfilecmd)
+@COND_USE_OPENGL_1@    $(__cube___os2_emxbindcmd)
+@COND_USE_OPENGL_1@    $(SAMPLES_RPATH_POSTLINK)
  
  
-cube.app/Contents/PkgInfo: cube$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+cube.app/Contents/PkgInfo: $(__cube___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
         mkdir -p cube.app/Contents
         mkdir -p cube.app/Contents/MacOS
         mkdir -p cube.app/Contents/Resources
         mkdir -p cube.app/Contents
         mkdir -p cube.app/Contents/MacOS
         mkdir -p cube.app/Contents/Resources
diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in

index bdd442182f1a3e250f95e9021c34b2cab3577e24..35086f303f10d65c4bc2b1bb48c238903b9cc248 100644 (file)
--- a/samples/opengl/isosurf/Makefile.in
+++ b/samples/opengl/isosurf/Makefile.in
@@ -58,6 +58,11 @@ ISOSURF_OBJECTS =  \
  @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_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_USE_OPENGL_1@__isosurf___depname = isosurf$(EXEEXT)
  @COND_PLATFORM_MAC_1@__isosurf___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C isosurf$(EXEEXT)
  @COND_PLATFORM_MAC_1@__isosurf___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__isosurf___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C isosurf$(EXEEXT)
  @COND_PLATFORM_MAC_1@__isosurf___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -113,7 +118,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
  
  ### Targets: ###
  
  
  ### Targets: ###
  
-all: isosurf$(EXEEXT) $(__isosurf_bundle___depname) data
+all: $(__isosurf___depname) $(__isosurf_bundle___depname) data
  
  install: all
  
  
  install: all
  
@@ -130,14 +135,14 @@ clean:
  distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
-isosurf$(EXEEXT): $(ISOSURF_OBJECTS) $(__isosurf___win32rc)
-       $(CXX) -o $@ $(ISOSURF_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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)
-       $(__isosurf___mac_rezcmd)
-       $(__isosurf___mac_setfilecmd)
-       $(__isosurf___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
+@COND_USE_OPENGL_1@isosurf$(EXEEXT): $(ISOSURF_OBJECTS) $(__isosurf___win32rc)
+@COND_USE_OPENGL_1@    $(CXX) -o $@ $(ISOSURF_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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)
+@COND_USE_OPENGL_1@    $(__isosurf___mac_rezcmd)
+@COND_USE_OPENGL_1@    $(__isosurf___mac_setfilecmd)
+@COND_USE_OPENGL_1@    $(__isosurf___os2_emxbindcmd)
+@COND_USE_OPENGL_1@    $(SAMPLES_RPATH_POSTLINK)
  
  
-isosurf.app/Contents/PkgInfo: isosurf$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+isosurf.app/Contents/PkgInfo: $(__isosurf___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
         mkdir -p isosurf.app/Contents
         mkdir -p isosurf.app/Contents/MacOS
         mkdir -p isosurf.app/Contents/Resources
         mkdir -p isosurf.app/Contents
         mkdir -p isosurf.app/Contents/MacOS
         mkdir -p isosurf.app/Contents/Resources
diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in

index db0841373c8d846909099d9ffef1b09b9e239c93..09b5c3d8e41911ea61917f94891314d30fac04d2 100644 (file)
--- a/samples/opengl/penguin/Makefile.in
+++ b/samples/opengl/penguin/Makefile.in
@@ -66,6 +66,11 @@ PENGUIN_OBJECTS =  \
  @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_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_USE_OPENGL_1@__penguin___depname = penguin$(EXEEXT)
  @COND_PLATFORM_MAC_1@__penguin___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C penguin$(EXEEXT)
  @COND_PLATFORM_MAC_1@__penguin___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__penguin___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C penguin$(EXEEXT)
  @COND_PLATFORM_MAC_1@__penguin___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -121,7 +126,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
  
  ### Targets: ###
  
  
  ### Targets: ###
  
-all: penguin$(EXEEXT) $(__penguin_bundle___depname) data
+all: $(__penguin___depname) $(__penguin_bundle___depname) data
  
  install: all
  
  
  install: all
  
@@ -138,14 +143,14 @@ clean:
  distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
-penguin$(EXEEXT): $(PENGUIN_OBJECTS) $(__penguin___win32rc)
-       $(CXX) -o $@ $(PENGUIN_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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)
-       $(__penguin___mac_rezcmd)
-       $(__penguin___mac_setfilecmd)
-       $(__penguin___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
+@COND_USE_OPENGL_1@penguin$(EXEEXT): $(PENGUIN_OBJECTS) $(__penguin___win32rc)
+@COND_USE_OPENGL_1@    $(CXX) -o $@ $(PENGUIN_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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)
+@COND_USE_OPENGL_1@    $(__penguin___mac_rezcmd)
+@COND_USE_OPENGL_1@    $(__penguin___mac_setfilecmd)
+@COND_USE_OPENGL_1@    $(__penguin___os2_emxbindcmd)
+@COND_USE_OPENGL_1@    $(SAMPLES_RPATH_POSTLINK)
  
  
-penguin.app/Contents/PkgInfo: penguin$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+penguin.app/Contents/PkgInfo: $(__penguin___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
         mkdir -p penguin.app/Contents
         mkdir -p penguin.app/Contents/MacOS
         mkdir -p penguin.app/Contents/Resources
         mkdir -p penguin.app/Contents
         mkdir -p penguin.app/Contents/MacOS
         mkdir -p penguin.app/Contents/Resources
diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in

index fc698b808321d26904524979b035304edf76705a..90ef3c98bc3a43c737498fd7b38393b5b8e35a45 100644 (file)
--- a/samples/ownerdrw/Makefile.in
+++ b/samples/ownerdrw/Makefile.in
@@ -57,6 +57,10 @@ OWNERDRW_OBJECTS =  \
  @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_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@__ownerdrw___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C ownerdrw$(EXEEXT)
  @COND_PLATFORM_MAC_1@__ownerdrw___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__ownerdrw___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C ownerdrw$(EXEEXT)
  @COND_PLATFORM_MAC_1@__ownerdrw___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  ownerdrw$(EXEEXT): $(OWNERDRW_OBJECTS) $(__ownerdrw___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  ownerdrw$(EXEEXT): $(OWNERDRW_OBJECTS) $(__ownerdrw___win32rc)
-       $(CXX) -o $@ $(OWNERDRW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(OWNERDRW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__ownerdrw___mac_rezcmd)
         $(__ownerdrw___mac_setfilecmd)
         $(__ownerdrw___os2_emxbindcmd)
         $(__ownerdrw___mac_rezcmd)
         $(__ownerdrw___mac_setfilecmd)
         $(__ownerdrw___os2_emxbindcmd)
diff --git a/samples/png/Makefile.in b/samples/png/Makefile.in

index 940b786ddb86f6436ae8a04ba8819b467eaac1c7..1651ab23dee21f5d40cd8475ff81b3c18b44163e 100644 (file)
--- a/samples/png/Makefile.in
+++ b/samples/png/Makefile.in
@@ -57,6 +57,10 @@ PNG_OBJECTS =  \
  @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_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@__png___mac_setfilecmd = $(SETFILE) -a C png$(EXEEXT)
  @COND_PLATFORM_MAC_1@__png___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
  @COND_PLATFORM_MAC_1@__png___mac_setfilecmd = $(SETFILE) -a C png$(EXEEXT)
  @COND_PLATFORM_MAC_1@__png___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -127,7 +131,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  png$(EXEEXT): $(PNG_OBJECTS) $(__png___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  png$(EXEEXT): $(PNG_OBJECTS) $(__png___win32rc)
-       $(CXX) -o $@ $(PNG_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(PNG_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__png___mac_rezcmd)
         $(__png___mac_setfilecmd)
         $(__png___os2_emxbindcmd)
         $(__png___mac_rezcmd)
         $(__png___mac_setfilecmd)
         $(__png___os2_emxbindcmd)
diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in

index 20871acdb1f6e54b8879bf371e647f3c329749ff..4e67a32e3386f7611bb4ff00394a904d1c996301 100644 (file)
--- a/samples/printing/Makefile.in
+++ b/samples/printing/Makefile.in
@@ -57,6 +57,10 @@ PRINTING_OBJECTS =  \
  @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_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@__printing___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C printing$(EXEEXT)
  @COND_PLATFORM_MAC_1@__printing___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__printing___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C printing$(EXEEXT)
  @COND_PLATFORM_MAC_1@__printing___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc)
-       $(CXX) -o $@ $(PRINTING_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(PRINTING_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__printing___mac_rezcmd)
         $(__printing___mac_setfilecmd)
         $(__printing___os2_emxbindcmd)
         $(__printing___mac_rezcmd)
         $(__printing___mac_setfilecmd)
         $(__printing___os2_emxbindcmd)
diff --git a/samples/propsize/Makefile.in b/samples/propsize/Makefile.in

index da9b7767ba72d921568fb96f5f6fe15108a9ea1f..b286f77685e391805af68513929fb5e1c2f6dd2e 100644 (file)
--- a/samples/propsize/Makefile.in
+++ b/samples/propsize/Makefile.in
@@ -57,6 +57,10 @@ PROPSIZE_OBJECTS =  \
  @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_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@__propsize___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C propsize$(EXEEXT)
  @COND_PLATFORM_MAC_1@__propsize___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__propsize___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C propsize$(EXEEXT)
  @COND_PLATFORM_MAC_1@__propsize___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  propsize$(EXEEXT): $(PROPSIZE_OBJECTS) $(__propsize___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  propsize$(EXEEXT): $(PROPSIZE_OBJECTS) $(__propsize___win32rc)
-       $(CXX) -o $@ $(PROPSIZE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(PROPSIZE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__propsize___mac_rezcmd)
         $(__propsize___mac_setfilecmd)
         $(__propsize___os2_emxbindcmd)
         $(__propsize___mac_rezcmd)
         $(__propsize___mac_setfilecmd)
         $(__propsize___os2_emxbindcmd)
diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in

index 045202a6a55a1ebfccd2111ed2de21fe99cff28a..5556caa7167f89e8620d1919a4e4d428a58e27f9 100644 (file)
--- a/samples/regtest/Makefile.in
+++ b/samples/regtest/Makefile.in
@@ -57,6 +57,10 @@ REGTEST_OBJECTS =  \
  @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_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@__regtest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C regtest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__regtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__regtest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C regtest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__regtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  regtest$(EXEEXT): $(REGTEST_OBJECTS) $(__regtest___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  regtest$(EXEEXT): $(REGTEST_OBJECTS) $(__regtest___win32rc)
-       $(CXX) -o $@ $(REGTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(REGTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__regtest___mac_rezcmd)
         $(__regtest___mac_setfilecmd)
         $(__regtest___os2_emxbindcmd)
         $(__regtest___mac_rezcmd)
         $(__regtest___mac_setfilecmd)
         $(__regtest___os2_emxbindcmd)
diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in

index 2e013409407e6291f62feeff9f306516588d08e1..055fe5d94bb8d22947c86e643671d2014f893302 100644 (file)
--- a/samples/render/Makefile.in
+++ b/samples/render/Makefile.in
@@ -73,6 +73,10 @@ RENDDLL_OBJECTS =  \
  @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_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_UNIX_0@PLUGIN_VERSION0 = $(WX_VERSION_NODOT)
  @COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = $(WX_VERSION)
  @COND_PLATFORM_UNIX_0@PLUGVERDELIM = 
  @COND_PLATFORM_UNIX_0@PLUGIN_VERSION0 = $(WX_VERSION_NODOT)
  @COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = $(WX_VERSION)
  @COND_PLATFORM_UNIX_0@PLUGVERDELIM = 
@@ -160,7 +164,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc)
-       $(CXX) -o $@ $(RENDER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(RENDER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__render___mac_rezcmd)
         $(__render___mac_setfilecmd)
         $(__render___os2_emxbindcmd)
         $(__render___mac_rezcmd)
         $(__render___mac_setfilecmd)
         $(__render___os2_emxbindcmd)
@@ -190,7 +194,7 @@ render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
  @COND_PLATFORM_MACOSX_1@render_bundle: $(____render_BUNDLE_TGT_REF_DEP)
  
  @COND_SHARED_1@$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(RENDDLL_OBJECTS)
  @COND_PLATFORM_MACOSX_1@render_bundle: $(____render_BUNDLE_TGT_REF_DEP)
  
  @COND_SHARED_1@$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(RENDDLL_OBJECTS)
-@COND_SHARED_1@        $(SHARED_LD_MODULE_CXX) $@ $(RENDDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(__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)
+@COND_SHARED_1@        $(SHARED_LD_MODULE_CXX) $@ $(RENDDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(__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)
  
  @COND_SHARED_1@install_renddll: 
  @COND_SHARED_1@        $(INSTALL_DIR) $(DESTDIR)$(PLUGINS_INST_DIR)
  
  @COND_SHARED_1@install_renddll: 
  @COND_SHARED_1@        $(INSTALL_DIR) $(DESTDIR)$(PLUGINS_INST_DIR)
diff --git a/samples/richedit/Makefile.in b/samples/richedit/Makefile.in

index 21f1fea033c8992e12906fc55964836ea7fab208..6a90a90cce1f5ff0e92e29a9ab94e0a63b6e1e3a 100644 (file)
--- a/samples/richedit/Makefile.in
+++ b/samples/richedit/Makefile.in
@@ -61,6 +61,10 @@ RICHEDIT_OBJECTS =  \
  @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_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@__richedit___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C richedit$(EXEEXT)
  @COND_PLATFORM_MAC_1@__richedit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__richedit___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C richedit$(EXEEXT)
  @COND_PLATFORM_MAC_1@__richedit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -134,7 +138,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  richedit$(EXEEXT): $(RICHEDIT_OBJECTS) $(__richedit___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  richedit$(EXEEXT): $(RICHEDIT_OBJECTS) $(__richedit___win32rc)
-       $(CXX) -o $@ $(RICHEDIT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(RICHEDIT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__richedit___mac_rezcmd)
         $(__richedit___mac_setfilecmd)
         $(__richedit___os2_emxbindcmd)
         $(__richedit___mac_rezcmd)
         $(__richedit___mac_setfilecmd)
         $(__richedit___os2_emxbindcmd)
diff --git a/samples/rotate/Makefile.in b/samples/rotate/Makefile.in

index a3df40a2b4194cfd5c9ea3fa7e257500753874af..28884c4439fb693837be857a59c2c6ff17a390cc 100644 (file)
--- a/samples/rotate/Makefile.in
+++ b/samples/rotate/Makefile.in
@@ -57,6 +57,10 @@ ROTATE_OBJECTS =  \
  @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_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@__rotate___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C rotate$(EXEEXT)
  @COND_PLATFORM_MAC_1@__rotate___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__rotate___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C rotate$(EXEEXT)
  @COND_PLATFORM_MAC_1@__rotate___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  rotate$(EXEEXT): $(ROTATE_OBJECTS) $(__rotate___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  rotate$(EXEEXT): $(ROTATE_OBJECTS) $(__rotate___win32rc)
-       $(CXX) -o $@ $(ROTATE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(ROTATE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__rotate___mac_rezcmd)
         $(__rotate___mac_setfilecmd)
         $(__rotate___os2_emxbindcmd)
         $(__rotate___mac_rezcmd)
         $(__rotate___mac_setfilecmd)
         $(__rotate___os2_emxbindcmd)
diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in

index 89855226372614b9a89128db39536cad351fd9cb..4bfb06f5632670b4801bb2eeae10a334793a8b86 100644 (file)
--- a/samples/sashtest/Makefile.in
+++ b/samples/sashtest/Makefile.in
@@ -59,6 +59,10 @@ SASHTEST_OBJECTS =  \
  @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_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@__sashtest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C sashtest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__sashtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__sashtest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C sashtest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__sashtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -135,7 +139,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  sashtest$(EXEEXT): $(SASHTEST_OBJECTS) $(__sashtest___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  sashtest$(EXEEXT): $(SASHTEST_OBJECTS) $(__sashtest___win32rc)
-       $(CXX) -o $@ $(SASHTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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 $@ $(SASHTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
         $(__sashtest___mac_rezcmd)
         $(__sashtest___mac_setfilecmd)
         $(__sashtest___os2_emxbindcmd)
         $(__sashtest___mac_rezcmd)
         $(__sashtest___mac_setfilecmd)
         $(__sashtest___os2_emxbindcmd)
diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in

index 30c2527b7f761657b54469b3dbe6542baa316d93..3e2be90f58020127b562769b81140ded53192c7c 100644 (file)
--- a/samples/scroll/Makefile.in
+++ b/samples/scroll/Makefile.in
@@ -57,6 +57,10 @@ SCROLL_OBJECTS =  \
  @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_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@__scroll___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C scroll$(EXEEXT)
  @COND_PLATFORM_MAC_1@__scroll___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__scroll___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C scroll$(EXEEXT)
  @COND_PLATFORM_MAC_1@__scroll___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  scroll$(EXEEXT): $(SCROLL_OBJECTS) $(__scroll___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  scroll$(EXEEXT): $(SCROLL_OBJECTS) $(__scroll___win32rc)
-       $(CXX) -o $@ $(SCROLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(SCROLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__scroll___mac_rezcmd)
         $(__scroll___mac_setfilecmd)
         $(__scroll___os2_emxbindcmd)
         $(__scroll___mac_rezcmd)
         $(__scroll___mac_setfilecmd)
         $(__scroll___os2_emxbindcmd)
diff --git a/samples/scrollsub/Makefile.in b/samples/scrollsub/Makefile.in

index 83744f6c072cf11df5f0aa568f62d7d4a7d41795..53b7c8bcefcb06f5c817ea086630f2e5b79e394a 100644 (file)
--- a/samples/scrollsub/Makefile.in
+++ b/samples/scrollsub/Makefile.in
@@ -57,6 +57,10 @@ SCROLLSUB_OBJECTS =  \
  @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_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@__scrollsub___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C scrollsub$(EXEEXT)
  @COND_PLATFORM_MAC_1@__scrollsub___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__scrollsub___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C scrollsub$(EXEEXT)
  @COND_PLATFORM_MAC_1@__scrollsub___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  scrollsub$(EXEEXT): $(SCROLLSUB_OBJECTS) $(__scrollsub___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  scrollsub$(EXEEXT): $(SCROLLSUB_OBJECTS) $(__scrollsub___win32rc)
-       $(CXX) -o $@ $(SCROLLSUB_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(SCROLLSUB_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__scrollsub___mac_rezcmd)
         $(__scrollsub___mac_setfilecmd)
         $(__scrollsub___os2_emxbindcmd)
         $(__scrollsub___mac_rezcmd)
         $(__scrollsub___mac_setfilecmd)
         $(__scrollsub___os2_emxbindcmd)
diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in

index 3293a2a98cf958201555c56ccd503fb282856da5..1587483da05b309e38eeab7991b5c8856966965f 100644 (file)
--- a/samples/shaped/Makefile.in
+++ b/samples/shaped/Makefile.in
@@ -57,6 +57,10 @@ SHAPED_OBJECTS =  \
  @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_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@__shaped___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C shaped$(EXEEXT)
  @COND_PLATFORM_MAC_1@__shaped___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__shaped___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C shaped$(EXEEXT)
  @COND_PLATFORM_MAC_1@__shaped___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc)
-       $(CXX) -o $@ $(SHAPED_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(SHAPED_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__shaped___mac_rezcmd)
         $(__shaped___mac_setfilecmd)
         $(__shaped___os2_emxbindcmd)
         $(__shaped___mac_rezcmd)
         $(__shaped___mac_setfilecmd)
         $(__shaped___os2_emxbindcmd)
diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in

index 68b6958d2437df0f54a8fd312fe0c25e353c938a..8cc2de843204dbdc455a2812215faa778b502935 100644 (file)
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -63,6 +63,10 @@ SERVER_OBJECTS =  \
  @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_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@__client___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C client$(EXEEXT)
  @COND_PLATFORM_MAC_1@__client___mac_rezcmd = $(__MACOSX_RESOURCES_p_2)
  @COND_PLATFORM_MAC_1@__client___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C client$(EXEEXT)
  @COND_PLATFORM_MAC_1@__client___mac_rezcmd = $(__MACOSX_RESOURCES_p_2)
@@ -157,7 +161,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc)
-       $(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_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 $@ $(CLIENT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_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)
         $(__client___mac_rezcmd)
         $(__client___mac_setfilecmd)
         $(__client___os2_emxbindcmd)
         $(__client___mac_rezcmd)
         $(__client___mac_setfilecmd)
         $(__client___os2_emxbindcmd)
@@ -187,7 +191,7 @@ client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
  @COND_PLATFORM_MACOSX_1@client_bundle: $(____client_BUNDLE_TGT_REF_DEP)
  
  server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc)
  @COND_PLATFORM_MACOSX_1@client_bundle: $(____client_BUNDLE_TGT_REF_DEP)
  
  server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc)
-       $(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_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 $@ $(SERVER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_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)
         $(__server___mac_rezcmd)
         $(__server___mac_setfilecmd)
         $(__server___os2_emxbindcmd)
         $(__server___mac_rezcmd)
         $(__server___mac_setfilecmd)
         $(__server___os2_emxbindcmd)
diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in

index 74d4c4d345d1e5b69e9e3c1ec4f7828a129a887f..c084878dd2c88372744a4fccb12b1f46eb8e5783 100644 (file)
--- a/samples/sound/Makefile.in
+++ b/samples/sound/Makefile.in
@@ -59,6 +59,10 @@ SOUND_OBJECTS =  \
  @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_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@__sound___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C sound$(EXEEXT)
  @COND_PLATFORM_MAC_1@__sound___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__sound___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C sound$(EXEEXT)
  @COND_PLATFORM_MAC_1@__sound___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -134,7 +138,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  sound$(EXEEXT): $(SOUND_OBJECTS) $(__sound___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  sound$(EXEEXT): $(SOUND_OBJECTS) $(__sound___win32rc)
-       $(CXX) -o $@ $(SOUND_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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 $@ $(SOUND_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
         $(__sound___mac_rezcmd)
         $(__sound___mac_setfilecmd)
         $(__sound___os2_emxbindcmd)
         $(__sound___mac_rezcmd)
         $(__sound___mac_setfilecmd)
         $(__sound___os2_emxbindcmd)
diff --git a/samples/splash/Makefile.in b/samples/splash/Makefile.in

index 5b418da679088424e18af881247aab3aef5c3993..31365e4c61f30b4af41ae6e871c5d2ef349e1f2e 100644 (file)
--- a/samples/splash/Makefile.in
+++ b/samples/splash/Makefile.in
@@ -59,6 +59,10 @@ SPLASH_OBJECTS =  \
  @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_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@__splash___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C splash$(EXEEXT)
  @COND_PLATFORM_MAC_1@__splash___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__splash___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C splash$(EXEEXT)
  @COND_PLATFORM_MAC_1@__splash___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -135,7 +139,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  splash$(EXEEXT): $(SPLASH_OBJECTS) $(__splash___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  splash$(EXEEXT): $(SPLASH_OBJECTS) $(__splash___win32rc)
-       $(CXX) -o $@ $(SPLASH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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 $@ $(SPLASH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
         $(__splash___mac_rezcmd)
         $(__splash___mac_setfilecmd)
         $(__splash___os2_emxbindcmd)
         $(__splash___mac_rezcmd)
         $(__splash___mac_setfilecmd)
         $(__splash___os2_emxbindcmd)
diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in

index 5b520b548eb87cb57cb334adc1f67d8724219c3b..5269d85fc34991971244888b33470586fc78715d 100644 (file)
--- a/samples/splitter/Makefile.in
+++ b/samples/splitter/Makefile.in
@@ -57,6 +57,10 @@ SPLITTER_OBJECTS =  \
  @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_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@__splitter___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C splitter$(EXEEXT)
  @COND_PLATFORM_MAC_1@__splitter___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__splitter___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C splitter$(EXEEXT)
  @COND_PLATFORM_MAC_1@__splitter___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  splitter$(EXEEXT): $(SPLITTER_OBJECTS) $(__splitter___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  splitter$(EXEEXT): $(SPLITTER_OBJECTS) $(__splitter___win32rc)
-       $(CXX) -o $@ $(SPLITTER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(SPLITTER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__splitter___mac_rezcmd)
         $(__splitter___mac_setfilecmd)
         $(__splitter___os2_emxbindcmd)
         $(__splitter___mac_rezcmd)
         $(__splitter___mac_setfilecmd)
         $(__splitter___os2_emxbindcmd)
diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in

index 45345d040130b14d9aecbda1f04d9ee1978ce939..7f06523c1f747f26deb22b4dba6db4344663762e 100644 (file)
--- a/samples/statbar/Makefile.in
+++ b/samples/statbar/Makefile.in
@@ -57,6 +57,10 @@ STATBAR_OBJECTS =  \
  @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_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@__statbar___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C statbar$(EXEEXT)
  @COND_PLATFORM_MAC_1@__statbar___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__statbar___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C statbar$(EXEEXT)
  @COND_PLATFORM_MAC_1@__statbar___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  statbar$(EXEEXT): $(STATBAR_OBJECTS) $(__statbar___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  statbar$(EXEEXT): $(STATBAR_OBJECTS) $(__statbar___win32rc)
-       $(CXX) -o $@ $(STATBAR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(STATBAR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__statbar___mac_rezcmd)
         $(__statbar___mac_setfilecmd)
         $(__statbar___os2_emxbindcmd)
         $(__statbar___mac_rezcmd)
         $(__statbar___mac_setfilecmd)
         $(__statbar___os2_emxbindcmd)
diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in

index 105eb0b40b3f01da396a704d5d9d42f841d21ffc..554e650f803d7998bd269bdba01cbe9f4b344eb9 100644 (file)
--- a/samples/stc/Makefile.in
+++ b/samples/stc/Makefile.in
@@ -60,6 +60,10 @@ STCTEST_OBJECTS =  \
  @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_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@__stctest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C stctest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__stctest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__stctest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C stctest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__stctest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -134,7 +138,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc)
-       $(CXX) -o $@ $(STCTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(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) $(EXTRALIBS_GUI)
+       $(CXX) -o $@ $(STCTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(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)
         $(__stctest___mac_rezcmd)
         $(__stctest___mac_setfilecmd)
         $(__stctest___os2_emxbindcmd)
         $(__stctest___mac_rezcmd)
         $(__stctest___mac_setfilecmd)
         $(__stctest___os2_emxbindcmd)
diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in

index 76b6a632479ad80ed9b71734e729d0514a2542da..9f91050419fd85892b6e4ad68e531cb4ffd5967f 100644 (file)
--- a/samples/svg/Makefile.in
+++ b/samples/svg/Makefile.in
@@ -58,6 +58,10 @@ SVGTEST_OBJECTS =  \
  @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_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@__svgtest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C svgtest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__svgtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__svgtest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C svgtest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__svgtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -132,7 +136,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc)
-       $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(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) $(EXTRALIBS_GUI)
+       $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg-$(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)
         $(__svgtest___mac_rezcmd)
         $(__svgtest___mac_setfilecmd)
         $(__svgtest___os2_emxbindcmd)
         $(__svgtest___mac_rezcmd)
         $(__svgtest___mac_setfilecmd)
         $(__svgtest___os2_emxbindcmd)
diff --git a/samples/tab/Makefile.in b/samples/tab/Makefile.in

index d2fb714c93db8de9eb78d6beb6db91a8628ec892..67184188abe52d3496a87d508169aea8e6c6add9 100644 (file)
--- a/samples/tab/Makefile.in
+++ b/samples/tab/Makefile.in
@@ -57,6 +57,10 @@ TAB_OBJECTS =  \
  @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_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@__tab___mac_setfilecmd = $(SETFILE) -a C tab$(EXEEXT)
  @COND_PLATFORM_MAC_1@__tab___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
  @COND_PLATFORM_MAC_1@__tab___mac_setfilecmd = $(SETFILE) -a C tab$(EXEEXT)
  @COND_PLATFORM_MAC_1@__tab___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -127,7 +131,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  tab$(EXEEXT): $(TAB_OBJECTS) $(__tab___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  tab$(EXEEXT): $(TAB_OBJECTS) $(__tab___win32rc)
-       $(CXX) -o $@ $(TAB_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(TAB_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__tab___mac_rezcmd)
         $(__tab___mac_setfilecmd)
         $(__tab___os2_emxbindcmd)
         $(__tab___mac_rezcmd)
         $(__tab___mac_setfilecmd)
         $(__tab___os2_emxbindcmd)
diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in

index b6258b4e6bcfa2ee28b62fe48b8c8952a82de1c4..0a93675076755158220e4e1abe523d714931fea2 100644 (file)
--- a/samples/taskbar/Makefile.in
+++ b/samples/taskbar/Makefile.in
@@ -59,6 +59,10 @@ TASKBAR_OBJECTS =  \
  @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_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@__taskbar___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C taskbar$(EXEEXT)
  @COND_PLATFORM_MAC_1@__taskbar___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__taskbar___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C taskbar$(EXEEXT)
  @COND_PLATFORM_MAC_1@__taskbar___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -135,7 +139,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc)
-       $(CXX) -o $@ $(TASKBAR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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 $@ $(TASKBAR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
         $(__taskbar___mac_rezcmd)
         $(__taskbar___mac_setfilecmd)
         $(__taskbar___os2_emxbindcmd)
         $(__taskbar___mac_rezcmd)
         $(__taskbar___mac_setfilecmd)
         $(__taskbar___os2_emxbindcmd)
diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in

index ad3547da2ba68d29b39f7f1ba6ae61613f04b84f..3e9a38a3faf72b21b9a5fb2fd52bc6ea40194b69 100644 (file)
--- a/samples/text/Makefile.in
+++ b/samples/text/Makefile.in
@@ -57,6 +57,10 @@ TEXT_OBJECTS =  \
  @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_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@__text___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C text$(EXEEXT)
  @COND_PLATFORM_MAC_1@__text___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__text___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C text$(EXEEXT)
  @COND_PLATFORM_MAC_1@__text___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -128,7 +132,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  text$(EXEEXT): $(TEXT_OBJECTS) $(__text___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  text$(EXEEXT): $(TEXT_OBJECTS) $(__text___win32rc)
-       $(CXX) -o $@ $(TEXT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(TEXT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__text___mac_rezcmd)
         $(__text___mac_setfilecmd)
         $(__text___os2_emxbindcmd)
         $(__text___mac_rezcmd)
         $(__text___mac_setfilecmd)
         $(__text___os2_emxbindcmd)
diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in

index ecfb1d209f329cd4576af067340d607bea01c281..827b187d7bee421ef057100bc49e177a250de8f6 100644 (file)
--- a/samples/thread/Makefile.in
+++ b/samples/thread/Makefile.in
@@ -57,6 +57,10 @@ THREAD_OBJECTS =  \
  @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_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@__thread___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C thread$(EXEEXT)
  @COND_PLATFORM_MAC_1@__thread___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__thread___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C thread$(EXEEXT)
  @COND_PLATFORM_MAC_1@__thread___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  thread$(EXEEXT): $(THREAD_OBJECTS) $(__thread___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  thread$(EXEEXT): $(THREAD_OBJECTS) $(__thread___win32rc)
-       $(CXX) -o $@ $(THREAD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(THREAD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__thread___mac_rezcmd)
         $(__thread___mac_setfilecmd)
         $(__thread___os2_emxbindcmd)
         $(__thread___mac_rezcmd)
         $(__thread___mac_setfilecmd)
         $(__thread___os2_emxbindcmd)
diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in

index da2d11075761eb62e301687051d0002b9f3f47ba..7154c561fcc0ffe8f497884627307529e42e2d33 100644 (file)
--- a/samples/toolbar/Makefile.in
+++ b/samples/toolbar/Makefile.in
@@ -57,6 +57,10 @@ TOOLBAR_OBJECTS =  \
  @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_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@__toolbar___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C toolbar$(EXEEXT)
  @COND_PLATFORM_MAC_1@__toolbar___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__toolbar___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C toolbar$(EXEEXT)
  @COND_PLATFORM_MAC_1@__toolbar___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  toolbar$(EXEEXT): $(TOOLBAR_OBJECTS) $(__toolbar___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  toolbar$(EXEEXT): $(TOOLBAR_OBJECTS) $(__toolbar___win32rc)
-       $(CXX) -o $@ $(TOOLBAR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(TOOLBAR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__toolbar___mac_rezcmd)
         $(__toolbar___mac_setfilecmd)
         $(__toolbar___os2_emxbindcmd)
         $(__toolbar___mac_rezcmd)
         $(__toolbar___mac_setfilecmd)
         $(__toolbar___os2_emxbindcmd)
diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in

index 5a6b1e29f900cb3727dc617f43e449e0bc33b850..ebd95c7f584dd7d692d2e17e6c8fea65c1da5d94 100644 (file)
--- a/samples/treectrl/Makefile.in
+++ b/samples/treectrl/Makefile.in
@@ -57,6 +57,10 @@ TREECTRL_OBJECTS =  \
  @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_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@__treectrl___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C treectrl$(EXEEXT)
  @COND_PLATFORM_MAC_1@__treectrl___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__treectrl___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C treectrl$(EXEEXT)
  @COND_PLATFORM_MAC_1@__treectrl___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  treectrl$(EXEEXT): $(TREECTRL_OBJECTS) $(__treectrl___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  treectrl$(EXEEXT): $(TREECTRL_OBJECTS) $(__treectrl___win32rc)
-       $(CXX) -o $@ $(TREECTRL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(TREECTRL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__treectrl___mac_rezcmd)
         $(__treectrl___mac_setfilecmd)
         $(__treectrl___os2_emxbindcmd)
         $(__treectrl___mac_rezcmd)
         $(__treectrl___mac_setfilecmd)
         $(__treectrl___os2_emxbindcmd)
diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in

index 05383f439f9c8de13bd5db4a57e2ec1b6108c8ac..a5da0aae6f64bac0b8e6a8cb9ae9d4a29359fc1c 100644 (file)
--- a/samples/typetest/Makefile.in
+++ b/samples/typetest/Makefile.in
@@ -57,6 +57,10 @@ TYPETEST_OBJECTS =  \
  @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_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@__typetest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C typetest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__typetest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__typetest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C typetest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__typetest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  typetest$(EXEEXT): $(TYPETEST_OBJECTS) $(__typetest___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  typetest$(EXEEXT): $(TYPETEST_OBJECTS) $(__typetest___win32rc)
-       $(CXX) -o $@ $(TYPETEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(TYPETEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__typetest___mac_rezcmd)
         $(__typetest___mac_setfilecmd)
         $(__typetest___os2_emxbindcmd)
         $(__typetest___mac_rezcmd)
         $(__typetest___mac_setfilecmd)
         $(__typetest___os2_emxbindcmd)
diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in

index fb1535a9f62a2f3e408a603c1aa34d052f1de457..4a3bfca545177cc03703bd75f8f41c1ec1e0b1ce 100644 (file)
--- a/samples/validate/Makefile.in
+++ b/samples/validate/Makefile.in
@@ -57,6 +57,10 @@ VALIDATE_OBJECTS =  \
  @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_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@__validate___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C validate$(EXEEXT)
  @COND_PLATFORM_MAC_1@__validate___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__validate___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C validate$(EXEEXT)
  @COND_PLATFORM_MAC_1@__validate___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  validate$(EXEEXT): $(VALIDATE_OBJECTS) $(__validate___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  validate$(EXEEXT): $(VALIDATE_OBJECTS) $(__validate___win32rc)
-       $(CXX) -o $@ $(VALIDATE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(VALIDATE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__validate___mac_rezcmd)
         $(__validate___mac_setfilecmd)
         $(__validate___os2_emxbindcmd)
         $(__validate___mac_rezcmd)
         $(__validate___mac_setfilecmd)
         $(__validate___os2_emxbindcmd)
diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in

index a04dc34fec4f6a116a69ae49c272a86c0fba7426..6070c8a4bb6e0f9f07096a90d72a09b80d25d66c 100644 (file)
--- a/samples/vscroll/Makefile.in
+++ b/samples/vscroll/Makefile.in
@@ -57,6 +57,10 @@ VSTEST_OBJECTS =  \
  @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_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@__vstest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C vstest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__vstest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__vstest___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C vstest$(EXEEXT)
  @COND_PLATFORM_MAC_1@__vstest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  vstest$(EXEEXT): $(VSTEST_OBJECTS) $(__vstest___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  vstest$(EXEEXT): $(VSTEST_OBJECTS) $(__vstest___win32rc)
-       $(CXX) -o $@ $(VSTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(VSTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__vstest___mac_rezcmd)
         $(__vstest___mac_setfilecmd)
         $(__vstest___os2_emxbindcmd)
         $(__vstest___mac_rezcmd)
         $(__vstest___mac_setfilecmd)
         $(__vstest___os2_emxbindcmd)
diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in

index 23317b04d1daa08af3c28278b1b3939b557f7739..ada51a7f75938da2f5f7b480a7ea5744fe731bbe 100644 (file)
--- a/samples/widgets/Makefile.in
+++ b/samples/widgets/Makefile.in
@@ -68,6 +68,10 @@ WIDGETS_OBJECTS =  \
  @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_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@__widgets___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C widgets$(EXEEXT)
  @COND_PLATFORM_MAC_1@__widgets___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__widgets___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C widgets$(EXEEXT)
  @COND_PLATFORM_MAC_1@__widgets___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -141,7 +145,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  widgets$(EXEEXT): $(WIDGETS_OBJECTS) $(__widgets___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  widgets$(EXEEXT): $(WIDGETS_OBJECTS) $(__widgets___win32rc)
-       $(CXX) -o $@ $(WIDGETS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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 $@ $(WIDGETS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
         $(__widgets___mac_rezcmd)
         $(__widgets___mac_setfilecmd)
         $(__widgets___os2_emxbindcmd)
         $(__widgets___mac_rezcmd)
         $(__widgets___mac_setfilecmd)
         $(__widgets___os2_emxbindcmd)
diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in

index ee9cf67289fafb068d510e5a5c9d230d1a0cc88a..2ec196b0a4fa2a63b7ec02d9c850446c9abfba5a 100644 (file)
--- a/samples/wizard/Makefile.in
+++ b/samples/wizard/Makefile.in
@@ -59,6 +59,10 @@ WIZARD_OBJECTS =  \
  @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_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@__wizard___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C wizard$(EXEEXT)
  @COND_PLATFORM_MAC_1@__wizard___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__wizard___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C wizard$(EXEEXT)
  @COND_PLATFORM_MAC_1@__wizard___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -135,7 +139,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc)
-       $(CXX) -o $@ $(WIZARD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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 $@ $(WIZARD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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)
         $(__wizard___mac_rezcmd)
         $(__wizard___mac_setfilecmd)
         $(__wizard___os2_emxbindcmd)
         $(__wizard___mac_rezcmd)
         $(__wizard___mac_setfilecmd)
         $(__wizard___os2_emxbindcmd)
diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in

index a3ce5d2da81134df8ff7338742dbc483711cd3e5..4f075920866f3fddb2856b1a65dc02447219129b 100644 (file)
--- a/samples/xrc/Makefile.in
+++ b/samples/xrc/Makefile.in
@@ -64,6 +64,10 @@ XRCDEMO_OBJECTS =  \
  @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_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@__xrcdemo___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C xrcdemo$(EXEEXT)
  @COND_PLATFORM_MAC_1@__xrcdemo___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__xrcdemo___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C xrcdemo$(EXEEXT)
  @COND_PLATFORM_MAC_1@__xrcdemo___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -149,7 +153,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc)
-       $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_XRC_p)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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 $@ $(XRCDEMO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_XRC_p)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
         $(__xrcdemo___mac_rezcmd)
         $(__xrcdemo___mac_setfilecmd)
         $(__xrcdemo___os2_emxbindcmd)
         $(__xrcdemo___mac_rezcmd)
         $(__xrcdemo___mac_setfilecmd)
         $(__xrcdemo___os2_emxbindcmd)
diff --git a/src/stc/Makefile.in b/src/stc/Makefile.in

index be11afaf21300d660505b602281945f2a688d8f8..77751156071d72bec2ea565054aea9e7e9f11947 100644 (file)
--- a/src/stc/Makefile.in
+++ b/src/stc/Makefile.in
@@ -220,6 +220,10 @@ STCLIB_OBJECTS =  \
  @COND_PLATFORM_WIN32_1@        wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
  @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
  @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
  @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___stcdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
  @COND_SHARED_1@__stcdll___depname = $(COND_SHARED_1___stcdll___depname)
  COND_SHARED_1___stcdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
  @COND_SHARED_1@__stcdll___depname = $(COND_SHARED_1___stcdll___depname)
@@ -335,7 +339,7 @@ distclean: clean
         rm -f configure 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)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): $(STCDLL_OBJECTS)
         rm -f configure 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)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): $(STCDLL_OBJECTS)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(__stcdll___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) $@ $(STCDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(__stcdll___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@        $(__stcdll___so_symlinks_cmd)
  
  @COND_SHARED_1@        
  @COND_SHARED_1@        $(__stcdll___so_symlinks_cmd)
  
diff --git a/tests/Makefile.in b/tests/Makefile.in

index b1f22408324d1de0ea3827ed7a7c029dc89803c0..610c3bd001947d079e919c921d940b707fd86bcb 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -26,6 +26,7 @@ TOOLKIT = @TOOLKIT@
  TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
  TOOLKIT_VERSION = @TOOLKIT_VERSION@
  EXTRALIBS = @EXTRALIBS@
  TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
  TOOLKIT_VERSION = @TOOLKIT_VERSION@
  EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
  HOST_SUFFIX = @HOST_SUFFIX@
  SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
  SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
@@ -73,6 +74,8 @@ TEST_OBJECTS =  \
  @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_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
  @COND_PLATFORM_MAC_1@__test___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL test$(EXEEXT)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
  @COND_PLATFORM_MAC_1@__test___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL test$(EXEEXT)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -121,9 +124,10 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  test$(EXEEXT): $(TEST_OBJECTS)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  test$(EXEEXT): $(TEST_OBJECTS)
-       $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS)  $(__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)
+       $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS)  $(__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)
         
         
-       $(__test___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK)
+       $(__test___mac_setfilecmd)
+       $(SAMPLES_RPATH_POSTLINK)
  
  data: 
         @mkdir -p .
  
  data: 
         @mkdir -p .
diff --git a/utils/HelpGen/src/Makefile.in b/utils/HelpGen/src/Makefile.in

index de9bde3a447fce4d8b8e3d9583aaf85c16d369e5..c14d6e0b7e58018728d5d3c22d724fc0db33be95 100644 (file)
--- a/utils/HelpGen/src/Makefile.in
+++ b/utils/HelpGen/src/Makefile.in
@@ -24,6 +24,7 @@ TOOLKIT = @TOOLKIT@
  TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
  TOOLKIT_VERSION = @TOOLKIT_VERSION@
  EXTRALIBS = @EXTRALIBS@
  TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
  TOOLKIT_VERSION = @TOOLKIT_VERSION@
  EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  
  ### Variables: ###
  HOST_SUFFIX = @HOST_SUFFIX@
  
  ### Variables: ###
@@ -54,6 +55,8 @@ HELPGEN_OBJECTS =  \
  @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_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
  @COND_PLATFORM_MAC_1@__HelpGen___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL HelpGen$(EXEEXT)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
  @COND_PLATFORM_MAC_1@__HelpGen___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL HelpGen$(EXEEXT)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -102,7 +105,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  HelpGen$(EXEEXT): $(HELPGEN_OBJECTS)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  HelpGen$(EXEEXT): $(HELPGEN_OBJECTS)
-       $(CXX) -o $@ $(HELPGEN_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(__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)
+       $(CXX) -o $@ $(HELPGEN_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(__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)
         
         $(__HelpGen___mac_setfilecmd)
  
         
         $(__HelpGen___mac_setfilecmd)
  
diff --git a/utils/configtool/src/Makefile.in b/utils/configtool/src/Makefile.in

index 6314796739ad058ae73c06f6d08eb80041f890c6..65ecf0769a17e327302389f63adcec1b02877b96 100644 (file)
--- a/utils/configtool/src/Makefile.in
+++ b/utils/configtool/src/Makefile.in
@@ -71,6 +71,10 @@ WXCONFIGTOOL_OBJECTS =  \
  @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_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@__wxconfigtool___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C wxconfigtool$(EXEEXT)
  @COND_PLATFORM_MAC_1@__wxconfigtool___mac_rezcmd = \
  @COND_PLATFORM_MAC_1@__wxconfigtool___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C wxconfigtool$(EXEEXT)
  @COND_PLATFORM_MAC_1@__wxconfigtool___mac_rezcmd = \
@@ -149,7 +153,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  wxconfigtool$(EXEEXT): $(WXCONFIGTOOL_OBJECTS) $(__wxconfigtool___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  wxconfigtool$(EXEEXT): $(WXCONFIGTOOL_OBJECTS) $(__wxconfigtool___win32rc)
-       $(CXX) -o $@ $(WXCONFIGTOOL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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 $@ $(WXCONFIGTOOL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
         $(__wxconfigtool___mac_rezcmd)
         $(__wxconfigtool___mac_setfilecmd)
         $(__wxconfigtool___os2_emxbindcmd)
         $(__wxconfigtool___mac_rezcmd)
         $(__wxconfigtool___mac_setfilecmd)
         $(__wxconfigtool___os2_emxbindcmd)
diff --git a/utils/emulator/src/Makefile.in b/utils/emulator/src/Makefile.in

index 1001cc74ccf555d2f8b94193164ab15955ed4b81..9fd22bf6302a7f0e458257cda36557763404ecfb 100644 (file)
--- a/utils/emulator/src/Makefile.in
+++ b/utils/emulator/src/Makefile.in
@@ -54,6 +54,10 @@ WXEMULATOR_OBJECTS =  \
  @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_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@__wxemulator___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C wxemulator$(EXEEXT)
  @COND_PLATFORM_MAC_1@__wxemulator___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__wxemulator___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C wxemulator$(EXEEXT)
  @COND_PLATFORM_MAC_1@__wxemulator___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -121,7 +125,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  wxemulator$(EXEEXT): $(WXEMULATOR_OBJECTS) $(__wxemulator___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  wxemulator$(EXEEXT): $(WXEMULATOR_OBJECTS) $(__wxemulator___win32rc)
-       $(CXX) -o $@ $(WXEMULATOR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(__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 $@ $(WXEMULATOR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(__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)
         $(__wxemulator___mac_rezcmd)
         $(__wxemulator___mac_setfilecmd)
         $(__wxemulator___os2_emxbindcmd)
         $(__wxemulator___mac_rezcmd)
         $(__wxemulator___mac_setfilecmd)
         $(__wxemulator___os2_emxbindcmd)
diff --git a/utils/helpview/src/Makefile.in b/utils/helpview/src/Makefile.in

index 771a650acb5743b746f0e06b97b01e8c1bfcb355..1e6a88da2b0d9311def8cb1cd9d3b4fd05f74a27 100644 (file)
--- a/utils/helpview/src/Makefile.in
+++ b/utils/helpview/src/Makefile.in
@@ -59,6 +59,10 @@ HELPVIEW_OBJECTS =  \
  @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_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@__helpview___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C helpview$(EXEEXT)
  @COND_PLATFORM_MAC_1@__helpview___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__helpview___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C helpview$(EXEEXT)
  @COND_PLATFORM_MAC_1@__helpview___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -133,7 +137,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
-       $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_NET_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 $@ $(HELPVIEW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_NET_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)
         $(__helpview___mac_rezcmd)
         $(__helpview___mac_setfilecmd)
         $(__helpview___os2_emxbindcmd)
         $(__helpview___mac_rezcmd)
         $(__helpview___mac_setfilecmd)
         $(__helpview___os2_emxbindcmd)
diff --git a/utils/hhp2cached/Makefile.in b/utils/hhp2cached/Makefile.in

index 5b9ed70a38764031879129a1d9610eeafbaaa678..c2109cfb78064bd175d947ee325e04c1810fb05b 100644 (file)
--- a/utils/hhp2cached/Makefile.in
+++ b/utils/hhp2cached/Makefile.in
@@ -59,6 +59,10 @@ HHP2CACHED_OBJECTS =  \
  @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_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@__hhp2cached___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C hhp2cached$(EXEEXT)
  @COND_PLATFORM_MAC_1@__hhp2cached___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
  @COND_PLATFORM_MAC_1@__hhp2cached___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -a C hhp2cached$(EXEEXT)
  @COND_PLATFORM_MAC_1@__hhp2cached___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -130,7 +134,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  hhp2cached$(EXEEXT): $(HHP2CACHED_OBJECTS) $(__hhp2cached___win32rc)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  hhp2cached$(EXEEXT): $(HHP2CACHED_OBJECTS) $(__hhp2cached___win32rc)
-       $(CXX) -o $@ $(HHP2CACHED_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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 $@ $(HHP2CACHED_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
         $(__hhp2cached___mac_rezcmd)
         $(__hhp2cached___mac_setfilecmd)
         $(__hhp2cached___os2_emxbindcmd)
         $(__hhp2cached___mac_rezcmd)
         $(__hhp2cached___mac_setfilecmd)
         $(__hhp2cached___os2_emxbindcmd)
diff --git a/utils/tex2rtf/src/Makefile.in b/utils/tex2rtf/src/Makefile.in

index e608769af84e6062b35613bf5c2f309649ea72fc..164507997a097204eda2d4d6a610b3bf89561058 100644 (file)
--- a/utils/tex2rtf/src/Makefile.in
+++ b/utils/tex2rtf/src/Makefile.in
@@ -77,6 +77,10 @@ TEX2RTF_GUI_OBJECTS =  \
  @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_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@__tex2rtf___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL tex2rtf$(EXEEXT)
  @COND_USE_GUI_1@__tex2rtf_gui___depname = tex2rtf_gui$(EXEEXT)
  @COND_PLATFORM_MAC_1@__tex2rtf___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL tex2rtf$(EXEEXT)
  @COND_USE_GUI_1@__tex2rtf_gui___depname = tex2rtf_gui$(EXEEXT)
@@ -155,7 +159,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  tex2rtf$(EXEEXT): $(TEX2RTF_OBJECTS)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  tex2rtf$(EXEEXT): $(TEX2RTF_OBJECTS)
-       $(CXX) -o $@ $(TEX2RTF_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(__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)
+       $(CXX) -o $@ $(TEX2RTF_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(__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)
         
         $(__tex2rtf___mac_setfilecmd)
  
         
         $(__tex2rtf___mac_setfilecmd)
  
@@ -164,7 +168,7 @@ install_tex2rtf:
         $(INSTALL_PROGRAM) tex2rtf$(EXEEXT) $(DESTDIR)$(bindir)
  
  @COND_USE_GUI_1@tex2rtf_gui$(EXEEXT): $(TEX2RTF_GUI_OBJECTS) $(__tex2rtf_gui___win32rc)
         $(INSTALL_PROGRAM) tex2rtf$(EXEEXT) $(DESTDIR)$(bindir)
  
  @COND_USE_GUI_1@tex2rtf_gui$(EXEEXT): $(TEX2RTF_GUI_OBJECTS) $(__tex2rtf_gui___win32rc)
-@COND_USE_GUI_1@       $(CXX) -o $@ $(TEX2RTF_GUI_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
+@COND_USE_GUI_1@       $(CXX) -o $@ $(TEX2RTF_GUI_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
  @COND_USE_GUI_1@       $(__tex2rtf_gui___mac_rezcmd)
  @COND_USE_GUI_1@       $(__tex2rtf_gui___mac_setfilecmd)
  @COND_USE_GUI_1@       $(__tex2rtf_gui___os2_emxbindcmd)
  @COND_USE_GUI_1@       $(__tex2rtf_gui___mac_rezcmd)
  @COND_USE_GUI_1@       $(__tex2rtf_gui___mac_setfilecmd)
  @COND_USE_GUI_1@       $(__tex2rtf_gui___os2_emxbindcmd)
diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in

index b947506729099e455735cc237870b6a80f48890b..361b04a459a31aab375ef6f1b679f4ef7d18626c 100644 (file)
--- a/utils/wxrc/Makefile.in
+++ b/utils/wxrc/Makefile.in
@@ -30,6 +30,7 @@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
  TOOLKIT_VERSION = @TOOLKIT_VERSION@
  EXTRALIBS = @EXTRALIBS@
  EXTRALIBS_XML = @EXTRALIBS_XML@
  TOOLKIT_VERSION = @TOOLKIT_VERSION@
  EXTRALIBS = @EXTRALIBS@
  EXTRALIBS_XML = @EXTRALIBS_XML@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
  HOST_SUFFIX = @HOST_SUFFIX@
  
  ### Variables: ###
  HOST_SUFFIX = @HOST_SUFFIX@
  
  ### Variables: ###
@@ -53,6 +54,8 @@ WXRC_OBJECTS =  \
  @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_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
  @COND_USE_XRC_1@__wxrc___depname = wxrc$(EXEEXT)
  @COND_PLATFORM_MAC_1@__wxrc___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL wxrc$(EXEEXT)
  @COND_USE_XRC_1@__wxrc___depname = wxrc$(EXEEXT)
  @COND_PLATFORM_MAC_1@__wxrc___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL wxrc$(EXEEXT)
@@ -107,7 +110,7 @@ distclean: clean
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS)
         rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS)
-@COND_USE_XRC_1@       $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
+@COND_USE_XRC_1@       $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
  @COND_USE_XRC_1@       
  @COND_USE_XRC_1@       $(__wxrc___mac_setfilecmd)
  
  @COND_USE_XRC_1@       
  @COND_USE_XRC_1@       $(__wxrc___mac_setfilecmd)
author	David Elliott <dfe@tgwbd.org>
	Mon, 18 Oct 2004 17:02:37 +0000 (17:02 +0000)
committer	David Elliott <dfe@tgwbd.org>
	Mon, 18 Oct 2004 17:02:37 +0000 (17:02 +0000)
Makefile.in		patch \| blob \| blame \| history
contrib/samples/animate/Makefile.in		patch \| blob \| blame \| history
contrib/samples/deprecated/proplist/Makefile.in		patch \| blob \| blame \| history
contrib/samples/deprecated/resource/Makefile.in		patch \| blob \| blame \| history
contrib/samples/deprecated/treelay/Makefile.in		patch \| blob \| blame \| history
contrib/samples/fl/Makefile.in		patch \| blob \| blame \| history
contrib/samples/foldbar/foldpanelbar/Makefile.in		patch \| blob \| blame \| history
contrib/samples/gizmos/dynsash/Makefile.in		patch \| blob \| blame \| history
contrib/samples/gizmos/dynsash_switch/Makefile.in		patch \| blob \| blame \| history
contrib/samples/gizmos/editlbox/Makefile.in		patch \| blob \| blame \| history
contrib/samples/gizmos/led/Makefile.in		patch \| blob \| blame \| history
contrib/samples/gizmos/multicell/Makefile.in		patch \| blob \| blame \| history
contrib/samples/gizmos/splittree/Makefile.in		patch \| blob \| blame \| history
contrib/samples/mmedia/Makefile.in		patch \| blob \| blame \| history
contrib/samples/ogl/ogledit/Makefile.in		patch \| blob \| blame \| history
contrib/samples/ogl/studio/Makefile.in		patch \| blob \| blame \| history
contrib/samples/plot/Makefile.in		patch \| blob \| blame \| history
contrib/samples/stc/Makefile.in		patch \| blob \| blame \| history
contrib/samples/svg/Makefile.in		patch \| blob \| blame \| history
contrib/src/animate/Makefile.in		patch \| blob \| blame \| history
contrib/src/deprecated/Makefile.in		patch \| blob \| blame \| history
contrib/src/fl/Makefile.in		patch \| blob \| blame \| history
contrib/src/foldbar/Makefile.in		patch \| blob \| blame \| history
contrib/src/gizmos/Makefile.in		patch \| blob \| blame \| history
contrib/src/mmedia/Makefile.in		patch \| blob \| blame \| history
contrib/src/net/Makefile.in		patch \| blob \| blame \| history
contrib/src/ogl/Makefile.in		patch \| blob \| blame \| history
contrib/src/plot/Makefile.in		patch \| blob \| blame \| history
contrib/src/stc/Makefile.in		patch \| blob \| blame \| history
contrib/src/svg/Makefile.in		patch \| blob \| blame \| history
contrib/utils/convertrc/Makefile.in		patch \| blob \| blame \| history
contrib/utils/wxrcedit/Makefile.in		patch \| blob \| blame \| history
demos/bombs/Makefile.in		patch \| blob \| blame \| history
demos/dbbrowse/Makefile.in		patch \| blob \| blame \| history
demos/forty/Makefile.in		patch \| blob \| blame \| history
demos/fractal/Makefile.in		patch \| blob \| blame \| history
demos/life/Makefile.in		patch \| blob \| blame \| history
demos/poem/Makefile.in		patch \| blob \| blame \| history
samples/access/Makefile.in		patch \| blob \| blame \| history
samples/artprov/Makefile.in		patch \| blob \| blame \| history
samples/calendar/Makefile.in		patch \| blob \| blame \| history
samples/caret/Makefile.in		patch \| blob \| blame \| history
samples/checklst/Makefile.in		patch \| blob \| blame \| history
samples/config/Makefile.in		patch \| blob \| blame \| history
samples/console/Makefile.in		patch \| blob \| blame \| history
samples/controls/Makefile.in		patch \| blob \| blame \| history
samples/db/Makefile.in		patch \| blob \| blame \| history
samples/dialogs/Makefile.in		patch \| blob \| blame \| history
samples/dialup/Makefile.in		patch \| blob \| blame \| history
samples/display/Makefile.in		patch \| blob \| blame \| history
samples/dnd/Makefile.in		patch \| blob \| blame \| history
samples/docview/Makefile.in		patch \| blob \| blame \| history
samples/docvwmdi/Makefile.in		patch \| blob \| blame \| history
samples/dragimag/Makefile.in		patch \| blob \| blame \| history
samples/drawing/Makefile.in		patch \| blob \| blame \| history
samples/dynamic/Makefile.in		patch \| blob \| blame \| history
samples/erase/Makefile.in		patch \| blob \| blame \| history
samples/event/Makefile.in		patch \| blob \| blame \| history
samples/except/Makefile.in		patch \| blob \| blame \| history
samples/exec/Makefile.in		patch \| blob \| blame \| history
samples/font/Makefile.in		patch \| blob \| blame \| history
samples/grid/Makefile.in		patch \| blob \| blame \| history
samples/help/Makefile.in		patch \| blob \| blame \| history
samples/htlbox/Makefile.in		patch \| blob \| blame \| history
samples/html/about/Makefile.in		patch \| blob \| blame \| history
samples/html/help/Makefile.in		patch \| blob \| blame \| history
samples/html/helpview/Makefile.in		patch \| blob \| blame \| history
samples/html/htmlctrl/Makefile.in		patch \| blob \| blame \| history
samples/html/printing/Makefile.in		patch \| blob \| blame \| history
samples/html/test/Makefile.in		patch \| blob \| blame \| history
samples/html/virtual/Makefile.in		patch \| blob \| blame \| history
samples/html/widget/Makefile.in		patch \| blob \| blame \| history
samples/html/zip/Makefile.in		patch \| blob \| blame \| history
samples/image/Makefile.in		patch \| blob \| blame \| history
samples/internat/Makefile.in		patch \| blob \| blame \| history
samples/ipc/Makefile.in		patch \| blob \| blame \| history
samples/joytest/Makefile.in		patch \| blob \| blame \| history
samples/keyboard/Makefile.in		patch \| blob \| blame \| history
samples/layout/Makefile.in		patch \| blob \| blame \| history
samples/listbox/Makefile.in		patch \| blob \| blame \| history
samples/listctrl/Makefile.in		patch \| blob \| blame \| history
samples/mdi/Makefile.in		patch \| blob \| blame \| history
samples/memcheck/Makefile.in		patch \| blob \| blame \| history
samples/menu/Makefile.in		patch \| blob \| blame \| history
samples/mfc/Makefile.in		patch \| blob \| blame \| history
samples/minifram/Makefile.in		patch \| blob \| blame \| history
samples/minimal/Makefile.in		patch \| blob \| blame \| history
samples/mobile/styles/Makefile.in		patch \| blob \| blame \| history
samples/mobile/wxedit/Makefile.in		patch \| blob \| blame \| history
samples/multimon/Makefile.in		patch \| blob \| blame \| history
samples/nativdlg/Makefile.in		patch \| blob \| blame \| history
samples/notebook/Makefile.in		patch \| blob \| blame \| history
samples/oleauto/Makefile.in		patch \| blob \| blame \| history
samples/opengl/cube/Makefile.in		patch \| blob \| blame \| history
samples/opengl/isosurf/Makefile.in		patch \| blob \| blame \| history
samples/opengl/penguin/Makefile.in		patch \| blob \| blame \| history
samples/ownerdrw/Makefile.in		patch \| blob \| blame \| history
samples/png/Makefile.in		patch \| blob \| blame \| history
samples/printing/Makefile.in		patch \| blob \| blame \| history
samples/propsize/Makefile.in		patch \| blob \| blame \| history
samples/regtest/Makefile.in		patch \| blob \| blame \| history
samples/render/Makefile.in		patch \| blob \| blame \| history
samples/richedit/Makefile.in		patch \| blob \| blame \| history
samples/rotate/Makefile.in		patch \| blob \| blame \| history
samples/sashtest/Makefile.in		patch \| blob \| blame \| history
samples/scroll/Makefile.in		patch \| blob \| blame \| history
samples/scrollsub/Makefile.in		patch \| blob \| blame \| history
samples/shaped/Makefile.in		patch \| blob \| blame \| history
samples/sockets/Makefile.in		patch \| blob \| blame \| history
samples/sound/Makefile.in		patch \| blob \| blame \| history
samples/splash/Makefile.in		patch \| blob \| blame \| history
samples/splitter/Makefile.in		patch \| blob \| blame \| history
samples/statbar/Makefile.in		patch \| blob \| blame \| history
samples/stc/Makefile.in		patch \| blob \| blame \| history
samples/svg/Makefile.in		patch \| blob \| blame \| history
samples/tab/Makefile.in		patch \| blob \| blame \| history
samples/taskbar/Makefile.in		patch \| blob \| blame \| history
samples/text/Makefile.in		patch \| blob \| blame \| history
samples/thread/Makefile.in		patch \| blob \| blame \| history
samples/toolbar/Makefile.in		patch \| blob \| blame \| history
samples/treectrl/Makefile.in		patch \| blob \| blame \| history
samples/typetest/Makefile.in		patch \| blob \| blame \| history
samples/validate/Makefile.in		patch \| blob \| blame \| history
samples/vscroll/Makefile.in		patch \| blob \| blame \| history
samples/widgets/Makefile.in		patch \| blob \| blame \| history
samples/wizard/Makefile.in		patch \| blob \| blame \| history
samples/xrc/Makefile.in		patch \| blob \| blame \| history
src/stc/Makefile.in		patch \| blob \| blame \| history
tests/Makefile.in		patch \| blob \| blame \| history
utils/HelpGen/src/Makefile.in		patch \| blob \| blame \| history
utils/configtool/src/Makefile.in		patch \| blob \| blame \| history
utils/emulator/src/Makefile.in		patch \| blob \| blame \| history
utils/helpview/src/Makefile.in		patch \| blob \| blame \| history
utils/hhp2cached/Makefile.in		patch \| blob \| blame \| history
utils/tex2rtf/src/Makefile.in		patch \| blob \| blame \| history
utils/wxrc/Makefile.in		patch \| blob \| blame \| history