Remove wxRTTI macro for wxComboBox from Motif port.

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

diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in
index 7e1a2922c1d5c3020c35b0bf3306484a6fd30ce8..16a80e76f57922ec817e130fc580c8b4108866b7 100644 (file)
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
 
 DESTDIR = 
 WX_RELEASE = 2.9

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

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


@@ -149,7 +149,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc)
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc)

-       $(CXX) -o $@ $(MINIMAL_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+       $(CXX) -o $@ $(MINIMAL_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)

        
        $(__minimal___mac_setfilecmd)
        $(__minimal___os2_emxbindcmd)
        
        $(__minimal___mac_setfilecmd)
        $(__minimal___os2_emxbindcmd)


@@ -166,7 +166,7 @@ minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc)
 @COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >minimal.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >minimal.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       

-@COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >minimal.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@       /bin/echo "APPL????" >minimal.app/Contents/PkgInfo

 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       ln -f minimal$(EXEEXT) minimal.app/Contents/MacOS/minimal
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       ln -f minimal$(EXEEXT) minimal.app/Contents/MacOS/minimal