compilation fix for gcc (closes bug 996701)

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

diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in
index 50dcc38ed31d6b05b5139d6b6448e84267e1b6de..5aafad43d11b53b466462ff1627e3d1cd36032c6 100644 (file)
--- a/samples/menu/Makefile.in
+++ b/samples/menu/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -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
 MENU_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -70,6 +70,8 @@ COND_PLATFORM_OS2_1___menu___os2_emxbindcmd = $(NM) menu$(EXEEXT) | if grep -q \
 @COND_PLATFORM_OS2_1@__menu_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__menu_bundle___depname = menu_bundle
+@COND_TOOLKIT_COCOA@____menu_BUNDLE_TGT_REF_DEP = menu.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____menu_BUNDLE_TGT_REF_DEP = menu.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 +101,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 menu$(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 +130,7 @@ menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc)
        $(__menu___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-menu.app/Contents/PkgInfo: menu$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+menu.app/Contents/PkgInfo: menu$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p menu.app/Contents
        mkdir -p menu.app/Contents/MacOS
        mkdir -p menu.app/Contents/Resources
@@ -146,10 +148,10 @@ menu.app/Contents/PkgInfo: menu$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist
        ln -f menu$(EXEEXT) menu.app/Contents/MacOS/menu
        
        
-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc menu.app/Contents/Resources/menu.rsrc
-       ln -sf $(top_srcdir)/src/mac/wxmac.icns menu.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc menu.app/Contents/Resources/menu.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns menu.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@menu_bundle: menu.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@menu_bundle: $(____menu_BUNDLE_TGT_REF_DEP)
 
 menu_menu.o: $(srcdir)/menu.cpp
        $(CXXC) -c -o $@ $(MENU_CXXFLAGS) $<