Removal of first part of dsw files (as requested by Jamie Gadd).

[wxWidgets.git] / utils / configtool / src / Makefile.in

diff --git a/utils/configtool/src/Makefile.in b/utils/configtool/src/Makefile.in
index eab98926b190d10e8a0bd9d71628cbcd558814f6..220c57b6c7f4dc012e5befbe9a87ccd96c00ea72 100644 (file)
--- a/utils/configtool/src/Makefile.in
+++ b/utils/configtool/src/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     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!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -11,7 +11,8 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
 exec_prefix = @exec_prefix@
 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@

-RESCOMP = @RESCOMP@
+WINDRES = @WINDRES@
+REZ = @REZ@

 SETFILE = @SETFILE@
 NM = @NM@
 srcdir = @srcdir@
 SETFILE = @SETFILE@
 NM = @NM@
 srcdir = @srcdir@


@@ -26,22 +27,23 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 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@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 EXTRALIBS_SDL = @EXTRALIBS_SDL@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_XML = @EXTRALIBS_XML@
 EXTRALIBS_HTML = @EXTRALIBS_HTML@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 EXTRALIBS_SDL = @EXTRALIBS_SDL@

-EXTRALIBS_GNOMEPRINT = @EXTRALIBS_GNOMEPRINT@

 HOST_SUFFIX = @HOST_SUFFIX@
 
 ### Variables: ###
 
 DESTDIR = 
 HOST_SUFFIX = @HOST_SUFFIX@
 
 ### Variables: ###
 
 DESTDIR = 

-WX_RELEASE = 2.5
+WX_RELEASE = 2.7

 LIBDIRNAME = $(top_builddir)lib
 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) \
 WXCONFIGTOOL_OBJECTS =  \
        $(__wxconfigtool___win32rc) \
        $(__wxconfigtool_os2_lib_res) \


@@ -64,8 +66,7 @@ WXCONFIGTOOL_OBJECTS =  \
 
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
 
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)

-@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = \
-@COND_USE_PLUGINS_0@   $(EXTRALIBS_SDL) $(EXTRALIBS_GNOMEPRINT)
+@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)

 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon


@@ -84,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_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
 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL


@@ -91,6 +101,10 @@ 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)
        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_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


@@ -130,10 +144,11 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
 @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)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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).3.r sample.r
+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: ###
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###


@@ -152,7 +167,7 @@ clean:
        rm -f wxconfigtool$(EXEEXT)
 
 distclean: 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_FOR_BASE) $(EXTRALIBS_FOR_GUI)
 
 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_FOR_BASE) $(EXTRALIBS_FOR_GUI)


@@ -163,55 +178,59 @@ wxconfigtool$(EXEEXT): $(WXCONFIGTOOL_OBJECTS) $(__wxconfigtool___win32rc)
 data: 
        @mkdir -p .
        @for f in wxwin250.wxs; do \
 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; \
        fi; \

+       case "$$x" in ?*) \
+       cp -pRf $(srcdir)/../configs/$$f . ;; \
+       esac; \

        done
 
 wxconfigtool_sample_rc.o: $(srcdir)/../../../samples/sample.rc
        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
 
 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
 
 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
 
 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
 
 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
 
 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
 
 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
 
 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
 
 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
 
 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
 
 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
 
 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
 
 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
 
 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
 
 wxconfigtool_utils.o: $(srcdir)/utils.cpp

-       $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $(srcdir)/utils.cpp

 
 
 # Include dependency info, if present:
 
 
 # Include dependency info, if present: