From 6c974d0b054a2f82a8b688e3bbaac864fa7459a8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 6 Jul 2003 22:53:01 +0000 Subject: [PATCH] don't link wxBase against GUI libraries git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/gizmos/Makefile.in | 3 ++- contrib/src/stc/Makefile.in | 3 ++- contrib/src/xrc/Makefile.in | 3 ++- samples/access/Makefile.in | 3 ++- samples/artprov/Makefile.in | 3 ++- samples/calendar/Makefile.in | 3 ++- samples/caret/Makefile.in | 3 ++- samples/checklst/Makefile.in | 3 ++- samples/config/Makefile.in | 3 ++- samples/console/Makefile.in | 1 - samples/controls/Makefile.in | 3 ++- samples/db/Makefile.in | 3 ++- samples/dialogs/Makefile.in | 4 ++-- samples/dialup/Makefile.in | 3 ++- samples/display/Makefile.in | 3 ++- samples/dnd/Makefile.in | 4 ++-- samples/docview/Makefile.in | 3 ++- samples/docvwmdi/Makefile.in | 3 ++- samples/dragimag/Makefile.in | 4 ++-- samples/drawing/Makefile.in | 4 ++-- samples/dynamic/Makefile.in | 3 ++- samples/erase/Makefile.in | 3 ++- samples/event/Makefile.in | 3 ++- samples/exec/Makefile.in | 3 ++- samples/font/Makefile.in | 3 ++- samples/grid/Makefile.in | 3 ++- samples/help/Makefile.in | 3 ++- samples/htlbox/Makefile.in | 3 ++- samples/html/about/Makefile.in | 4 ++-- samples/html/help/Makefile.in | 4 ++-- samples/html/helpview/Makefile.in | 4 ++-- samples/html/printing/Makefile.in | 4 ++-- samples/html/test/Makefile.in | 4 ++-- samples/html/virtual/Makefile.in | 4 ++-- samples/html/widget/Makefile.in | 4 ++-- samples/html/zip/Makefile.in | 4 ++-- samples/image/Makefile.in | 4 ++-- samples/internat/Makefile.in | 3 ++- samples/ipc/Makefile.in | 3 ++- samples/joytest/Makefile.in | 3 ++- samples/keyboard/Makefile.in | 3 ++- samples/layout/Makefile.in | 3 ++- samples/listbox/Makefile.in | 3 ++- samples/listctrl/Makefile.in | 3 ++- samples/mdi/Makefile.in | 3 ++- samples/memcheck/Makefile.in | 3 ++- samples/menu/Makefile.in | 3 ++- samples/mfc/Makefile.in | 3 ++- samples/minifram/Makefile.in | 3 ++- samples/minimal/Makefile.in | 3 ++- samples/mobile/Makefile.in | 3 ++- samples/multimon/Makefile.in | 3 ++- samples/nativdlg/Makefile.in | 3 ++- samples/newgrid/Makefile.in | 3 ++- samples/notebook/Makefile.in | 3 ++- samples/oleauto/Makefile.in | 3 ++- samples/opengl/Makefile.in | 3 ++- samples/ownerdrw/Makefile.in | 3 ++- samples/png/Makefile.in | 3 ++- samples/printing/Makefile.in | 3 ++- samples/propsize/Makefile.in | 3 ++- samples/regtest/Makefile.in | 3 ++- samples/richedit/Makefile.in | 3 ++- samples/rotate/Makefile.in | 3 ++- samples/sashtest/Makefile.in | 3 ++- samples/scroll/Makefile.in | 3 ++- samples/scrollsub/Makefile.in | 3 ++- samples/shaped/Makefile.in | 3 ++- samples/sockets/Makefile.in | 3 ++- samples/splitter/Makefile.in | 3 ++- samples/statbar/Makefile.in | 3 ++- samples/tab/Makefile.in | 3 ++- samples/taskbar/Makefile.in | 3 ++- samples/text/Makefile.in | 3 ++- samples/thread/Makefile.in | 3 ++- samples/toolbar/Makefile.in | 3 ++- samples/treectrl/Makefile.in | 3 ++- samples/typetest/Makefile.in | 3 ++- samples/validate/Makefile.in | 3 ++- samples/vscroll/Makefile.in | 3 ++- samples/widgets/Makefile.in | 3 ++- samples/wizard/Makefile.in | 3 ++- samples/wxtest/Makefile.in | 3 ++- src/stc/Makefile.in | 3 ++- src/xrc/Makefile.in | 3 ++- 85 files changed, 168 insertions(+), 98 deletions(-) diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in index 8e92211ef0..6936572929 100644 --- 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 736eb9752a..6d3ac72f9e 100644 --- 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 8facb62562..d69453304a 100644 --- 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 a8b9dde40c..fbe8549b29 100644 --- 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 ba240c3c2e..0f1838fe37 100644 --- 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 39ec51b67a..8d9f8490f7 100644 --- 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 9af9b20dbf..737be45e00 100644 --- 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 83bf5c419c..dfe3895433 100644 --- 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 06bd3fa815..9474186548 100644 --- 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 2a9cfeb929..c50764bb34 100644 --- 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 cebd8cacc9..bee2a0709b 100644 --- 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 e25fdd6c75..cd9faf06b8 100644 --- 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 ae48c80ca9..a0af6ec53a 100644 --- 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 cc0bdb5d5d..f122934763 100644 --- 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 bc5bc8800c..bf730395df 100644 --- 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 c9db4f87af..6c08bbabed 100644 --- 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 7a5ccd1b61..4ee4161fc9 100644 --- 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 ebfd107038..e1eae71ee2 100644 --- 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 b7039000d3..7d0b084844 100644 --- 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 63b54bb7ec..3b5c9d8fbb 100644 --- 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 a1e17f2bd3..03262c4625 100644 --- 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 1bdb384181..4c87694654 100644 --- 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 fe3d52f5ba..33fda99857 100644 --- 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 6788d303a0..8a33fb14a5 100644 --- 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 074a7c51dc..2ed71012f7 100644 --- 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 1a7da54b91..0bd4bcc7e9 100644 --- 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 f919050b75..c433251170 100644 --- 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 05be5f76bd..45790d2c41 100644 --- 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 3f3fc3599f..e579694f6f 100644 --- 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 ebba065e56..fa700b7321 100644 --- 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 d36823a643..5827acbcfe 100644 --- 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 d4ae007dbf..0ea7ce58cc 100644 --- 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 2716bb15cb..5274a50147 100644 --- 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 44a48bdfee..fa5d98489f 100644 --- 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 1c6f4ba652..ec4f01a936 100644 --- 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 ef5c51885d..c0c9a447f3 100644 --- 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 cb8c8d8ffd..eeab500436 100644 --- 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 ec6f5e5c8e..63a0fb3b03 100644 --- 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 3b6bb18c47..768961e8cf 100644 --- 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 6699c3482d..cc5a1ceec9 100644 --- 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 bd061c7996..019ac514a1 100644 --- 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 9d7b0ba3ba..50ac7ef300 100644 --- 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 1feb1fce0c..2c639f91b9 100644 --- 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 3e9227c994..ef55fb4618 100644 --- 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 9efe3c405f..8a6600a7b0 100644 --- 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 f354bb1dc9..7c9ae5133c 100644 --- 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 547d6fa253..0a4ca7ca2b 100644 --- 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 d2e493b8cc..de6ff4ecb7 100644 --- 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 221ae01a71..ff082879ed 100644 --- 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 9ac39dc6e7..348c194303 100644 --- 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 f98473933f..d0810ba0fa 100644 --- 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 59f5e3de67..a00358ebe5 100644 --- 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 926e6fa94b..499e55c9a1 100644 --- 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 65898add3e..1789ac0e7a 100644 --- 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 6cda3082d2..43996cc8c8 100644 --- 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 26d163c0a1..4f91d37842 100644 --- 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 7884244857..c3ab152012 100644 --- 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 bca195bc33..f531fd2ff8 100644 --- 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 dd5240f8be..8ea232deae 100644 --- 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 798a499ca1..1a12f0890e 100644 --- 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 1e5e753aec..b6749add32 100644 --- 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 09816220b3..13e6a55cf8 100644 --- 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 e006813a7c..c4e0506403 100644 --- 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 f129c26464..00c8b75002 100644 --- 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 edb2ada1f4..8d8fa90586 100644 --- 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 2ed1e047bc..98cded6bed 100644 --- 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 af2c2b88e8..92410eaf19 100644 --- 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 0675ae6c17..a68de41a07 100644 --- 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 0d5ee44736..499cfc6b2e 100644 --- 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 9c995e24d4..05fc02d051 100644 --- 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 5c19e29fde..8f58fbb518 100644 --- 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 7c6b6d9af4..352c380349 100644 --- 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 e4937659e7..c174ba736c 100644 --- 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 f7708fe7a0..93ef1248a3 100644 --- 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 269dea863a..0bdf9f930f 100644 --- 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 5fa635ce59..b8a749318f 100644 --- 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 d47ad60f51..32856e6ef2 100644 --- 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 39f0391e24..1ff7a8356d 100644 --- 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 7bc8bb2a6b..cca5c0a643 100644 --- 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 6cfb1204a9..f2345a43c8 100644 --- 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 0bb63ad4f8..91bea033f8 100644 --- 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 b72645d504..4d45997558 100644 --- 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 8f4e5029a9..a2a74c85f4 100644 --- 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 736eb9752a..6d3ac72f9e 100644 --- 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 8facb62562..d69453304a 100644 --- 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 -- 2.45.2