fix crash which happened if you called SetAttr(NULL) followed by SetAttr(attr) (...

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

diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in
index 12b4ebf5e014b7016d4644ed496d1f3b2a1b87b7..fffec4b01d8aff59c6c7d2b433f513251733cc83 100644 (file)
--- a/samples/vscroll/Makefile.in
+++ b/samples/vscroll/Makefile.in
@@ -97,11 +97,13 @@ COND_PLATFORM_OS2_1___vstest___os2_emxbindcmd = $(NM) vstest$(EXEEXT) | if grep
 @COND_PLATFORM_WIN32_1@__vstest___win32rc = vstest_sample_rc.o
 @COND_PLATFORM_OS2_1@__vstest_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__vstest_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@       = vstest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__vstest_bundle___depname = vstest_bundle
 @COND_TOOLKIT_COCOA@____vstest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@   vstest.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@   $(__vstest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____vstest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     vstest.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@     $(__vstest_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 @@ vstest$(EXEEXT): $(VSTEST_OBJECTS) $(__vstest___win32rc)
        $(__vstest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-vstest.app/Contents/PkgInfo: vstest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-       mkdir -p vstest.app/Contents
-       mkdir -p vstest.app/Contents/MacOS
-       mkdir -p vstest.app/Contents/Resources
-       
-       
-       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-       -e "s/EXECUTABLE/vstest/" \
-       -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/carbon/Info.plist.in >vstest.app/Contents/Info.plist
-       
-       
-       echo -n "APPL????" >vstest.app/Contents/PkgInfo
-       
-       
-       ln -f vstest$(EXEEXT) vstest.app/Contents/MacOS/vstest
-       
-       
-       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns vstest.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@vstest.app/Contents/PkgInfo: vstest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       mkdir -p vstest.app/Contents
+@COND_PLATFORM_MACOSX_1@       mkdir -p vstest.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@       mkdir -p vstest.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/vstest/" \
+@COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >vstest.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >vstest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       ln -f vstest$(EXEEXT) vstest.app/Contents/MacOS/vstest
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns vstest.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@vstest_bundle: $(____vstest_BUNDLE_TGT_REF_DEP)