compilation fix for gcc (closes bug 996701)

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

diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in
index 03e4a2c0a1e01e0e00cd7d8511ab841ab3781d0d..46a0e1edd63e72fff39b62a7f37003188632400f 100644 (file)
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -35,7 +35,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
-WX_VERSION = 2.5.1
+WX_VERSION = 2.5.2
 LIBDIRNAME = $(top_builddir)lib
 MINIMAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -71,6 +71,10 @@ COND_PLATFORM_OS2_1___minimal___os2_emxbindcmd = $(NM) minimal$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__minimal_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__minimal_bundle___depname = minimal_bundle
+@COND_TOOLKIT_COCOA@____minimal_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   minimal.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____minimal_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     minimal.app/Contents/PkgInfo
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -99,7 +103,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
        $(srcdir)/../../samples -i $(top_srcdir)/include -o minimal$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -128,7 +132,7 @@ minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc)
        $(__minimal___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-minimal.app/Contents/PkgInfo: minimal$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+minimal.app/Contents/PkgInfo: minimal$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p minimal.app/Contents
        mkdir -p minimal.app/Contents/MacOS
        mkdir -p minimal.app/Contents/Resources
@@ -146,10 +150,10 @@ minimal.app/Contents/PkgInfo: minimal$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
        ln -f minimal$(EXEEXT) minimal.app/Contents/MacOS/minimal
        
        
-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc minimal.app/Contents/Resources/minimal.rsrc
-       ln -sf $(top_srcdir)/src/mac/carbon/wxmac.icns minimal.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc minimal.app/Contents/Resources/minimal.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns minimal.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@minimal_bundle: minimal.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@minimal_bundle: $(____minimal_BUNDLE_TGT_REF_DEP)
 
 minimal_sample_rc.o: $(srcdir)/../../samples/sample.rc
        $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include