Fix wrong configure test for abi::__forced_unwind in previous commit.

[wxWidgets.git] / samples / ipc / Makefile.in

diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in
index f08aa0800d8904e46a4da2c0247f8da9595b8de0..8090940d906e2e6c2cc96ac01c9e31a958d1a320 100644 (file)
--- a/samples/ipc/Makefile.in
+++ b/samples/ipc/Makefile.in
@@ -30,6 +30,7 @@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
 EXTRALIBS = @EXTRALIBS@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
 EXTRALIBS = @EXTRALIBS@

+EXTRALIBS_XML = @EXTRALIBS_XML@

 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@


@@ -40,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
 
 DESTDIR = 
 WX_RELEASE = 2.9

-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).5

 LIBDIRNAME = $(wx_top_builddir)/lib
 IPCCLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
 LIBDIRNAME = $(wx_top_builddir)/lib
 IPCCLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \


@@ -82,7 +83,8 @@ BASEIPCSERVER_OBJECTS =  \
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
 @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_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+@COND_MONOLITHIC_1@    $(EXTRALIBS_XML) $(EXTRALIBS_GUI)

 @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
 @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
 @COND_USE_GUI_1@__ipcclient___depname = ipcclient$(EXEEXT)
 @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
 @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
 @COND_USE_GUI_1@__ipcclient___depname = ipcclient$(EXEEXT)


@@ -222,7 +224,7 @@ distclean: clean
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(top_srcdir)/src/osx/carbon/Info.plist.in >ipcclient.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(top_srcdir)/src/osx/carbon/Info.plist.in >ipcclient.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     

-@COND_PLATFORM_MACOSX_1_USE_GUI_1@     echo -n "APPL????" >ipcclient.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@     /bin/echo "APPL????" >ipcclient.app/Contents/PkgInfo

 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     ln -f ipcclient$(EXEEXT) ipcclient.app/Contents/MacOS/ipcclient
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     ln -f ipcclient$(EXEEXT) ipcclient.app/Contents/MacOS/ipcclient


@@ -250,7 +252,7 @@ distclean: clean
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(top_srcdir)/src/osx/carbon/Info.plist.in >ipcserver.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(top_srcdir)/src/osx/carbon/Info.plist.in >ipcserver.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     

-@COND_PLATFORM_MACOSX_1_USE_GUI_1@     echo -n "APPL????" >ipcserver.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@     /bin/echo "APPL????" >ipcserver.app/Contents/PkgInfo

 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     ln -f ipcserver$(EXEEXT) ipcserver.app/Contents/MacOS/ipcserver
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     ln -f ipcserver$(EXEEXT) ipcserver.app/Contents/MacOS/ipcserver