Updated makefiles etc. for 2.5.1

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

diff --git a/utils/configtool/src/Makefile.in b/utils/configtool/src/Makefile.in
index 0383f4fc3503525b0f9aecba390d0ec070786b90..73f7fe4e4622296147eeb9bbeed5dcf1d5967e6e 100644 (file)
--- a/utils/configtool/src/Makefile.in
+++ b/utils/configtool/src/Makefile.in
@@ -16,9 +16,11 @@ CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
+EXTRALIBS_XML = @EXTRALIBS_XML@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
+NM = @NM@
 RESCOMP = @RESCOMP@
 SETFILE = @SETFILE@
 TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
@@ -86,7 +88,7 @@ WXCONFIGTOOL_OBJECTS =  \
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
        $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o wxconfigtool$(EXEEXT) \
-       Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+       Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)
@@ -111,6 +113,10 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@  $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__wxconfigtool___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C wxconfigtool$(EXEEXT)
+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_PLATFORM_WIN32_1@__wxconfigtool___win32rc = wxconfigtool_sample_rc.o
 
 ### Targets: ###
@@ -140,9 +146,10 @@ install-strip: install
 uninstall: 
 
 wxconfigtool$(EXEEXT): $(WXCONFIGTOOL_OBJECTS) $(__wxconfigtool___win32rc)
-       $(CXX) -o $@ $(WXCONFIGTOOL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__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)  $(__WXLIB_HTML_p)  $(__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)
        $(__wxconfigtool___mac_rezcmd)
        $(__wxconfigtool___mac_setfilecmd)
+       $(__wxconfigtool___os2_emxbindcmd)
 
 wxconfigtool_appsettings.o: $(srcdir)/appsettings.cpp
        $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
@@ -178,7 +185,7 @@ wxconfigtool_property.o: $(srcdir)/property.cpp
        $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
 
 wxconfigtool_sample_rc.o: $(srcdir)/../../../samples/sample.rc
-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples
+       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples
 
 wxconfigtool_settingsdialog.o: $(srcdir)/settingsdialog.cpp
        $(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<