wxParseWildcard renamed to wxParseCommonDialogsFilter. Its usage is extended from...

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

diff --git a/samples/minifram/Makefile.in b/samples/minifram/Makefile.in
index cfaf99ee395a5095ed054b405638131a537df633..4ad2cc7ec0b0d00fb402d28acab9769dce0626b9 100644 (file)
--- a/samples/minifram/Makefile.in
+++ b/samples/minifram/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
 MINIFRAM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -70,6 +70,10 @@ COND_PLATFORM_OS2_1___minifram___os2_emxbindcmd = $(NM) minifram$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__minifram_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__minifram_bundle___depname = minifram_bundle
+@COND_TOOLKIT_COCOA@____minifram_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   minifram.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____minifram_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     minifram.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 minifram$(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: ###
@@ -128,7 +132,7 @@ minifram$(EXEEXT): $(MINIFRAM_OBJECTS) $(__minifram___win32rc)
        $(__minifram___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-minifram.app/Contents/PkgInfo: minifram$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+minifram.app/Contents/PkgInfo: minifram$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p minifram.app/Contents
        mkdir -p minifram.app/Contents/MacOS
        mkdir -p minifram.app/Contents/Resources
@@ -146,10 +150,10 @@ minifram.app/Contents/PkgInfo: minifram$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
        ln -f minifram$(EXEEXT) minifram.app/Contents/MacOS/minifram
        
        
-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc minifram.app/Contents/Resources/minifram.rsrc
-       ln -sf $(top_srcdir)/src/mac/carbon/wxmac.icns minifram.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc minifram.app/Contents/Resources/minifram.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns minifram.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@minifram_bundle: minifram.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@minifram_bundle: $(____minifram_BUNDLE_TGT_REF_DEP)
 
 minifram_minifram.o: $(srcdir)/minifram.cpp
        $(CXXC) -c -o $@ $(MINIFRAM_CXXFLAGS) $<