set transiency relation so that the WM can do better job of positioning the window

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

diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in
index 46d326ae04c8a41e90b7c7474d08f1a71031d1e0..36edfb94e311ccf056d21c5bb28667de03bc8643 100644 (file)
--- a/samples/erase/Makefile.in
+++ b/samples/erase/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
 ERASE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -70,6 +70,9 @@ COND_PLATFORM_OS2_1___erase___os2_emxbindcmd = $(NM) erase$(EXEEXT) | if grep -q
 @COND_PLATFORM_OS2_1@__erase_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__erase_bundle___depname = erase_bundle
+@COND_TOOLKIT_COCOA@____erase_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   erase.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____erase_BUNDLE_TGT_REF_DEP = erase.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 +102,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 erase$(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 +131,7 @@ erase$(EXEEXT): $(ERASE_OBJECTS) $(__erase___win32rc)
        $(__erase___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-erase.app/Contents/PkgInfo: erase$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+erase.app/Contents/PkgInfo: erase$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p erase.app/Contents
        mkdir -p erase.app/Contents/MacOS
        mkdir -p erase.app/Contents/Resources
@@ -146,10 +149,10 @@ erase.app/Contents/PkgInfo: erase$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli
        ln -f erase$(EXEEXT) erase.app/Contents/MacOS/erase
        
        
-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc erase.app/Contents/Resources/erase.rsrc
-       ln -sf $(top_srcdir)/src/mac/wxmac.icns erase.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc erase.app/Contents/Resources/erase.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns erase.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@erase_bundle: erase.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@erase_bundle: $(____erase_BUNDLE_TGT_REF_DEP)
 
 erase_erase.o: $(srcdir)/erase.cpp
        $(CXXC) -c -o $@ $(ERASE_CXXFLAGS) $<