X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3fd9c29882a1562a45d77c6722f5ca9a53e430c1..5938a184a568873b48c1e59bf5c4ed5a9528d7f4:/utils/configtool/src/Makefile.in diff --git a/utils/configtool/src/Makefile.in b/utils/configtool/src/Makefile.in index 3f2064d66a..1dbd3a337d 100644 --- a/utils/configtool/src/Makefile.in +++ b/utils/configtool/src/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.4 (http://bakefile.sourceforge.net) +# Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -11,7 +11,8 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ -RESCOMP = @RESCOMP@ +WINDRES = @WINDRES@ +REZ = @REZ@ SETFILE = @SETFILE@ NM = @NM@ srcdir = @srcdir@ @@ -22,10 +23,11 @@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ +WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ -TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ +TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_XML = @EXTRALIBS_XML@ EXTRALIBS_HTML = @EXTRALIBS_HTML@ @@ -36,9 +38,12 @@ HOST_SUFFIX = @HOST_SUFFIX@ ### Variables: ### DESTDIR = +WX_RELEASE = 2.7 LIBDIRNAME = $(top_builddir)lib -WXCONFIGTOOL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ - $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS) +WXCONFIGTOOL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \ + $(CXXFLAGS) WXCONFIGTOOL_OBJECTS = \ $(__wxconfigtool___win32rc) \ $(__wxconfigtool_os2_lib_res) \ @@ -69,6 +74,10 @@ WXCONFIGTOOL_OBJECTS = \ @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ +@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS) +@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI) +@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) +@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_1@__wxconfigtool___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C wxconfigtool$(EXEEXT) @COND_PLATFORM_MAC_1@__wxconfigtool___mac_rezcmd = \ @@ -76,6 +85,15 @@ WXCONFIGTOOL_OBJECTS = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS +@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS +@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI +@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI +@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS +@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL @@ -83,46 +101,54 @@ COND_PLATFORM_OS2_1___wxconfigtool___os2_emxbindcmd = $(NM) \ wxconfigtool$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \ wxconfigtool$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__wxconfigtool___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___wxconfigtool___os2_emxbindcmd) +@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \ +@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) +@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ +@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_PLATFORM_WIN32_1@__wxconfigtool___win32rc = wxconfigtool_sample_rc.o @COND_PLATFORM_OS2_1@__wxconfigtool_os2_lib_res = \ @COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res COND_MONOLITHIC_0___WXLIB_ADV_p = \ - -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX) + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p) COND_MONOLITHIC_0___WXLIB_HTML_p = \ - -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p) COND_MONOLITHIC_0___WXLIB_CORE_p = \ - -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) -@COND_MONOLITHIC_0@__WXLIB_XML_p = \ -@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX) -@COND_MONOLITHIC_0@__WXLIB_BASE_p = \ -@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) +COND_MONOLITHIC_0___WXLIB_XML_p = \ + -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p) +COND_MONOLITHIC_0___WXLIB_BASE_p = \ + -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) COND_MONOLITHIC_1___WXLIB_MONO_p = \ - -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \ -@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ -@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ -@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ -@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ + -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ -@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) -COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../../samples -i $(top_srcdir)/include -o wxconfigtool$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r +@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) +COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \ + $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \ + wxconfigtool$(EXEEXT) Carbon.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -141,10 +167,10 @@ clean: rm -f wxconfigtool$(EXEEXT) distclean: clean - rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile + rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile wxconfigtool$(EXEEXT): $(WXCONFIGTOOL_OBJECTS) $(__wxconfigtool___win32rc) - $(CXX) -o $@ $(WXCONFIGTOOL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ $(WXCONFIGTOOL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__wxconfigtool___mac_rezcmd) $(__wxconfigtool___mac_setfilecmd) $(__wxconfigtool___os2_emxbindcmd) @@ -152,55 +178,59 @@ wxconfigtool$(EXEEXT): $(WXCONFIGTOOL_OBJECTS) $(__wxconfigtool___win32rc) data: @mkdir -p . @for f in wxwin250.wxs; do \ - if test \( ! -s ./$$f \) -o \( $(srcdir)/../configs/$$f -nt ./$$f \) ; then \ - cp -pRf $(srcdir)/../configs/$$f . ; \ + if test ! -f ./$$f -a ! -d ./$$f ; \ + then x=yep ; \ + else x=`find $(srcdir)/../configs/$$f -newer ./$$f -print` ; \ fi; \ + case "$$x" in ?*) \ + cp -pRf $(srcdir)/../configs/$$f . ;; \ + esac; \ done wxconfigtool_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(top_srcdir)/include + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include wxconfigtool_wxconfigtool.o: $(srcdir)/wxconfigtool.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $(srcdir)/wxconfigtool.cpp wxconfigtool_appsettings.o: $(srcdir)/appsettings.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $(srcdir)/appsettings.cpp wxconfigtool_configitem.o: $(srcdir)/configitem.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $(srcdir)/configitem.cpp wxconfigtool_configitemselector.o: $(srcdir)/configitemselector.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $(srcdir)/configitemselector.cpp wxconfigtool_configtooldoc.o: $(srcdir)/configtooldoc.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $(srcdir)/configtooldoc.cpp wxconfigtool_configtoolview.o: $(srcdir)/configtoolview.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $(srcdir)/configtoolview.cpp wxconfigtool_configtree.o: $(srcdir)/configtree.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $(srcdir)/configtree.cpp wxconfigtool_custompropertydialog.o: $(srcdir)/custompropertydialog.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $(srcdir)/custompropertydialog.cpp wxconfigtool_htmlparser.o: $(srcdir)/htmlparser.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $(srcdir)/htmlparser.cpp wxconfigtool_mainframe.o: $(srcdir)/mainframe.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $(srcdir)/mainframe.cpp wxconfigtool_propeditor.o: $(srcdir)/propeditor.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $(srcdir)/propeditor.cpp wxconfigtool_property.o: $(srcdir)/property.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $(srcdir)/property.cpp wxconfigtool_settingsdialog.o: $(srcdir)/settingsdialog.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $(srcdir)/settingsdialog.cpp wxconfigtool_utils.o: $(srcdir)/utils.cpp - $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $< + $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $(srcdir)/utils.cpp # Include dependency info, if present: