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

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

diff --git a/samples/wrapsizer/Makefile.in b/samples/wrapsizer/Makefile.in
index a3ab08f2e6e636b8688afa35ce9d24ca04048a0c..b2102159bcce017e156a9cf98a87eab47802c9c5 100644 (file)
--- a/samples/wrapsizer/Makefile.in
+++ b/samples/wrapsizer/Makefile.in
@@ -97,11 +97,13 @@ COND_PLATFORM_OS2_1___wrapsizer___os2_emxbindcmd = $(NM) wrapsizer$(EXEEXT) | \
 @COND_PLATFORM_WIN32_1@__wrapsizer___win32rc = wrapsizer_sample_rc.o
 @COND_PLATFORM_OS2_1@__wrapsizer_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__wrapsizer_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@       = wrapsizer.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__wrapsizer_bundle___depname = wrapsizer_bundle
 @COND_TOOLKIT_COCOA@____wrapsizer_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@   wrapsizer.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@   $(__wrapsizer_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____wrapsizer_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     wrapsizer.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@     $(__wrapsizer_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)
@@ -160,25 +162,25 @@ wrapsizer$(EXEEXT): $(WRAPSIZER_OBJECTS) $(__wrapsizer___win32rc)
        $(__wrapsizer___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-wrapsizer.app/Contents/PkgInfo: wrapsizer$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-       mkdir -p wrapsizer.app/Contents
-       mkdir -p wrapsizer.app/Contents/MacOS
-       mkdir -p wrapsizer.app/Contents/Resources
-       
-       
-       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-       -e "s/EXECUTABLE/wrapsizer/" \
-       -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/carbon/Info.plist.in >wrapsizer.app/Contents/Info.plist
-       
-       
-       echo -n "APPL????" >wrapsizer.app/Contents/PkgInfo
-       
-       
-       ln -f wrapsizer$(EXEEXT) wrapsizer.app/Contents/MacOS/wrapsizer
-       
-       
-       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns wrapsizer.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@wrapsizer.app/Contents/PkgInfo: wrapsizer$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       mkdir -p wrapsizer.app/Contents
+@COND_PLATFORM_MACOSX_1@       mkdir -p wrapsizer.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@       mkdir -p wrapsizer.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/wrapsizer/" \
+@COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >wrapsizer.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >wrapsizer.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       ln -f wrapsizer$(EXEEXT) wrapsizer.app/Contents/MacOS/wrapsizer
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns wrapsizer.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@wrapsizer_bundle: $(____wrapsizer_BUNDLE_TGT_REF_DEP)