don't link wxBase against GUI libraries

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-07-06 22:53:01 +00:00
parent 3560dc761f
commit 6c974d0b05
85 changed files with 168 additions and 98 deletions

View File

@@ -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

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)