reverted DEBUG_INFO change

[wxWidgets.git] / tests / Makefile.in

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 16dc5242edfb27ef62ce01696f0650079667c685..e3ae6c20b769988bd05e8952b409e2fbe9d24825 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -36,8 +36,8 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
 ### Variables: ###
 
 DESTDIR = 

-WX_RELEASE = 2.5
-WX_VERSION = $(WX_RELEASE).5
+WX_RELEASE = 2.6
+WX_VERSION = $(WX_RELEASE).0

 LIBDIRNAME = $(top_builddir)lib
 TEST_CXXFLAGS = $(__test_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 LIBDIRNAME = $(top_builddir)lib
 TEST_CXXFLAGS = $(__test_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \


@@ -145,7 +145,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_4) $(__EXCEPTIONS_DEFINE_p_4) \
        $(__RTTI_DEFINE_p_4) $(__THREAD_DEFINE_p_4) -i $(srcdir) $(__DLLFLAG_p_4) -i \
        $(srcdir)/../samples -i $(top_srcdir)/include -o test_gui$(EXEEXT) Carbon.r \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_4) $(__EXCEPTIONS_DEFINE_p_4) \
        $(__RTTI_DEFINE_p_4) $(__THREAD_DEFINE_p_4) -i $(srcdir) $(__DLLFLAG_p_4) -i \
        $(srcdir)/../samples -i $(top_srcdir)/include -o test_gui$(EXEEXT) Carbon.r \

-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.r sample.r
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS


@@ -212,7 +212,7 @@ test$(EXEEXT): $(TEST_OBJECTS)
 @COND_USE_GUI_1@       $(__test_gui___mac_setfilecmd)
 @COND_USE_GUI_1@       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_USE_GUI_1@       $(__test_gui___mac_setfilecmd)
 @COND_USE_GUI_1@       $(SAMPLES_RPATH_POSTLINK)
 

-test_gui.app/Contents/PkgInfo: $(__test_gui___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+test_gui.app/Contents/PkgInfo: $(__test_gui___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns

        mkdir -p test_gui.app/Contents
        mkdir -p test_gui.app/Contents/MacOS
        mkdir -p test_gui.app/Contents/Resources
        mkdir -p test_gui.app/Contents
        mkdir -p test_gui.app/Contents/MacOS
        mkdir -p test_gui.app/Contents/Resources


@@ -230,7 +230,7 @@ test_gui.app/Contents/PkgInfo: $(__test_gui___depname) $(top_srcdir)/src/mac/car
        ln -f test_gui$(EXEEXT) test_gui.app/Contents/MacOS/test_gui
        
        
        ln -f test_gui$(EXEEXT) test_gui.app/Contents/MacOS/test_gui
        
        

-       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc test_gui.app/Contents/Resources/test_gui.rsrc
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc test_gui.app/Contents/Resources/test_gui.rsrc

        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns test_gui.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@test_gui_bundle: $(____test_gui_BUNDLE_TGT_REF_DEP)
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns test_gui.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@test_gui_bundle: $(____test_gui_BUNDLE_TGT_REF_DEP)


@@ -241,7 +241,7 @@ test_gui.app/Contents/PkgInfo: $(__test_gui___depname) $(top_srcdir)/src/mac/car
 data: 
        @mkdir -p .
        @for f in testdata.fc; do \
 data: 
        @mkdir -p .
        @for f in testdata.fc; do \

-       if test ! -e ./$$f ; \
+       if test ! -f ./$$f ; \

        then x=yep ; \
        else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
        fi; \
        then x=yep ; \
        else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
        fi; \