missing commit, fixes #14797

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

diff --git a/samples/collpane/Makefile.in b/samples/collpane/Makefile.in
index c9eaef213496959dc95a01a2dfc9da0a24ad733a..c2c93e02470027d57fb7ac6c0b90fa8071ad7ead 100644 (file)
--- a/samples/collpane/Makefile.in
+++ b/samples/collpane/Makefile.in
@@ -30,6 +30,7 @@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
 EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_XML = @EXTRALIBS_XML@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
@@ -41,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).4
+WX_VERSION = $(WX_RELEASE).5
 LIBDIRNAME = $(wx_top_builddir)/lib
 COLLPANE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -64,7 +65,8 @@ COLLPANE_OBJECTS =  \
 @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_PLATFORM_MAC_0@__collpane___mac_setfilecmd = @true
@@ -169,7 +171,7 @@ collpane$(EXEEXT): $(COLLPANE_OBJECTS) $(__collpane___win32rc)
 @COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >collpane.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
-@COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >collpane.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@       /bin/echo "APPL????" >collpane.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       ln -f collpane$(EXEEXT) collpane.app/Contents/MacOS/collpane