don't link wxBase against GUI libraries

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in
index 8e92211ef0f8e278a52980a35fb8c575a88449eb..6936572929d8b2e5d7e563d172c0f6e4acfba3de 100644 (file)
--- a/contrib/src/gizmos/Makefile.in
+++ b/contrib/src/gizmos/Makefile.in
@@ -16,6 +16,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 DLLPREFIX = @DLLPREFIX@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_DIR = @INSTALL_DIR@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -115,7 +116,7 @@ distclean: clean
        rm -f bk-deps shared-ld-sh
 
 @COND_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3): gizmosdll_dynamicsash.o gizmosdll_editlbox.o gizmosdll_ledctrl.o gizmosdll_multicell.o gizmosdll_splittree.o gizmosdll_statpict.o
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@  gizmosdll_dynamicsash.o gizmosdll_editlbox.o gizmosdll_ledctrl.o gizmosdll_multicell.o gizmosdll_splittree.o gizmosdll_statpict.o $(LDFLAGS) $(__gizmosdll___importlib)   -L$(top_builddir)lib $(__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) $(EXTRALIBS) $(__WXLIB_CORE_p)
+@COND_SHARED_1@        $(SHARED_LD_CXX) $@  gizmosdll_dynamicsash.o gizmosdll_editlbox.o gizmosdll_ledctrl.o gizmosdll_multicell.o gizmosdll_splittree.o gizmosdll_statpict.o $(LDFLAGS) $(__gizmosdll___importlib)   -L$(top_builddir)lib $(__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) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p)
 @COND_SHARED_1@        $(__gizmosdll___so_symlinks_cmd)
 
 gizmosdll_dynamicsash.o: $(srcdir)/dynamicsash.cpp

diff --git a/contrib/src/stc/Makefile.in b/contrib/src/stc/Makefile.in
index 736eb9752a797ac0e8dd4da8d90ad694d162e27e..6d3ac72f9ed44b19e68c1d87fe9691eb79193072 100644 (file)
--- a/contrib/src/stc/Makefile.in
+++ b/contrib/src/stc/Makefile.in
@@ -16,6 +16,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 DLLPREFIX = @DLLPREFIX@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_DIR = @INSTALL_DIR@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -139,7 +140,7 @@ install-strip: install
 @COND_SHARED_0@        $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5.a $(libdir)
 
 @COND_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): stcdll_PlatWX.o stcdll_ScintillaWX.o stcdll_stc.o stcdll_AutoComplete.o stcdll_CallTip.o stcdll_CellBuffer.o stcdll_ContractionState.o stcdll_Document.o stcdll_DocumentAccessor.o stcdll_Editor.o stcdll_Indicator.o stcdll_KeyMap.o stcdll_KeyWords.o stcdll_LexAVE.o stcdll_LexAda.o stcdll_LexAsm.o stcdll_LexBaan.o stcdll_LexBullant.o stcdll_LexCPP.o stcdll_LexCSS.o stcdll_LexConf.o stcdll_LexCrontab.o stcdll_LexEiffel.o stcdll_LexFortran.o stcdll_LexHTML.o stcdll_LexLisp.o stcdll_LexLua.o stcdll_LexMatlab.o stcdll_LexOthers.o stcdll_LexPOV.o stcdll_LexPascal.o stcdll_LexPerl.o stcdll_LexPython.o stcdll_LexRuby.o stcdll_LexSQL.o stcdll_LexVB.o stcdll_LineMarker.o stcdll_PropSet.o stcdll_RESearch.o stcdll_ScintillaBase.o stcdll_Style.o stcdll_StyleContext.o stcdll_UniConversion.o stcdll_ViewStyle.o stcdll_WindowAccessor.o stcdll_XPM.o
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@  stcdll_PlatWX.o stcdll_ScintillaWX.o stcdll_stc.o stcdll_AutoComplete.o stcdll_CallTip.o stcdll_CellBuffer.o stcdll_ContractionState.o stcdll_Document.o stcdll_DocumentAccessor.o stcdll_Editor.o stcdll_Indicator.o stcdll_KeyMap.o stcdll_KeyWords.o stcdll_LexAVE.o stcdll_LexAda.o stcdll_LexAsm.o stcdll_LexBaan.o stcdll_LexBullant.o stcdll_LexCPP.o stcdll_LexCSS.o stcdll_LexConf.o stcdll_LexCrontab.o stcdll_LexEiffel.o stcdll_LexFortran.o stcdll_LexHTML.o stcdll_LexLisp.o stcdll_LexLua.o stcdll_LexMatlab.o stcdll_LexOthers.o stcdll_LexPOV.o stcdll_LexPascal.o stcdll_LexPerl.o stcdll_LexPython.o stcdll_LexRuby.o stcdll_LexSQL.o stcdll_LexVB.o stcdll_LineMarker.o stcdll_PropSet.o stcdll_RESearch.o stcdll_ScintillaBase.o stcdll_Style.o stcdll_StyleContext.o stcdll_UniConversion.o stcdll_ViewStyle.o stcdll_WindowAccessor.o stcdll_XPM.o $(LDFLAGS) $(__stcdll___importlib)   -L$(top_builddir)lib $(__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) $(EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
+@COND_SHARED_1@        $(SHARED_LD_CXX) $@  stcdll_PlatWX.o stcdll_ScintillaWX.o stcdll_stc.o stcdll_AutoComplete.o stcdll_CallTip.o stcdll_CellBuffer.o stcdll_ContractionState.o stcdll_Document.o stcdll_DocumentAccessor.o stcdll_Editor.o stcdll_Indicator.o stcdll_KeyMap.o stcdll_KeyWords.o stcdll_LexAVE.o stcdll_LexAda.o stcdll_LexAsm.o stcdll_LexBaan.o stcdll_LexBullant.o stcdll_LexCPP.o stcdll_LexCSS.o stcdll_LexConf.o stcdll_LexCrontab.o stcdll_LexEiffel.o stcdll_LexFortran.o stcdll_LexHTML.o stcdll_LexLisp.o stcdll_LexLua.o stcdll_LexMatlab.o stcdll_LexOthers.o stcdll_LexPOV.o stcdll_LexPascal.o stcdll_LexPerl.o stcdll_LexPython.o stcdll_LexRuby.o stcdll_LexSQL.o stcdll_LexVB.o stcdll_LineMarker.o stcdll_PropSet.o stcdll_RESearch.o stcdll_ScintillaBase.o stcdll_Style.o stcdll_StyleContext.o stcdll_UniConversion.o stcdll_ViewStyle.o stcdll_WindowAccessor.o stcdll_XPM.o $(LDFLAGS) $(__stcdll___importlib)   -L$(top_builddir)lib $(__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) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
 @COND_SHARED_1@        $(__stcdll___so_symlinks_cmd)
 
 stcdll_AutoComplete.o: $(srcdir)/scintilla/src/AutoComplete.cxx

diff --git a/contrib/src/xrc/Makefile.in b/contrib/src/xrc/Makefile.in
index 8facb62562386f1bc6a3963a78e0b9cf665ca3a8..d69453304a94a14bbe1edfb72896d22315179d26 100644 (file)
--- a/contrib/src/xrc/Makefile.in
+++ b/contrib/src/xrc/Makefile.in
@@ -18,6 +18,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 DLLPREFIX = @DLLPREFIX@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_DIR = @INSTALL_DIR@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -148,7 +149,7 @@ install-strip: install
 uninstall: 
 
 @COND_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): xrcdll_xmlparse.o xrcdll_xmltok.o xrcdll_xmlrole.o xrcdll_xml.o xrcdll_xmlres.o xrcdll_xh_bmp.o xrcdll_xh_bmpbt.o xrcdll_xh_bttn.o xrcdll_xh_cald.o xrcdll_xh_chckb.o xrcdll_xh_chckl.o xrcdll_xh_choic.o xrcdll_xh_combo.o xrcdll_xh_dlg.o xrcdll_xh_frame.o xrcdll_xh_gauge.o xrcdll_xh_gdctl.o xrcdll_xh_html.o xrcdll_xh_listb.o xrcdll_xh_listc.o xrcdll_xh_menu.o xrcdll_xh_notbk.o xrcdll_xh_panel.o xrcdll_xh_radbt.o xrcdll_xh_radbx.o xrcdll_xh_scrol.o xrcdll_xh_scwin.o xrcdll_xh_sizer.o xrcdll_xh_slidr.o xrcdll_xh_spin.o xrcdll_xh_split.o xrcdll_xh_stbmp.o xrcdll_xh_stbox.o xrcdll_xh_stlin.o xrcdll_xh_sttxt.o xrcdll_xh_text.o xrcdll_xh_toolb.o xrcdll_xh_tree.o xrcdll_xh_unkwn.o xrcdll_xh_wizrd.o xrcdll_xmlrsall.o
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@  xrcdll_xmlparse.o xrcdll_xmltok.o xrcdll_xmlrole.o xrcdll_xml.o xrcdll_xmlres.o xrcdll_xh_bmp.o xrcdll_xh_bmpbt.o xrcdll_xh_bttn.o xrcdll_xh_cald.o xrcdll_xh_chckb.o xrcdll_xh_chckl.o xrcdll_xh_choic.o xrcdll_xh_combo.o xrcdll_xh_dlg.o xrcdll_xh_frame.o xrcdll_xh_gauge.o xrcdll_xh_gdctl.o xrcdll_xh_html.o xrcdll_xh_listb.o xrcdll_xh_listc.o xrcdll_xh_menu.o xrcdll_xh_notbk.o xrcdll_xh_panel.o xrcdll_xh_radbt.o xrcdll_xh_radbx.o xrcdll_xh_scrol.o xrcdll_xh_scwin.o xrcdll_xh_sizer.o xrcdll_xh_slidr.o xrcdll_xh_spin.o xrcdll_xh_split.o xrcdll_xh_stbmp.o xrcdll_xh_stbox.o xrcdll_xh_stlin.o xrcdll_xh_sttxt.o xrcdll_xh_text.o xrcdll_xh_toolb.o xrcdll_xh_tree.o xrcdll_xh_unkwn.o xrcdll_xh_wizrd.o xrcdll_xmlrsall.o $(LDFLAGS) $(__xrcdll___importlib)   -L$(top_builddir)lib $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(__xrcdll___macver)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
+@COND_SHARED_1@        $(SHARED_LD_CXX) $@  xrcdll_xmlparse.o xrcdll_xmltok.o xrcdll_xmlrole.o xrcdll_xml.o xrcdll_xmlres.o xrcdll_xh_bmp.o xrcdll_xh_bmpbt.o xrcdll_xh_bttn.o xrcdll_xh_cald.o xrcdll_xh_chckb.o xrcdll_xh_chckl.o xrcdll_xh_choic.o xrcdll_xh_combo.o xrcdll_xh_dlg.o xrcdll_xh_frame.o xrcdll_xh_gauge.o xrcdll_xh_gdctl.o xrcdll_xh_html.o xrcdll_xh_listb.o xrcdll_xh_listc.o xrcdll_xh_menu.o xrcdll_xh_notbk.o xrcdll_xh_panel.o xrcdll_xh_radbt.o xrcdll_xh_radbx.o xrcdll_xh_scrol.o xrcdll_xh_scwin.o xrcdll_xh_sizer.o xrcdll_xh_slidr.o xrcdll_xh_spin.o xrcdll_xh_split.o xrcdll_xh_stbmp.o xrcdll_xh_stbox.o xrcdll_xh_stlin.o xrcdll_xh_sttxt.o xrcdll_xh_text.o xrcdll_xh_toolb.o xrcdll_xh_tree.o xrcdll_xh_unkwn.o xrcdll_xh_wizrd.o xrcdll_xmlrsall.o $(LDFLAGS) $(__xrcdll___importlib)   -L$(top_builddir)lib $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(__xrcdll___macver)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
 @COND_SHARED_1@        $(__xrcdll___so_symlinks_cmd)
 
 xrcdll_xh_bmp.o: $(srcdir)/xh_bmp.cpp

diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in
index a8b9dde40cf7373207b1d7e672e252013571e60a..fbe8549b290abb39f794b007c1f3cece1b15d39f 100644 (file)
--- a/samples/access/Makefile.in
+++ b/samples/access/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -84,7 +85,7 @@ ACCESSTEST_CXXFLAGS = $(CPPFLAGS)   -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I
 all: accesstest$(EXEEXT)
 
 accesstest$(EXEEXT): accesstest_accesstest.o $(__accesstest___win32rc)
-       $(CXX) -o $@  accesstest_accesstest.o $(__accesstest___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  accesstest_accesstest.o $(__accesstest___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__accesstest___mac_rezcmd)
        $(__accesstest___mac_setfilecmd)
 

diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in
index ba240c3c2e4f00a4ce79c4f01597a704cd751874..0f1838fe375b51a1a1aead68853899381fd5b4c4 100644 (file)
--- a/samples/artprov/Makefile.in
+++ b/samples/artprov/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -84,7 +85,7 @@ ARTTEST_CXXFLAGS = $(CPPFLAGS)   -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(t
 all: arttest$(EXEEXT)
 
 arttest$(EXEEXT): arttest_arttest.o arttest_artbrows.o $(__arttest___win32rc)
-       $(CXX) -o $@  arttest_arttest.o arttest_artbrows.o $(__arttest___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  arttest_arttest.o arttest_artbrows.o $(__arttest___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__arttest___mac_rezcmd)
        $(__arttest___mac_setfilecmd)
 

diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in
index 39ec51b67a31a3eb5a1194f38c8fa5e785293f21..8d9f8490f794eedb24aa9e11cca62ece2a4e9689 100644 (file)
--- a/samples/calendar/Makefile.in
+++ b/samples/calendar/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -84,7 +85,7 @@ CALENDAR_CXXFLAGS = $(CPPFLAGS)   -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(
 all: calendar$(EXEEXT)
 
 calendar$(EXEEXT): calendar_calendar.o $(__calendar___win32rc)
-       $(CXX) -o $@  calendar_calendar.o $(__calendar___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  calendar_calendar.o $(__calendar___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__calendar___mac_rezcmd)
        $(__calendar___mac_setfilecmd)
 

diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in
index 9af9b20dbfa511b051f4267f72796d63b4d0ee4f..737be45e0009b18de2a7d8a3e6d8d8a725cffe3d 100644 (file)
--- a/samples/caret/Makefile.in
+++ b/samples/caret/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -84,7 +85,7 @@ CARET_CXXFLAGS = $(CPPFLAGS)   -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top
 all: caret$(EXEEXT)
 
 caret$(EXEEXT): caret_caret.o $(__caret___win32rc)
-       $(CXX) -o $@  caret_caret.o $(__caret___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  caret_caret.o $(__caret___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__caret___mac_rezcmd)
        $(__caret___mac_setfilecmd)
 

diff --git a/samples/checklst/Makefile.in b/samples/checklst/Makefile.in
index 83bf5c419c64e93f50c5fb0cd2d41505da8ff17e..dfe3895433a043c036b87e34b6ea16580a042600 100644 (file)
--- a/samples/checklst/Makefile.in
+++ b/samples/checklst/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -84,7 +85,7 @@ CHECKLST_CXXFLAGS = $(CPPFLAGS)   -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(
 all: checklst$(EXEEXT)
 
 checklst$(EXEEXT): checklst_checklst.o $(__checklst___win32rc)
-       $(CXX) -o $@  checklst_checklst.o $(__checklst___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  checklst_checklst.o $(__checklst___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__checklst___mac_rezcmd)
        $(__checklst___mac_setfilecmd)
 

diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in
index 06bd3fa815472d123eaaeaaa000a5309c1907e6b..9474186548227877b6491d91035838f353cded55 100644 (file)
--- a/samples/config/Makefile.in
+++ b/samples/config/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -89,7 +90,7 @@ clean:
        rm -f conftest$(EXEEXT)
 
 conftest$(EXEEXT): conftest_conftest.o $(__conftest___win32rc)
-       $(CXX) -o $@  conftest_conftest.o $(__conftest___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  conftest_conftest.o $(__conftest___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__conftest___mac_rezcmd)
        $(__conftest___mac_setfilecmd)
 

diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in
index 2a9cfeb9294b69975310d1343c09adfa188d0fc7..c50764bb3493fddc9f139e1795028ccfa66baed2 100644 (file)
--- a/samples/console/Makefile.in
+++ b/samples/console/Makefile.in
@@ -66,7 +66,6 @@ clean:
        rm -rf ./.deps
        rm -f -f ./*.o
        rm -f console$(EXEEXT)
-       rm -f ./testdata.fc
 
 console$(EXEEXT): console_console.o
        $(CXX) -o $@  console_console.o $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG)   $(__WXLIB_MONO_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)

diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in
index cebd8cacc95bb441a20e2bd0d21dea0f9606ec97..bee2a0709ba5768ac4cd9fcd41ecdad000b5de67 100644 (file)
--- a/samples/controls/Makefile.in
+++ b/samples/controls/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -89,7 +90,7 @@ clean:
        rm -f controls$(EXEEXT)
 
 controls$(EXEEXT): controls_controls.o $(__controls___win32rc)
-       $(CXX) -o $@  controls_controls.o $(__controls___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  controls_controls.o $(__controls___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__controls___mac_rezcmd)
        $(__controls___mac_setfilecmd)
 

diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in
index e25fdd6c754920453ceb62ecac47d5ec26beb3b7..cd9faf06b8e20798feac5331a824c3b02dfa43eb 100644 (file)
--- a/samples/db/Makefile.in
+++ b/samples/db/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -89,7 +90,7 @@ clean:
        rm -f dbtest$(EXEEXT)
 
 dbtest$(EXEEXT): dbtest_dbtest.o dbtest_listdb.o $(__dbtest___win32rc)
-       $(CXX) -o $@  dbtest_dbtest.o dbtest_listdb.o $(__dbtest___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  dbtest_dbtest.o dbtest_listdb.o $(__dbtest___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__dbtest___mac_rezcmd)
        $(__dbtest___mac_setfilecmd)
 

diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in
index ae48c80ca9a41f2a72ed61f630e0eb262b64110c..a0af6ec53af67a9e7a735942895df2e945cdbca3 100644 (file)
--- a/samples/dialogs/Makefile.in
+++ b/samples/dialogs/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -87,7 +88,6 @@ clean:
        rm -rf ./.deps
        rm -f -f ./*.o
        rm -f dialogs$(EXEEXT)
-       rm -f ./tips.txt
 
 data: 
        @mkdir -p .
@@ -98,7 +98,7 @@ data:
        done
 
 dialogs$(EXEEXT): dialogs_dialogs.o $(__dialogs___win32rc)
-       $(CXX) -o $@  dialogs_dialogs.o $(__dialogs___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  dialogs_dialogs.o $(__dialogs___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__dialogs___mac_rezcmd)
        $(__dialogs___mac_setfilecmd)
 

diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in
index cc0bdb5d5dd8b0db458985a10fdafbf88b671f46..f122934763e61cfd795c90c9f8ce010ed76fa308 100644 (file)
--- a/samples/dialup/Makefile.in
+++ b/samples/dialup/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 nettest$(EXEEXT): nettest_nettest.o $(__nettest___win32rc)
-       $(CXX) -o $@  nettest_nettest.o $(__nettest___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  nettest_nettest.o $(__nettest___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__nettest___mac_rezcmd)
        $(__nettest___mac_setfilecmd)
 

diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in
index bc5bc8800c63ab786af729ac1756f7145455ec16..bf730395df89837c58fcc459bea16e215e5a8187 100644 (file)
--- a/samples/display/Makefile.in
+++ b/samples/display/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -80,7 +81,7 @@ clean:
        rm -f display$(EXEEXT)
 
 display$(EXEEXT): display_display.o
-       $(CXX) -o $@  display_display.o $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  display_display.o $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__display___mac_rezcmd)
        $(__display___mac_setfilecmd)
 

diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in
index c9db4f87af3c6954287fc3359ecf0500fd8929bb..6c08bbabed8699eadf49b02b95c6194780cda567 100644 (file)
--- a/samples/dnd/Makefile.in
+++ b/samples/dnd/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -87,7 +88,6 @@ clean:
        rm -rf ./.deps
        rm -f -f ./*.o
        rm -f dnd$(EXEEXT)
-       rm -f ./julian.png ./dnd.wxr
 
 data: 
        @mkdir -p .
@@ -102,7 +102,7 @@ distclean: clean
        rm -f bk-deps shared-ld-sh
 
 dnd$(EXEEXT): dnd_dnd.o $(__dnd___win32rc)
-       $(CXX) -o $@  dnd_dnd.o $(__dnd___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  dnd_dnd.o $(__dnd___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__dnd___mac_rezcmd)
        $(__dnd___mac_setfilecmd)
 

diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in
index 7a5ccd1b613f7916c4e0e9acbe1496ae14eabd6c..4ee4161fc9805ed65dafd8969e2496732c6dee69 100644 (file)
--- a/samples/docview/Makefile.in
+++ b/samples/docview/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -93,7 +94,7 @@ distclean: clean
        rm -f bk-deps shared-ld-sh
 
 docview$(EXEEXT): docview_docview.o docview_doc.o docview_view.o $(__docview___win32rc)
-       $(CXX) -o $@  docview_docview.o docview_doc.o docview_view.o $(__docview___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  docview_docview.o docview_doc.o docview_view.o $(__docview___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__docview___mac_rezcmd)
        $(__docview___mac_setfilecmd)
 

diff --git a/samples/docvwmdi/Makefile.in b/samples/docvwmdi/Makefile.in
index ebfd107038b23c4131e4f2717959a9881f2a45fa..e1eae71ee26acbbde28cfac4d69aa16d0ba72082 100644 (file)
--- a/samples/docvwmdi/Makefile.in
+++ b/samples/docvwmdi/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -93,7 +94,7 @@ distclean: clean
        rm -f bk-deps shared-ld-sh
 
 docview$(EXEEXT): docview_docview.o docview_doc.o docview_view.o $(__docview___win32rc)
-       $(CXX) -o $@  docview_docview.o docview_doc.o docview_view.o $(__docview___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  docview_docview.o docview_doc.o docview_view.o $(__docview___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__docview___mac_rezcmd)
        $(__docview___mac_setfilecmd)
 

diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in
index b7039000d3f48c9cf70a2422ec3d035980cd4e8a..7d0b08484444464dffcc41f378721b397b75cada 100644 (file)
--- a/samples/dragimag/Makefile.in
+++ b/samples/dragimag/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -87,7 +88,6 @@ clean:
        rm -rf ./.deps
        rm -f -f ./*.o
        rm -f dragimag$(EXEEXT)
-       rm -f ./backgrnd.png ./shape01.png ./shape02.png ./shape03.png
 
 data: 
        @mkdir -p .
@@ -102,7 +102,7 @@ distclean: clean
        rm -f bk-deps shared-ld-sh
 
 dragimag$(EXEEXT): dragimag_dragimag.o $(__dragimag___win32rc)
-       $(CXX) -o $@  dragimag_dragimag.o $(__dragimag___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  dragimag_dragimag.o $(__dragimag___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__dragimag___mac_rezcmd)
        $(__dragimag___mac_setfilecmd)
 

diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in
index 63b54bb7ececae6703182df5096d35b31a234ec4..3b5c9d8fbb9f0df712813c51d2a6d7f9043a2c8b 100644 (file)
--- a/samples/drawing/Makefile.in
+++ b/samples/drawing/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -87,7 +88,6 @@ clean:
        rm -rf ./.deps
        rm -f -f ./*.o
        rm -f drawing$(EXEEXT)
-       rm -f ./pat4.bmp ./pat35.bmp ./pat36.bmp ./image.bmp ./mask.bmp
 
 data: 
        @mkdir -p .
@@ -102,7 +102,7 @@ distclean: clean
        rm -f bk-deps shared-ld-sh
 
 drawing$(EXEEXT): drawing_drawing.o $(__drawing___win32rc)
-       $(CXX) -o $@  drawing_drawing.o $(__drawing___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  drawing_drawing.o $(__drawing___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__drawing___mac_rezcmd)
        $(__drawing___mac_setfilecmd)
 

diff --git a/samples/dynamic/Makefile.in b/samples/dynamic/Makefile.in
index a1e17f2bd318544baa07cf0db9936f942494b062..03262c46253b647c40ba78b2dffe089f7457a908 100644 (file)
--- a/samples/dynamic/Makefile.in
+++ b/samples/dynamic/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -93,7 +94,7 @@ distclean: clean
        rm -f bk-deps shared-ld-sh
 
 dynamic$(EXEEXT): dynamic_dynamic.o $(__dynamic___win32rc)
-       $(CXX) -o $@  dynamic_dynamic.o $(__dynamic___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  dynamic_dynamic.o $(__dynamic___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__dynamic___mac_rezcmd)
        $(__dynamic___mac_setfilecmd)
 

diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in
index 1bdb38418142196df02ed3a29c2f5fc62b040676..4c87694654cd8aed3e9f1fa802f1573a42e37c45 100644 (file)
--- a/samples/erase/Makefile.in
+++ b/samples/erase/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -93,7 +94,7 @@ distclean: clean
        rm -f bk-deps shared-ld-sh
 
 erase$(EXEEXT): erase_erase.o $(__erase___win32rc)
-       $(CXX) -o $@  erase_erase.o $(__erase___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  erase_erase.o $(__erase___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__erase___mac_rezcmd)
        $(__erase___mac_setfilecmd)
 

diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in
index fe3d52f5ba23cf9616ee5bf9b2a1d50a1b120deb..33fda99857a2b1c22928139d6b1dd71e27ed86fe 100644 (file)
--- a/samples/event/Makefile.in
+++ b/samples/event/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -93,7 +94,7 @@ distclean: clean
        rm -f bk-deps shared-ld-sh
 
 event$(EXEEXT): event_event.o $(__event___win32rc)
-       $(CXX) -o $@  event_event.o $(__event___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  event_event.o $(__event___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__event___mac_rezcmd)
        $(__event___mac_setfilecmd)
 

diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in
index 6788d303a0af7b11b477b6fb104c1d3bc5bf8411..8a33fb14a5b8f5185ed5a7d8b3777c1fa3d5456e 100644 (file)
--- a/samples/exec/Makefile.in
+++ b/samples/exec/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -93,7 +94,7 @@ distclean: clean
        rm -f bk-deps shared-ld-sh
 
 exec$(EXEEXT): exec_exec.o $(__exec___win32rc)
-       $(CXX) -o $@  exec_exec.o $(__exec___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  exec_exec.o $(__exec___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__exec___mac_rezcmd)
        $(__exec___mac_setfilecmd)
 

diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in
index 074a7c51dccc8c1a3d64fbbe9283b9b60e8a41cc..2ed71012f7639e90bb2687a8722439c295f5740b 100644 (file)
--- a/samples/font/Makefile.in
+++ b/samples/font/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -93,7 +94,7 @@ distclean: clean
        rm -f bk-deps shared-ld-sh
 
 font$(EXEEXT): font_font.o $(__font___win32rc)
-       $(CXX) -o $@  font_font.o $(__font___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  font_font.o $(__font___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__font___mac_rezcmd)
        $(__font___mac_setfilecmd)
 

diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in
index 1a7da54b9163b8cfece72e16fbcfe04c2c33be9c..0bd4bcc7e9e39b9a2aec32c1370fa0352144f8be 100644 (file)
--- a/samples/grid/Makefile.in
+++ b/samples/grid/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -93,7 +94,7 @@ distclean: clean
        rm -f bk-deps shared-ld-sh
 
 grid$(EXEEXT): grid_griddemo.o $(__grid___win32rc)
-       $(CXX) -o $@  grid_griddemo.o $(__grid___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  grid_griddemo.o $(__grid___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__grid___mac_rezcmd)
        $(__grid___mac_setfilecmd)
 

diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in
index f919050b75aedf8a4c61742cac9290fe24b1d3c1..c4332511708fb5320a60892e1528a9346aa06e2a 100644 (file)
--- a/samples/help/Makefile.in
+++ b/samples/help/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -93,7 +94,7 @@ distclean: clean
        rm -f bk-deps shared-ld-sh
 
 help$(EXEEXT): help_demo.o $(__help___win32rc)
-       $(CXX) -o $@  help_demo.o $(__help___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  help_demo.o $(__help___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__help___mac_rezcmd)
        $(__help___mac_setfilecmd)
 

diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in
index 05be5f76bd9cac1724f48d0e984d3da88f0dcb8b..45790d2c41dc318c854788d4a4496babb39daebd 100644 (file)
--- a/samples/htlbox/Makefile.in
+++ b/samples/htlbox/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -94,7 +95,7 @@ distclean: clean
        rm -f bk-deps shared-ld-sh
 
 htlbox$(EXEEXT): htlbox_htlbox.o $(__htlbox___win32rc)
-       $(CXX) -o $@  htlbox_htlbox.o $(__htlbox___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  htlbox_htlbox.o $(__htlbox___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__htlbox___mac_rezcmd)
        $(__htlbox___mac_setfilecmd)
 

diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in
index 3f3fc3599f8d33dafe5dcb769d64af3125cba1f0..e579694f6f6f3bdfb5e73d41e1ab3c8b86405150 100644 (file)
--- a/samples/html/about/Makefile.in
+++ b/samples/html/about/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -85,7 +86,7 @@ ABOUT_CXXFLAGS = $(CPPFLAGS)   -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top
 all: about$(EXEEXT) data
 
 about$(EXEEXT): about_about.o $(__about___win32rc)
-       $(CXX) -o $@  about_about.o $(__about___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  about_about.o $(__about___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__about___mac_rezcmd)
        $(__about___mac_setfilecmd)
 
@@ -99,7 +100,6 @@ clean:
        rm -rf ./.deps
        rm -f -f ./*.o
        rm -f about$(EXEEXT)
-       rm -f ./about.htm ./logo.png
 
 data: 
        @mkdir -p ./data

diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in
index ebba065e560ae46c0fbd158b5f47b4691d5317a4..fa700b7321e089a4225bfd0ab38331f92494e9b4 100644 (file)
--- a/samples/html/help/Makefile.in
+++ b/samples/html/help/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -88,7 +89,6 @@ clean:
        rm -rf ./.deps
        rm -f -f ./*.o
        rm -f help$(EXEEXT)
-       rm -f ./Index.hhk ./another.hhc ./another.hhp ./another.htm ./book1.htm ./book2.htm ./contents.hhc ./main.htm ./page2-b.htm ./testing.hhp
 
 data: 
        @mkdir -p ./helpfiles
@@ -103,7 +103,7 @@ distclean: clean
        rm -f bk-deps shared-ld-sh
 
 help$(EXEEXT): help_help.o $(__help___win32rc)
-       $(CXX) -o $@  help_help.o $(__help___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  help_help.o $(__help___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__help___mac_rezcmd)
        $(__help___mac_setfilecmd)
 

diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in
index d36823a6438f520ce1292f310acf84fca1ba013e..5827acbcfeb391129cf99b76f2db084612620da5 100644 (file)
--- a/samples/html/helpview/Makefile.in
+++ b/samples/html/helpview/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -88,7 +89,6 @@ clean:
        rm -rf ./.deps
        rm -f -f ./*.o
        rm -f helpview$(EXEEXT)
-       rm -f ./test.zip
 
 data: 
        @mkdir -p .
@@ -103,7 +103,7 @@ distclean: clean
        rm -f bk-deps shared-ld-sh
 
 helpview$(EXEEXT): helpview_helpview.o $(__helpview___win32rc)
-       $(CXX) -o $@  helpview_helpview.o $(__helpview___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  helpview_helpview.o $(__helpview___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__helpview___mac_rezcmd)
        $(__helpview___mac_setfilecmd)
 

diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in
index d4ae007dbf75833380cad3fa6b119b6e72ad19b0..0ea7ce58cc00fae13b54d239c36d055a1fceb00c 100644 (file)
--- a/samples/html/printing/Makefile.in
+++ b/samples/html/printing/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -88,7 +89,6 @@ clean:
        rm -rf ./.deps
        rm -f -f ./*.o
        rm -f printing$(EXEEXT)
-       rm -f ./logo6.gif ./test.htm
 
 data: 
        @mkdir -p .
@@ -107,7 +107,7 @@ install: all
 install-strip: install
 
 printing$(EXEEXT): printing_printing.o $(__printing___win32rc)
-       $(CXX) -o $@  printing_printing.o $(__printing___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  printing_printing.o $(__printing___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__printing___mac_rezcmd)
        $(__printing___mac_setfilecmd)
 

diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in
index 2716bb15cb3fc36e70ad76d64f69db659d556838..5274a50147bf2d11a611a800f7f52d650a7fa401 100644 (file)
--- a/samples/html/test/Makefile.in
+++ b/samples/html/test/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -88,7 +89,6 @@ clean:
        rm -rf ./.deps
        rm -f -f ./*.o
        rm -f test$(EXEEXT)
-       rm -f ./f.html ./fft.html ./imagemap.htm ./imagemap.png ./pic.png ./pic2.bmp ./tables.htm ./test.htm ./i18n.gif ./8859_2.htm ./cp1250.htm ./regres.htm
 
 data: 
        @mkdir -p .
@@ -107,7 +107,7 @@ install: all
 install-strip: install
 
 test$(EXEEXT): test_test.o $(__test___win32rc)
-       $(CXX) -o $@  test_test.o $(__test___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  test_test.o $(__test___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__test___mac_rezcmd)
        $(__test___mac_setfilecmd)
 

diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in
index 44a48bdfee7e7af0540e7cc03b56d7d9942242bb..fa5d98489fc9d19569280b811195846f82c27e26 100644 (file)
--- a/samples/html/virtual/Makefile.in
+++ b/samples/html/virtual/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -88,7 +89,6 @@ clean:
        rm -rf ./.deps
        rm -f -f ./*.o
        rm -f virtual$(EXEEXT)
-       rm -f ./start.htm
 
 data: 
        @mkdir -p .
@@ -109,7 +109,7 @@ install-strip: install
 uninstall: 
 
 virtual$(EXEEXT): virtual_virtual.o $(__virtual___win32rc)
-       $(CXX) -o $@  virtual_virtual.o $(__virtual___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  virtual_virtual.o $(__virtual___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__virtual___mac_rezcmd)
        $(__virtual___mac_setfilecmd)
 

diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in
index 1c6f4ba652c4c61a39ed56cdc8c086cf185e238a..ec4f01a9363dc2623a0b1da446beb58486aa5434 100644 (file)
--- a/samples/html/widget/Makefile.in
+++ b/samples/html/widget/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -88,7 +89,6 @@ clean:
        rm -rf ./.deps
        rm -f -f ./*.o
        rm -f widget$(EXEEXT)
-       rm -f ./start.htm
 
 data: 
        @mkdir -p .
@@ -109,7 +109,7 @@ install-strip: install
 uninstall: 
 
 widget$(EXEEXT): widget_widget.o $(__widget___win32rc)
-       $(CXX) -o $@  widget_widget.o $(__widget___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  widget_widget.o $(__widget___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__widget___mac_rezcmd)
        $(__widget___mac_setfilecmd)
 

diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in
index ef5c51885d18957e82e5ee7006720cbee349f3d3..c0c9a447f3147c44c846894f349d9dfa502b7ffa 100644 (file)
--- a/samples/html/zip/Makefile.in
+++ b/samples/html/zip/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -88,7 +89,6 @@ clean:
        rm -rf ./.deps
        rm -f -f ./*.o
        rm -f zip$(EXEEXT)
-       rm -f ./pages.zip ./start.htm
 
 data: 
        @mkdir -p .
@@ -109,7 +109,7 @@ install-strip: install
 uninstall: 
 
 zip$(EXEEXT): zip_zip.o $(__zip___win32rc)
-       $(CXX) -o $@  zip_zip.o $(__zip___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  zip_zip.o $(__zip___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__zip___mac_rezcmd)
        $(__zip___mac_setfilecmd)
 

diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in
index cb8c8d8ffd6087ab41f9f0eefd8964afb75cb579..eeab5004368e5ef617fefff153e9152cf8e3d982 100644 (file)
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -87,7 +88,6 @@ clean:
        rm -rf ./.deps
        rm -f -f ./*.o
        rm -f image$(EXEEXT)
-       rm -f ./horse.png ./horse.jpg ./horse.bmp ./horse.gif ./horse.pcx ./horse.pnm ./horse.tif ./horse.xpm ./horse.cur ./horse.ico ./horse3.ani ./smile.xbm
 
 data: 
        @mkdir -p .
@@ -102,7 +102,7 @@ distclean: clean
        rm -f bk-deps shared-ld-sh
 
 image$(EXEEXT): image_image.o $(__image___win32rc)
-       $(CXX) -o $@  image_image.o $(__image___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  image_image.o $(__image___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__image___mac_rezcmd)
        $(__image___mac_setfilecmd)
 

diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
index ec6f5e5c8ec3ba4e3fc3dbf4cb7ea9f0aa4d7251..63a0fb3b03d1945b0157b3d60a8986e3d18a1596 100644 (file)
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 internat$(EXEEXT): internat_internat.o $(__internat___win32rc)
-       $(CXX) -o $@  internat_internat.o $(__internat___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  internat_internat.o $(__internat___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__internat___mac_rezcmd)
        $(__internat___mac_setfilecmd)
 

diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in
index 3b6bb18c4778a1afb9ca1c010129d896032d6430..768961e8cfb10bb248558339e83ec6d004aeccd3 100644 (file)
--- a/samples/ipc/Makefile.in
+++ b/samples/ipc/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 ipc$(EXEEXT): ipc_ipc.o $(__ipc___win32rc)
-       $(CXX) -o $@  ipc_ipc.o $(__ipc___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  ipc_ipc.o $(__ipc___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__ipc___mac_rezcmd)
        $(__ipc___mac_setfilecmd)
 

diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in
index 6699c3482df83c9d33e9443354d7eaca966e1ae4..cc5a1ceec9f1936a3832a65bc7df16b100d8e817 100644 (file)
--- a/samples/joytest/Makefile.in
+++ b/samples/joytest/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 joytest$(EXEEXT): joytest_joytest.o $(__joytest___win32rc)
-       $(CXX) -o $@  joytest_joytest.o $(__joytest___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  joytest_joytest.o $(__joytest___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__joytest___mac_rezcmd)
        $(__joytest___mac_setfilecmd)
 

diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in
index bd061c7996654db26b75b19459ebd19bf09c5ef1..019ac514a186500262aaab47e94495163d633602 100644 (file)
--- a/samples/keyboard/Makefile.in
+++ b/samples/keyboard/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 keyboard$(EXEEXT): keyboard_keyboard.o $(__keyboard___win32rc)
-       $(CXX) -o $@  keyboard_keyboard.o $(__keyboard___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  keyboard_keyboard.o $(__keyboard___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__keyboard___mac_rezcmd)
        $(__keyboard___mac_setfilecmd)
 

diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in
index 9d7b0ba3ba555664561332bb9f7e7c345045431b..50ac7ef3005928b295485b7cb4cf6f8a1b8001e3 100644 (file)
--- a/samples/layout/Makefile.in
+++ b/samples/layout/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 layout$(EXEEXT): layout_layout.o $(__layout___win32rc)
-       $(CXX) -o $@  layout_layout.o $(__layout___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  layout_layout.o $(__layout___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__layout___mac_rezcmd)
        $(__layout___mac_setfilecmd)
 

diff --git a/samples/listbox/Makefile.in b/samples/listbox/Makefile.in
index 1feb1fce0cab1921e971a72e333bd8af470c7b3c..2c639f91b98fa9abaa1730f6f24eefb6ea3492f9 100644 (file)
--- a/samples/listbox/Makefile.in
+++ b/samples/listbox/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 listbox$(EXEEXT): listbox_listbox.o $(__listbox___win32rc)
-       $(CXX) -o $@  listbox_listbox.o $(__listbox___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  listbox_listbox.o $(__listbox___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__listbox___mac_rezcmd)
        $(__listbox___mac_setfilecmd)
 

diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in
index 3e9227c994dd7ff30f1e4592be35310bc2936c09..ef55fb46189607fec5bce2fe799c8da0a88e7ec0 100644 (file)
--- a/samples/listctrl/Makefile.in
+++ b/samples/listctrl/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 listctrl$(EXEEXT): listctrl_listtest.o $(__listctrl___win32rc)
-       $(CXX) -o $@  listctrl_listtest.o $(__listctrl___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  listctrl_listtest.o $(__listctrl___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__listctrl___mac_rezcmd)
        $(__listctrl___mac_setfilecmd)
 

diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in
index 9efe3c405f96a75bb252381ec61d849bb10aa008..8a6600a7b0b16c85d91198166c15d2434aa0be06 100644 (file)
--- a/samples/mdi/Makefile.in
+++ b/samples/mdi/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 mdi$(EXEEXT): mdi_mdi.o $(__mdi___win32rc)
-       $(CXX) -o $@  mdi_mdi.o $(__mdi___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  mdi_mdi.o $(__mdi___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__mdi___mac_rezcmd)
        $(__mdi___mac_setfilecmd)
 

diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in
index f354bb1dc908e9621a0e8ede81c4ef6136b0618f..7c9ae5133c0e4349ad83892d22543688c61defe8 100644 (file)
--- a/samples/memcheck/Makefile.in
+++ b/samples/memcheck/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 memcheck$(EXEEXT): memcheck_memcheck.o $(__memcheck___win32rc)
-       $(CXX) -o $@  memcheck_memcheck.o $(__memcheck___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  memcheck_memcheck.o $(__memcheck___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__memcheck___mac_rezcmd)
        $(__memcheck___mac_setfilecmd)
 

diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in
index 547d6fa253312c943f7170a3fcadbbba37a58b74..0a4ca7ca2b3cad8f5a0ed234e8958c09abd6e464 100644 (file)
--- a/samples/menu/Makefile.in
+++ b/samples/menu/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 menu$(EXEEXT): menu_menu.o $(__menu___win32rc)
-       $(CXX) -o $@  menu_menu.o $(__menu___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  menu_menu.o $(__menu___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__menu___mac_rezcmd)
        $(__menu___mac_setfilecmd)
 

diff --git a/samples/mfc/Makefile.in b/samples/mfc/Makefile.in
index d2e493b8cc2813cd6773766924603ae987b9a125..de6ff4ecb75fa19af5bcded06d65a5b9ced8129d 100644 (file)
--- a/samples/mfc/Makefile.in
+++ b/samples/mfc/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 mfc$(EXEEXT): mfc_mfc.o $(__mfc___win32rc)
-       $(CXX) -o $@  mfc_mfc.o $(__mfc___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  mfc_mfc.o $(__mfc___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__mfc___mac_rezcmd)
        $(__mfc___mac_setfilecmd)
 

diff --git a/samples/minifram/Makefile.in b/samples/minifram/Makefile.in
index 221ae01a7112b307f78b8a0177b3168c56741bdd..ff082879ed3722b01e0d2f99ff5785166e5adeae 100644 (file)
--- a/samples/minifram/Makefile.in
+++ b/samples/minifram/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 minifram$(EXEEXT): minifram_minifram.o $(__minifram___win32rc)
-       $(CXX) -o $@  minifram_minifram.o $(__minifram___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  minifram_minifram.o $(__minifram___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__minifram___mac_rezcmd)
        $(__minifram___mac_setfilecmd)
 

diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in
index 9ac39dc6e712839ac02fd7ff6f3b1251442f0f25..348c194303ad0c14b7385fb08b9eac828f63c810 100644 (file)
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 minimal$(EXEEXT): minimal_minimal.o $(__minimal___win32rc)
-       $(CXX) -o $@  minimal_minimal.o $(__minimal___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  minimal_minimal.o $(__minimal___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__minimal___mac_rezcmd)
        $(__minimal___mac_setfilecmd)
 

diff --git a/samples/mobile/Makefile.in b/samples/mobile/Makefile.in
index f98473933f5872b37b5613ee2397da443c611c19..d0810ba0fad27be66a2764679e53aa1cfde648cc 100644 (file)
--- a/samples/mobile/Makefile.in
+++ b/samples/mobile/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 mobile$(EXEEXT): mobile_mobile.o $(__mobile___win32rc)
-       $(CXX) -o $@  mobile_mobile.o $(__mobile___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  mobile_mobile.o $(__mobile___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__mobile___mac_rezcmd)
        $(__mobile___mac_setfilecmd)
 

diff --git a/samples/multimon/Makefile.in b/samples/multimon/Makefile.in
index 59f5e3de6786b5dd5345f620dc68f59e5636ecde..a00358ebe5d0b7a7836ad0752faef9773aa7626a 100644 (file)
--- a/samples/multimon/Makefile.in
+++ b/samples/multimon/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 multimon$(EXEEXT): multimon_multimon.o $(__multimon___win32rc)
-       $(CXX) -o $@  multimon_multimon.o $(__multimon___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  multimon_multimon.o $(__multimon___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__multimon___mac_rezcmd)
        $(__multimon___mac_setfilecmd)
 

diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in
index 926e6fa94b4729996f23bd1805b7cbc22a2345fa..499e55c9a164f1973495073156c200fe97cc788e 100644 (file)
--- a/samples/nativdlg/Makefile.in
+++ b/samples/nativdlg/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 nativdlg$(EXEEXT): nativdlg_nativdlg.o $(__nativdlg___win32rc)
-       $(CXX) -o $@  nativdlg_nativdlg.o $(__nativdlg___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  nativdlg_nativdlg.o $(__nativdlg___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__nativdlg___mac_rezcmd)
        $(__nativdlg___mac_setfilecmd)
 

diff --git a/samples/newgrid/Makefile.in b/samples/newgrid/Makefile.in
index 65898add3e1578aa0a8d98fb4e18d4a0e86732e3..1789ac0e7ab0cf06dbfe489ea0b804e979d66256 100644 (file)
--- a/samples/newgrid/Makefile.in
+++ b/samples/newgrid/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 newgrid$(EXEEXT): newgrid_newgrid.o $(__newgrid___win32rc)
-       $(CXX) -o $@  newgrid_newgrid.o $(__newgrid___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  newgrid_newgrid.o $(__newgrid___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__newgrid___mac_rezcmd)
        $(__newgrid___mac_setfilecmd)
 

diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in
index 6cda3082d2454e602783a4556f8810a75b24f1c8..43996cc8c83860b75cdd97cd08266e357ef6a2fe 100644 (file)
--- a/samples/notebook/Makefile.in
+++ b/samples/notebook/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 notebook$(EXEEXT): notebook_notebook.o $(__notebook___win32rc)
-       $(CXX) -o $@  notebook_notebook.o $(__notebook___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  notebook_notebook.o $(__notebook___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__notebook___mac_rezcmd)
        $(__notebook___mac_setfilecmd)
 

diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in
index 26d163c0a1ea0fc365124922e56ca75e6cb2c502..4f91d37842535fa85784440d63a78efec23a8970 100644 (file)
--- a/samples/oleauto/Makefile.in
+++ b/samples/oleauto/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 oleauto$(EXEEXT): oleauto_oleauto.o $(__oleauto___win32rc)
-       $(CXX) -o $@  oleauto_oleauto.o $(__oleauto___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  oleauto_oleauto.o $(__oleauto___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__oleauto___mac_rezcmd)
        $(__oleauto___mac_setfilecmd)
 

diff --git a/samples/opengl/Makefile.in b/samples/opengl/Makefile.in
index 7884244857b69d411abbd2b4d7924a4e8e283ceb..c3ab152012cd6917df40774774d7f3d89fe71878 100644 (file)
--- a/samples/opengl/Makefile.in
+++ b/samples/opengl/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 opengl$(EXEEXT): opengl_opengl.o $(__opengl___win32rc)
-       $(CXX) -o $@  opengl_opengl.o $(__opengl___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  opengl_opengl.o $(__opengl___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__opengl___mac_rezcmd)
        $(__opengl___mac_setfilecmd)
 

diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in
index bca195bc33af1b61176ed56c824e7f59db8e513e..f531fd2ff8c6abe8c1202b9799c8592e3e1e7e05 100644 (file)
--- a/samples/ownerdrw/Makefile.in
+++ b/samples/ownerdrw/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 ownerdrw$(EXEEXT): ownerdrw_ownerdrw.o $(__ownerdrw___win32rc)
-       $(CXX) -o $@  ownerdrw_ownerdrw.o $(__ownerdrw___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  ownerdrw_ownerdrw.o $(__ownerdrw___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__ownerdrw___mac_rezcmd)
        $(__ownerdrw___mac_setfilecmd)
 

diff --git a/samples/png/Makefile.in b/samples/png/Makefile.in
index dd5240f8be713b242d3f4ec4f3db2dde28350cf2..8ea232deae3960db7dccee7d0d781ac53772a071 100644 (file)
--- a/samples/png/Makefile.in
+++ b/samples/png/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 png$(EXEEXT): png_png.o $(__png___win32rc)
-       $(CXX) -o $@  png_png.o $(__png___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  png_png.o $(__png___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__png___mac_rezcmd)
        $(__png___mac_setfilecmd)
 

diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in
index 798a499ca1564653363b33cd33b2d1b90de7402a..1a12f0890e73d9cf9adc5269c9ff7970367332ca 100644 (file)
--- a/samples/printing/Makefile.in
+++ b/samples/printing/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 printing$(EXEEXT): printing_printing.o $(__printing___win32rc)
-       $(CXX) -o $@  printing_printing.o $(__printing___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  printing_printing.o $(__printing___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__printing___mac_rezcmd)
        $(__printing___mac_setfilecmd)
 

diff --git a/samples/propsize/Makefile.in b/samples/propsize/Makefile.in
index 1e5e753aecaa0a5b625d05497890d74173ccf3d5..b6749add323fe4f8befcd4f21ef85579ca8e2af0 100644 (file)
--- a/samples/propsize/Makefile.in
+++ b/samples/propsize/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 propsize$(EXEEXT): propsize_propsize.o $(__propsize___win32rc)
-       $(CXX) -o $@  propsize_propsize.o $(__propsize___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  propsize_propsize.o $(__propsize___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__propsize___mac_rezcmd)
        $(__propsize___mac_setfilecmd)
 

diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in
index 09816220b396cef755b6f08fc6a46c971b01c7c9..13e6a55cf8bb1e5123c71a6cc1eb8dec0be28276 100644 (file)
--- a/samples/regtest/Makefile.in
+++ b/samples/regtest/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 regtest$(EXEEXT): regtest_regtest.o $(__regtest___win32rc)
-       $(CXX) -o $@  regtest_regtest.o $(__regtest___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  regtest_regtest.o $(__regtest___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__regtest___mac_rezcmd)
        $(__regtest___mac_setfilecmd)
 

diff --git a/samples/richedit/Makefile.in b/samples/richedit/Makefile.in
index e006813a7c4c982a0690e0106a8f3a8a55ab2ec2..c4e050640391bfd4ed026a427db2737d0559dfb0 100644 (file)
--- a/samples/richedit/Makefile.in
+++ b/samples/richedit/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 richedit$(EXEEXT): richedit_richedit.o $(__richedit___win32rc)
-       $(CXX) -o $@  richedit_richedit.o $(__richedit___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  richedit_richedit.o $(__richedit___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__richedit___mac_rezcmd)
        $(__richedit___mac_setfilecmd)
 

diff --git a/samples/rotate/Makefile.in b/samples/rotate/Makefile.in
index f129c264640329a4fd2e03a32ad86f28e84f03ae..00c8b75002707ebea119cace102a34a4523e0dd2 100644 (file)
--- a/samples/rotate/Makefile.in
+++ b/samples/rotate/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 rotate$(EXEEXT): rotate_rotate.o $(__rotate___win32rc)
-       $(CXX) -o $@  rotate_rotate.o $(__rotate___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  rotate_rotate.o $(__rotate___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__rotate___mac_rezcmd)
        $(__rotate___mac_setfilecmd)
 

diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in
index edb2ada1f40ca95541fadda3aa11a89c2371c24e..8d8fa90586ad64ce009801389e28560bf894a391 100644 (file)
--- a/samples/sashtest/Makefile.in
+++ b/samples/sashtest/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 sashtest$(EXEEXT): sashtest_sashtest.o $(__sashtest___win32rc)
-       $(CXX) -o $@  sashtest_sashtest.o $(__sashtest___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  sashtest_sashtest.o $(__sashtest___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__sashtest___mac_rezcmd)
        $(__sashtest___mac_setfilecmd)
 

diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in
index 2ed1e047bc9bdb8939849a7ae1bb40cad6c45cd0..98cded6beda91c9a17dccfe2dd2bb15278ba823b 100644 (file)
--- a/samples/scroll/Makefile.in
+++ b/samples/scroll/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 scroll$(EXEEXT): scroll_scroll.o $(__scroll___win32rc)
-       $(CXX) -o $@  scroll_scroll.o $(__scroll___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  scroll_scroll.o $(__scroll___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__scroll___mac_rezcmd)
        $(__scroll___mac_setfilecmd)
 

diff --git a/samples/scrollsub/Makefile.in b/samples/scrollsub/Makefile.in
index af2c2b88e88ed058366a0ae00d54f3c625a9c93b..92410eaf19d05f0fcaffe0f612386676efe4ec71 100644 (file)
--- a/samples/scrollsub/Makefile.in
+++ b/samples/scrollsub/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 scrollsub$(EXEEXT): scrollsub_scrollsub.o $(__scrollsub___win32rc)
-       $(CXX) -o $@  scrollsub_scrollsub.o $(__scrollsub___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  scrollsub_scrollsub.o $(__scrollsub___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__scrollsub___mac_rezcmd)
        $(__scrollsub___mac_setfilecmd)
 

diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in
index 0675ae6c17c3e0d64951275f42451a0e4da1a61c..a68de41a07a88359c0d219323d15e67fbacaf631 100644 (file)
--- a/samples/shaped/Makefile.in
+++ b/samples/shaped/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 shaped$(EXEEXT): shaped_shaped.o $(__shaped___win32rc)
-       $(CXX) -o $@  shaped_shaped.o $(__shaped___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  shaped_shaped.o $(__shaped___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__shaped___mac_rezcmd)
        $(__shaped___mac_setfilecmd)
 

diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in
index 0d5ee44736428e066ceb6b48cfd175916a8af571..499cfc6b2e68f5a6790319eb7ad1bf5ea1a696e5 100644 (file)
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 sockets$(EXEEXT): sockets_sockets.o $(__sockets___win32rc)
-       $(CXX) -o $@  sockets_sockets.o $(__sockets___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  sockets_sockets.o $(__sockets___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__sockets___mac_rezcmd)
        $(__sockets___mac_setfilecmd)
 

diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in
index 9c995e24d4e396d13f57a040425328b84ea87f42..05fc02d051cb90c05762b3a3690028bc125e0b24 100644 (file)
--- a/samples/splitter/Makefile.in
+++ b/samples/splitter/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 splitter$(EXEEXT): splitter_splitter.o $(__splitter___win32rc)
-       $(CXX) -o $@  splitter_splitter.o $(__splitter___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  splitter_splitter.o $(__splitter___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__splitter___mac_rezcmd)
        $(__splitter___mac_setfilecmd)
 

diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in
index 5c19e29fde764a0eaf83962b0b2b7f75f206e9e4..8f58fbb518c2cc0c9e35e8a7abaed96a59136644 100644 (file)
--- a/samples/statbar/Makefile.in
+++ b/samples/statbar/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 statbar$(EXEEXT): statbar_statbar.o $(__statbar___win32rc)
-       $(CXX) -o $@  statbar_statbar.o $(__statbar___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  statbar_statbar.o $(__statbar___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__statbar___mac_rezcmd)
        $(__statbar___mac_setfilecmd)
 

diff --git a/samples/tab/Makefile.in b/samples/tab/Makefile.in
index 7c6b6d9af40041f9c880cdf2ce070afb383ac034..352c38034912d46e66f115abe674c5d9bdc9c187 100644 (file)
--- a/samples/tab/Makefile.in
+++ b/samples/tab/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 tab$(EXEEXT): tab_tab.o $(__tab___win32rc)
-       $(CXX) -o $@  tab_tab.o $(__tab___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  tab_tab.o $(__tab___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__tab___mac_rezcmd)
        $(__tab___mac_setfilecmd)
 

diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in
index e4937659e79cbca2f0e22313defebd268f99407c..c174ba736cbbdd877f8cd391ecb21172a74e581e 100644 (file)
--- a/samples/taskbar/Makefile.in
+++ b/samples/taskbar/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 taskbar$(EXEEXT): taskbar_taskbar.o $(__taskbar___win32rc)
-       $(CXX) -o $@  taskbar_taskbar.o $(__taskbar___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  taskbar_taskbar.o $(__taskbar___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__taskbar___mac_rezcmd)
        $(__taskbar___mac_setfilecmd)
 

diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in
index f7708fe7a02c773a79c3df2e25a3dff527b0073c..93ef1248a3b026f87d02c235ffb7f459a453119d 100644 (file)
--- a/samples/text/Makefile.in
+++ b/samples/text/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 text$(EXEEXT): text_text.o $(__text___win32rc)
-       $(CXX) -o $@  text_text.o $(__text___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  text_text.o $(__text___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__text___mac_rezcmd)
        $(__text___mac_setfilecmd)
 

diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in
index 269dea863a6bcd6fdb49f6c1186fc4d1986438c1..0bdf9f930fc7cda559527731c3002ffc836bd5ed 100644 (file)
--- a/samples/thread/Makefile.in
+++ b/samples/thread/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 thread$(EXEEXT): thread_thread.o $(__thread___win32rc)
-       $(CXX) -o $@  thread_thread.o $(__thread___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  thread_thread.o $(__thread___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__thread___mac_rezcmd)
        $(__thread___mac_setfilecmd)
 

diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in
index 5fa635ce592cdd5b6d3e7c78c1b0025008ea6d57..b8a749318ff227852e9fa9d5d466c731e35d10cc 100644 (file)
--- a/samples/toolbar/Makefile.in
+++ b/samples/toolbar/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 toolbar$(EXEEXT): toolbar_toolbar.o $(__toolbar___win32rc)
-       $(CXX) -o $@  toolbar_toolbar.o $(__toolbar___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  toolbar_toolbar.o $(__toolbar___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__toolbar___mac_rezcmd)
        $(__toolbar___mac_setfilecmd)
 

diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in
index d47ad60f518e0257c489929c7c7f2fddd78dc7f3..32856e6ef204de0bbd3ea74ea123e95776612681 100644 (file)
--- a/samples/treectrl/Makefile.in
+++ b/samples/treectrl/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 treectrl$(EXEEXT): treectrl_treetest.o $(__treectrl___win32rc)
-       $(CXX) -o $@  treectrl_treetest.o $(__treectrl___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  treectrl_treetest.o $(__treectrl___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__treectrl___mac_rezcmd)
        $(__treectrl___mac_setfilecmd)
 

diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in
index 39f0391e2493d1454707f873685fce304c5728e9..1ff7a8356d25e0f919333fe730b17619392cccc3 100644 (file)
--- a/samples/typetest/Makefile.in
+++ b/samples/typetest/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -97,7 +98,7 @@ install: all
 install-strip: install
 
 typetest$(EXEEXT): typetest_typetest.o $(__typetest___win32rc)
-       $(CXX) -o $@  typetest_typetest.o $(__typetest___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  typetest_typetest.o $(__typetest___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__typetest___mac_rezcmd)
        $(__typetest___mac_setfilecmd)
 

diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in
index 7bc8bb2a6b83d2a35dbab8d83280796c5ea09fbf..cca5c0a6439f2a244b7861ff65cbdbde38af5ffe 100644 (file)
--- a/samples/validate/Makefile.in
+++ b/samples/validate/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -99,7 +100,7 @@ install-strip: install
 uninstall: 
 
 validate$(EXEEXT): validate_validate.o $(__validate___win32rc)
-       $(CXX) -o $@  validate_validate.o $(__validate___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  validate_validate.o $(__validate___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__validate___mac_rezcmd)
        $(__validate___mac_setfilecmd)
 

diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in
index 6cfb1204a95814b5c5fcf9203d75605ec2551272..f2345a43c896f6c4b58cf71f56d9b2e98c019c0d 100644 (file)
--- a/samples/vscroll/Makefile.in
+++ b/samples/vscroll/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -99,7 +100,7 @@ install-strip: install
 uninstall: 
 
 vscroll$(EXEEXT): vscroll_vscroll.o $(__vscroll___win32rc)
-       $(CXX) -o $@  vscroll_vscroll.o $(__vscroll___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  vscroll_vscroll.o $(__vscroll___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__vscroll___mac_rezcmd)
        $(__vscroll___mac_setfilecmd)
 

diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in
index 0bb63ad4f89d452b7df858e906b4e579db3114bb..91bea033f8b0a4a9dc7ea579671d979106b29060 100644 (file)
--- a/samples/widgets/Makefile.in
+++ b/samples/widgets/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -99,7 +100,7 @@ install-strip: install
 uninstall: 
 
 widgets$(EXEEXT): widgets_button.o widgets_combobox.o widgets_gauge.o widgets_listbox.o widgets_notebook.o widgets_radiobox.o widgets_slider.o widgets_spinbtn.o widgets_static.o widgets_textctrl.o widgets_widgets.o $(__widgets___win32rc)
-       $(CXX) -o $@  widgets_button.o widgets_combobox.o widgets_gauge.o widgets_listbox.o widgets_notebook.o widgets_radiobox.o widgets_slider.o widgets_spinbtn.o widgets_static.o widgets_textctrl.o widgets_widgets.o $(__widgets___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  widgets_button.o widgets_combobox.o widgets_gauge.o widgets_listbox.o widgets_notebook.o widgets_radiobox.o widgets_slider.o widgets_spinbtn.o widgets_static.o widgets_textctrl.o widgets_widgets.o $(__widgets___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__widgets___mac_rezcmd)
        $(__widgets___mac_setfilecmd)
 

diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in
index b72645d5044270fcaf8b49e5da97049bde9617cb..4d459975587e95d2aa0cc4ff28bb50cc2daebd50 100644 (file)
--- a/samples/wizard/Makefile.in
+++ b/samples/wizard/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -99,7 +100,7 @@ install-strip: install
 uninstall: 
 
 wizard$(EXEEXT): wizard_wizard.o $(__wizard___win32rc)
-       $(CXX) -o $@  wizard_wizard.o $(__wizard___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  wizard_wizard.o $(__wizard___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__wizard___mac_rezcmd)
        $(__wizard___mac_setfilecmd)
 

diff --git a/samples/wxtest/Makefile.in b/samples/wxtest/Makefile.in
index 8f4e5029a9704d6c5a4c0e41eaafdc866d7c0b9a..a2a74c85f4dd622fe8659d5f215d08cf77178016 100644 (file)
--- a/samples/wxtest/Makefile.in
+++ b/samples/wxtest/Makefile.in
@@ -15,6 +15,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
@@ -99,7 +100,7 @@ install-strip: install
 uninstall: 
 
 wxtest$(EXEEXT): wxtest_wxtest.o $(__wxtest___win32rc)
-       $(CXX) -o $@  wxtest_wxtest.o $(__wxtest___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+       $(CXX) -o $@  wxtest_wxtest.o $(__wxtest___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__wxtest___mac_rezcmd)
        $(__wxtest___mac_setfilecmd)
 

diff --git a/src/stc/Makefile.in b/src/stc/Makefile.in
index 736eb9752a797ac0e8dd4da8d90ad694d162e27e..6d3ac72f9ed44b19e68c1d87fe9691eb79193072 100644 (file)
--- a/src/stc/Makefile.in
+++ b/src/stc/Makefile.in
@@ -16,6 +16,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 DLLPREFIX = @DLLPREFIX@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_DIR = @INSTALL_DIR@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -139,7 +140,7 @@ install-strip: install
 @COND_SHARED_0@        $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5.a $(libdir)
 
 @COND_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): stcdll_PlatWX.o stcdll_ScintillaWX.o stcdll_stc.o stcdll_AutoComplete.o stcdll_CallTip.o stcdll_CellBuffer.o stcdll_ContractionState.o stcdll_Document.o stcdll_DocumentAccessor.o stcdll_Editor.o stcdll_Indicator.o stcdll_KeyMap.o stcdll_KeyWords.o stcdll_LexAVE.o stcdll_LexAda.o stcdll_LexAsm.o stcdll_LexBaan.o stcdll_LexBullant.o stcdll_LexCPP.o stcdll_LexCSS.o stcdll_LexConf.o stcdll_LexCrontab.o stcdll_LexEiffel.o stcdll_LexFortran.o stcdll_LexHTML.o stcdll_LexLisp.o stcdll_LexLua.o stcdll_LexMatlab.o stcdll_LexOthers.o stcdll_LexPOV.o stcdll_LexPascal.o stcdll_LexPerl.o stcdll_LexPython.o stcdll_LexRuby.o stcdll_LexSQL.o stcdll_LexVB.o stcdll_LineMarker.o stcdll_PropSet.o stcdll_RESearch.o stcdll_ScintillaBase.o stcdll_Style.o stcdll_StyleContext.o stcdll_UniConversion.o stcdll_ViewStyle.o stcdll_WindowAccessor.o stcdll_XPM.o
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@  stcdll_PlatWX.o stcdll_ScintillaWX.o stcdll_stc.o stcdll_AutoComplete.o stcdll_CallTip.o stcdll_CellBuffer.o stcdll_ContractionState.o stcdll_Document.o stcdll_DocumentAccessor.o stcdll_Editor.o stcdll_Indicator.o stcdll_KeyMap.o stcdll_KeyWords.o stcdll_LexAVE.o stcdll_LexAda.o stcdll_LexAsm.o stcdll_LexBaan.o stcdll_LexBullant.o stcdll_LexCPP.o stcdll_LexCSS.o stcdll_LexConf.o stcdll_LexCrontab.o stcdll_LexEiffel.o stcdll_LexFortran.o stcdll_LexHTML.o stcdll_LexLisp.o stcdll_LexLua.o stcdll_LexMatlab.o stcdll_LexOthers.o stcdll_LexPOV.o stcdll_LexPascal.o stcdll_LexPerl.o stcdll_LexPython.o stcdll_LexRuby.o stcdll_LexSQL.o stcdll_LexVB.o stcdll_LineMarker.o stcdll_PropSet.o stcdll_RESearch.o stcdll_ScintillaBase.o stcdll_Style.o stcdll_StyleContext.o stcdll_UniConversion.o stcdll_ViewStyle.o stcdll_WindowAccessor.o stcdll_XPM.o $(LDFLAGS) $(__stcdll___importlib)   -L$(top_builddir)lib $(__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) $(EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
+@COND_SHARED_1@        $(SHARED_LD_CXX) $@  stcdll_PlatWX.o stcdll_ScintillaWX.o stcdll_stc.o stcdll_AutoComplete.o stcdll_CallTip.o stcdll_CellBuffer.o stcdll_ContractionState.o stcdll_Document.o stcdll_DocumentAccessor.o stcdll_Editor.o stcdll_Indicator.o stcdll_KeyMap.o stcdll_KeyWords.o stcdll_LexAVE.o stcdll_LexAda.o stcdll_LexAsm.o stcdll_LexBaan.o stcdll_LexBullant.o stcdll_LexCPP.o stcdll_LexCSS.o stcdll_LexConf.o stcdll_LexCrontab.o stcdll_LexEiffel.o stcdll_LexFortran.o stcdll_LexHTML.o stcdll_LexLisp.o stcdll_LexLua.o stcdll_LexMatlab.o stcdll_LexOthers.o stcdll_LexPOV.o stcdll_LexPascal.o stcdll_LexPerl.o stcdll_LexPython.o stcdll_LexRuby.o stcdll_LexSQL.o stcdll_LexVB.o stcdll_LineMarker.o stcdll_PropSet.o stcdll_RESearch.o stcdll_ScintillaBase.o stcdll_Style.o stcdll_StyleContext.o stcdll_UniConversion.o stcdll_ViewStyle.o stcdll_WindowAccessor.o stcdll_XPM.o $(LDFLAGS) $(__stcdll___importlib)   -L$(top_builddir)lib $(__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) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
 @COND_SHARED_1@        $(__stcdll___so_symlinks_cmd)
 
 stcdll_AutoComplete.o: $(srcdir)/scintilla/src/AutoComplete.cxx

diff --git a/src/xrc/Makefile.in b/src/xrc/Makefile.in
index 8facb62562386f1bc6a3963a78e0b9cf665ca3a8..d69453304a94a14bbe1edfb72896d22315179d26 100644 (file)
--- a/src/xrc/Makefile.in
+++ b/src/xrc/Makefile.in
@@ -18,6 +18,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 DLLPREFIX = @DLLPREFIX@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_DIR = @INSTALL_DIR@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -148,7 +149,7 @@ install-strip: install
 uninstall: 
 
 @COND_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): xrcdll_xmlparse.o xrcdll_xmltok.o xrcdll_xmlrole.o xrcdll_xml.o xrcdll_xmlres.o xrcdll_xh_bmp.o xrcdll_xh_bmpbt.o xrcdll_xh_bttn.o xrcdll_xh_cald.o xrcdll_xh_chckb.o xrcdll_xh_chckl.o xrcdll_xh_choic.o xrcdll_xh_combo.o xrcdll_xh_dlg.o xrcdll_xh_frame.o xrcdll_xh_gauge.o xrcdll_xh_gdctl.o xrcdll_xh_html.o xrcdll_xh_listb.o xrcdll_xh_listc.o xrcdll_xh_menu.o xrcdll_xh_notbk.o xrcdll_xh_panel.o xrcdll_xh_radbt.o xrcdll_xh_radbx.o xrcdll_xh_scrol.o xrcdll_xh_scwin.o xrcdll_xh_sizer.o xrcdll_xh_slidr.o xrcdll_xh_spin.o xrcdll_xh_split.o xrcdll_xh_stbmp.o xrcdll_xh_stbox.o xrcdll_xh_stlin.o xrcdll_xh_sttxt.o xrcdll_xh_text.o xrcdll_xh_toolb.o xrcdll_xh_tree.o xrcdll_xh_unkwn.o xrcdll_xh_wizrd.o xrcdll_xmlrsall.o
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@  xrcdll_xmlparse.o xrcdll_xmltok.o xrcdll_xmlrole.o xrcdll_xml.o xrcdll_xmlres.o xrcdll_xh_bmp.o xrcdll_xh_bmpbt.o xrcdll_xh_bttn.o xrcdll_xh_cald.o xrcdll_xh_chckb.o xrcdll_xh_chckl.o xrcdll_xh_choic.o xrcdll_xh_combo.o xrcdll_xh_dlg.o xrcdll_xh_frame.o xrcdll_xh_gauge.o xrcdll_xh_gdctl.o xrcdll_xh_html.o xrcdll_xh_listb.o xrcdll_xh_listc.o xrcdll_xh_menu.o xrcdll_xh_notbk.o xrcdll_xh_panel.o xrcdll_xh_radbt.o xrcdll_xh_radbx.o xrcdll_xh_scrol.o xrcdll_xh_scwin.o xrcdll_xh_sizer.o xrcdll_xh_slidr.o xrcdll_xh_spin.o xrcdll_xh_split.o xrcdll_xh_stbmp.o xrcdll_xh_stbox.o xrcdll_xh_stlin.o xrcdll_xh_sttxt.o xrcdll_xh_text.o xrcdll_xh_toolb.o xrcdll_xh_tree.o xrcdll_xh_unkwn.o xrcdll_xh_wizrd.o xrcdll_xmlrsall.o $(LDFLAGS) $(__xrcdll___importlib)   -L$(top_builddir)lib $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(__xrcdll___macver)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
+@COND_SHARED_1@        $(SHARED_LD_CXX) $@  xrcdll_xmlparse.o xrcdll_xmltok.o xrcdll_xmlrole.o xrcdll_xml.o xrcdll_xmlres.o xrcdll_xh_bmp.o xrcdll_xh_bmpbt.o xrcdll_xh_bttn.o xrcdll_xh_cald.o xrcdll_xh_chckb.o xrcdll_xh_chckl.o xrcdll_xh_choic.o xrcdll_xh_combo.o xrcdll_xh_dlg.o xrcdll_xh_frame.o xrcdll_xh_gauge.o xrcdll_xh_gdctl.o xrcdll_xh_html.o xrcdll_xh_listb.o xrcdll_xh_listc.o xrcdll_xh_menu.o xrcdll_xh_notbk.o xrcdll_xh_panel.o xrcdll_xh_radbt.o xrcdll_xh_radbx.o xrcdll_xh_scrol.o xrcdll_xh_scwin.o xrcdll_xh_sizer.o xrcdll_xh_slidr.o xrcdll_xh_spin.o xrcdll_xh_split.o xrcdll_xh_stbmp.o xrcdll_xh_stbox.o xrcdll_xh_stlin.o xrcdll_xh_sttxt.o xrcdll_xh_text.o xrcdll_xh_toolb.o xrcdll_xh_tree.o xrcdll_xh_unkwn.o xrcdll_xh_wizrd.o xrcdll_xmlrsall.o $(LDFLAGS) $(__xrcdll___importlib)   -L$(top_builddir)lib $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(__xrcdll___macver)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
 @COND_SHARED_1@        $(__xrcdll___so_symlinks_cmd)
 
 xrcdll_xh_bmp.o: $(srcdir)/xh_bmp.cpp