Only call GetBestSize if one or both of the minsize components are unset.

[wxWidgets.git] / contrib / samples / gizmos / splittree / Makefile.in

diff --git a/contrib/samples/gizmos/splittree/Makefile.in b/contrib/samples/gizmos/splittree/Makefile.in
index ea6ee0a6685913d4be36db3c77e25e1b1df90383..6200018a3b8e0abfc8acdf0e20248352845a07a7 100644 (file)
--- a/contrib/samples/gizmos/splittree/Makefile.in
+++ b/contrib/samples/gizmos/splittree/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
 SPLITTREE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
@@ -72,6 +72,10 @@ COND_PLATFORM_OS2_1___splittree___os2_emxbindcmd = $(NM) splittree$(EXEEXT) | \
 @COND_PLATFORM_OS2_1@__splittree_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__splittree_bundle___depname = splittree_bundle
+@COND_TOOLKIT_COCOA@____splittree_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   splittree.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____splittree_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     splittree.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)
@@ -101,7 +105,7 @@ 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 -i \
        $(srcdir)/../../../include -o splittree$(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: ###
@@ -130,7 +134,7 @@ splittree$(EXEEXT): $(SPLITTREE_OBJECTS) $(__splittree___win32rc)
        $(__splittree___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-splittree.app/Contents/PkgInfo: splittree$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+splittree.app/Contents/PkgInfo: splittree$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p splittree.app/Contents
        mkdir -p splittree.app/Contents/MacOS
        mkdir -p splittree.app/Contents/Resources
@@ -139,7 +143,7 @@ splittree.app/Contents/PkgInfo: splittree$(EXEEXT) $(top_srcdir)/src/mac/Info.pl
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/splittree/" \
        -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/Info.plist.in >splittree.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >splittree.app/Contents/Info.plist
        
        
        echo -n "APPL????" >splittree.app/Contents/PkgInfo
@@ -148,10 +152,10 @@ splittree.app/Contents/PkgInfo: splittree$(EXEEXT) $(top_srcdir)/src/mac/Info.pl
        ln -f splittree$(EXEEXT) splittree.app/Contents/MacOS/splittree
        
        
-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc splittree.app/Contents/Resources/splittree.rsrc
-       ln -sf $(top_srcdir)/src/mac/wxmac.icns splittree.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc splittree.app/Contents/Resources/splittree.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns splittree.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@splittree_bundle: splittree.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@splittree_bundle: $(____splittree_BUNDLE_TGT_REF_DEP)
 
 splittree_sample_rc.o: $(srcdir)/../../../../samples/sample.rc
        $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(top_srcdir)/include