HasFlag is not set at this point

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

diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in
index 2951181b9c81f5d352cb6d8f1798ff21f289b8a5..5b53fd486e40818bf8aefffbde6b1312499e4209 100644 (file)
--- a/samples/dnd/Makefile.in
+++ b/samples/dnd/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
 DND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -69,6 +69,8 @@ COND_PLATFORM_OS2_1___dnd___os2_emxbindcmd = $(NM) dnd$(EXEEXT) | if grep -q \
 @COND_PLATFORM_OS2_1@__dnd_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__dnd_bundle___depname = dnd_bundle
+@COND_TOOLKIT_COCOA@____dnd_BUNDLE_TGT_REF_DEP = dnd.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____dnd_BUNDLE_TGT_REF_DEP = dnd.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)
@@ -98,7 +100,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 dnd$(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: ###
@@ -127,7 +129,7 @@ dnd$(EXEEXT): $(DND_OBJECTS) $(__dnd___win32rc)
        $(__dnd___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-dnd.app/Contents/PkgInfo: dnd$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+dnd.app/Contents/PkgInfo: dnd$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p dnd.app/Contents
        mkdir -p dnd.app/Contents/MacOS
        mkdir -p dnd.app/Contents/Resources
@@ -136,7 +138,7 @@ dnd.app/Contents/PkgInfo: dnd$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/dnd/" \
        -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/Info.plist.in >dnd.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >dnd.app/Contents/Info.plist
        
        
        echo -n "APPL????" >dnd.app/Contents/PkgInfo
@@ -145,10 +147,10 @@ dnd.app/Contents/PkgInfo: dnd$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB
        ln -f dnd$(EXEEXT) dnd.app/Contents/MacOS/dnd
        
        
-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc dnd.app/Contents/Resources/dnd.rsrc
-       ln -sf $(top_srcdir)/src/mac/wxmac.icns dnd.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc dnd.app/Contents/Resources/dnd.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dnd.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@dnd_bundle: dnd.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@dnd_bundle: $(____dnd_BUNDLE_TGT_REF_DEP)
 
 data: 
        @mkdir -p .