don't test for hash_{map,set} classes if we have unordered_map

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

diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in
index 461a05a02a1a878d8f66573704b3865f74a422b1..41269f4cb6bd62226fa88737f34f5b81f8bb6d43 100644 (file)
--- a/samples/display/Makefile.in
+++ b/samples/display/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.3 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -9,6 +9,7 @@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
 WINDRES = @WINDRES@
@@ -67,6 +68,7 @@ DISPLAY_OBJECTS =  \
 @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
 @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
 @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
+@COND_PLATFORM_MAC_0@__display___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__display___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C display$(EXEEXT)
 @COND_PLATFORM_MAC_1@__display___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -95,11 +97,13 @@ COND_PLATFORM_OS2_1___display___os2_emxbindcmd = $(NM) display$(EXEEXT) | if \
 @COND_PLATFORM_WIN32_1@__display___win32rc = display_sample_rc.o
 @COND_PLATFORM_OS2_1@__display_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__display_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@       = display.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__display_bundle___depname = display_bundle
 @COND_TOOLKIT_COCOA@____display_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@   display.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@   $(__display_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____display_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     display.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@     $(__display_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -158,25 +162,25 @@ display$(EXEEXT): $(DISPLAY_OBJECTS) $(__display___win32rc)
        $(__display___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-display.app/Contents/PkgInfo: display$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-       mkdir -p display.app/Contents
-       mkdir -p display.app/Contents/MacOS
-       mkdir -p display.app/Contents/Resources
-       
-       
-       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-       -e "s/EXECUTABLE/display/" \
-       -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/carbon/Info.plist.in >display.app/Contents/Info.plist
-       
-       
-       echo -n "APPL????" >display.app/Contents/PkgInfo
-       
-       
-       ln -f display$(EXEEXT) display.app/Contents/MacOS/display
-       
-       
-       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns display.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@display.app/Contents/PkgInfo: display$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       mkdir -p display.app/Contents
+@COND_PLATFORM_MACOSX_1@       mkdir -p display.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@       mkdir -p display.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/display/" \
+@COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >display.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >display.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       ln -f display$(EXEEXT) display.app/Contents/MacOS/display
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns display.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@display_bundle: $(____display_BUNDLE_TGT_REF_DEP)