More name changes

[wxWidgets.git] / samples / opengl / penguin / Makefile.in

diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in
index 78a46f256064b8c4c2a08b353eb056c6111539bd..ee1601e689327ecb1a75bc4e70d272a00fcd0444 100644 (file)
--- a/samples/opengl/penguin/Makefile.in
+++ b/samples/opengl/penguin/Makefile.in
@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
-WX_VERSION = 2.5.1
+WX_VERSION = 2.5.2
 LIBDIRNAME = $(top_builddir)lib
 PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CFLAGS)
@@ -79,6 +79,10 @@ COND_PLATFORM_OS2_1___penguin___os2_emxbindcmd = $(NM) penguin$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__penguin_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__penguin_bundle___depname = penguin_bundle
+@COND_TOOLKIT_COCOA@____penguin_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   penguin.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____penguin_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     penguin.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)
@@ -108,7 +112,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 penguin$(EXEEXT) \
-       Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
+       Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -137,7 +141,7 @@ penguin$(EXEEXT): $(PENGUIN_OBJECTS) $(__penguin___win32rc)
        $(__penguin___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-penguin.app/Contents/PkgInfo: penguin$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+penguin.app/Contents/PkgInfo: penguin$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p penguin.app/Contents
        mkdir -p penguin.app/Contents/MacOS
        mkdir -p penguin.app/Contents/Resources
@@ -155,10 +159,10 @@ penguin.app/Contents/PkgInfo: penguin$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
        ln -f penguin$(EXEEXT) penguin.app/Contents/MacOS/penguin
        
        
-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc penguin.app/Contents/Resources/penguin.rsrc
-       ln -sf $(top_srcdir)/src/mac/carbon/wxmac.icns penguin.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc penguin.app/Contents/Resources/penguin.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns penguin.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@penguin_bundle: penguin.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@penguin_bundle: $(____penguin_BUNDLE_TGT_REF_DEP)
 
 data: 
        @mkdir -p .