corrected version number extraction

[wxWidgets.git] / contrib / utils / wxrcedit / Makefile.in

diff --git a/contrib/utils/wxrcedit/Makefile.in b/contrib/utils/wxrcedit/Makefile.in
index c196ac8e68bcd14980c6bda729c631bb2a9177f8..836d39f6af406897fe0816dab383442f4672f1c0 100644 (file)
--- a/contrib/utils/wxrcedit/Makefile.in
+++ b/contrib/utils/wxrcedit/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.1.8 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -30,7 +30,6 @@ 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@

 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_XML = @EXTRALIBS_XML@
 EXTRALIBS_HTML = @EXTRALIBS_HTML@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_XML = @EXTRALIBS_XML@
 EXTRALIBS_HTML = @EXTRALIBS_HTML@


@@ -41,11 +40,12 @@ HOST_SUFFIX = @HOST_SUFFIX@
 ### Variables: ###
 
 DESTDIR = 
 ### Variables: ###
 
 DESTDIR = 

-WX_RELEASE = 2.5
+WX_RELEASE = 2.6

 LIBDIRNAME = $(top_builddir)lib
 LIBDIRNAME = $(top_builddir)lib

-WXRCEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
-       $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \
-       $(CPPFLAGS) $(CXXFLAGS)
+WXRCEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \
+       -I$(srcdir)/../../include $(CPPFLAGS) $(CXXFLAGS)

 WXRCEDIT_OBJECTS =  \
        $(__wxrcedit_os2_lib_res) \
        wxrcedit_edapp.o \
 WXRCEDIT_OBJECTS =  \
        $(__wxrcedit_os2_lib_res) \
        wxrcedit_edapp.o \


@@ -83,6 +83,15 @@ WXRCEDIT_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


@@ -132,10 +141,10 @@ 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 \
 @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 \
+       __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 -i $(top_srcdir)/include -i \
        $(srcdir)/../../../samples -i $(top_srcdir)/include -i \

-       $(srcdir)/../../include -o wxrcedit$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
+       $(srcdir)/../../include -o wxrcedit$(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: ###


@@ -155,7 +164,7 @@ clean:
        rm -f wxrcedit$(EXEEXT)
 
 distclean: clean
        rm -f wxrcedit$(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

 
 wxrcedit$(EXEEXT): $(WXRCEDIT_OBJECTS) $(__wxrcedit___win32rc)
        $(CXX) -o $@ $(WXRCEDIT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(__WXLIB_XRC_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(EXTRALIBS_XML) $(__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)
 
 wxrcedit$(EXEEXT): $(WXRCEDIT_OBJECTS) $(__wxrcedit___win32rc)
        $(CXX) -o $@ $(WXRCEDIT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(__WXLIB_XRC_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(EXTRALIBS_XML) $(__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)


@@ -168,40 +177,40 @@ install_wxrcedit:
        $(INSTALL_PROGRAM) wxrcedit$(EXEEXT) $(DESTDIR)$(bindir)
 
 wxrcedit_edapp.o: $(srcdir)/edapp.cpp
        $(INSTALL_PROGRAM) wxrcedit$(EXEEXT) $(DESTDIR)$(bindir)
 
 wxrcedit_edapp.o: $(srcdir)/edapp.cpp

-       $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $(srcdir)/edapp.cpp

 
 wxrcedit_editor.o: $(srcdir)/editor.cpp
 
 wxrcedit_editor.o: $(srcdir)/editor.cpp

-       $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $(srcdir)/editor.cpp

 
 wxrcedit_nodehnd.o: $(srcdir)/nodehnd.cpp
 
 wxrcedit_nodehnd.o: $(srcdir)/nodehnd.cpp

-       $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $(srcdir)/nodehnd.cpp

 
 wxrcedit_nodesdb.o: $(srcdir)/nodesdb.cpp
 
 wxrcedit_nodesdb.o: $(srcdir)/nodesdb.cpp

-       $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $(srcdir)/nodesdb.cpp

 
 wxrcedit_pe_adv.o: $(srcdir)/pe_adv.cpp
 
 wxrcedit_pe_adv.o: $(srcdir)/pe_adv.cpp

-       $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $(srcdir)/pe_adv.cpp

 
 wxrcedit_pe_basic.o: $(srcdir)/pe_basic.cpp
 
 wxrcedit_pe_basic.o: $(srcdir)/pe_basic.cpp

-       $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $(srcdir)/pe_basic.cpp

 
 wxrcedit_preview.o: $(srcdir)/preview.cpp
 
 wxrcedit_preview.o: $(srcdir)/preview.cpp

-       $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $(srcdir)/preview.cpp

 
 wxrcedit_propedit.o: $(srcdir)/propedit.cpp
 
 wxrcedit_propedit.o: $(srcdir)/propedit.cpp

-       $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $(srcdir)/propedit.cpp

 
 wxrcedit_propframe.o: $(srcdir)/propframe.cpp
 
 wxrcedit_propframe.o: $(srcdir)/propframe.cpp

-       $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $(srcdir)/propframe.cpp

 
 wxrcedit_splittree.o: $(srcdir)/splittree.cpp
 
 wxrcedit_splittree.o: $(srcdir)/splittree.cpp

-       $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $(srcdir)/splittree.cpp

 
 wxrcedit_xmlhelpr.o: $(srcdir)/xmlhelpr.cpp
 
 wxrcedit_xmlhelpr.o: $(srcdir)/xmlhelpr.cpp

-       $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $(srcdir)/xmlhelpr.cpp

 
 wxrcedit_wxrcedit_rc.o: $(srcdir)/wxrcedit.rc
 
 wxrcedit_wxrcedit_rc.o: $(srcdir)/wxrcedit.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 --include-dir $(srcdir)/../../include
+       $(RESCOMP) -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 --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../include

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