German translation update (patch 1000305)

[wxWidgets.git] / samples / html / zip / Makefile.in

diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in
index 2bdacb7f86a8dc893fe60da2d558b2fbed4d5dd0..3e549054a48577593d17906e0b295ac758871bde 100644 (file)
--- a/samples/html/zip/Makefile.in
+++ b/samples/html/zip/Makefile.in
@@ -36,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
-WX_VERSION = 2.5.1
+WX_VERSION = 2.5.2
 LIBDIRNAME = $(top_builddir)lib
 ZIP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -70,6 +70,8 @@ COND_PLATFORM_OS2_1___zip___os2_emxbindcmd = $(NM) zip$(EXEEXT) | if grep -q \
 @COND_PLATFORM_OS2_1@__zip_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__zip_bundle___depname = zip_bundle
+@COND_TOOLKIT_COCOA@____zip_BUNDLE_TGT_REF_DEP = zip.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____zip_BUNDLE_TGT_REF_DEP = zip.app/Contents/PkgInfo
 COND_MONOLITHIC_0___WXLIB_HTML_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
@@ -102,7 +104,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 zip$(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: ###
@@ -131,7 +133,7 @@ zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc)
        $(__zip___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-zip.app/Contents/PkgInfo: zip$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+zip.app/Contents/PkgInfo: zip$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p zip.app/Contents
        mkdir -p zip.app/Contents/MacOS
        mkdir -p zip.app/Contents/Resources
@@ -149,10 +151,10 @@ zip.app/Contents/PkgInfo: zip$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.i
        ln -f zip$(EXEEXT) zip.app/Contents/MacOS/zip
        
        
-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc zip.app/Contents/Resources/zip.rsrc
-       ln -sf $(top_srcdir)/src/mac/carbon/wxmac.icns zip.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc zip.app/Contents/Resources/zip.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns zip.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@zip_bundle: zip.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@zip_bundle: $(____zip_BUNDLE_TGT_REF_DEP)
 
 data: 
        @mkdir -p .