test wxCANCEL_DEFAULT flag

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

diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in
index 88909d236ce7e6e7e685b997639790eb0e6e1846..155e1c55990d43a4256d65f2d4b0fabc87bb8672 100644 (file)
--- a/samples/help/Makefile.in
+++ b/samples/help/Makefile.in
@@ -93,10 +93,14 @@ COND_PLATFORM_OS2_1___help___os2_emxbindcmd = $(NM) help$(EXEEXT) | if grep -q \
 @COND_PLATFORM_MACOSX_1@__help_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = help.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__help_bundle___depname = help_bundle
+@COND_TOOLKIT_OSX_CARBON@____help_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__help_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____help_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__help_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____help_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__help_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____help_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__help_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____help_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__help_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_HTML_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
@@ -150,7 +154,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc)
-       $(CXX) -o $@ $(HELP_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+       $(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
        
        $(__help___mac_setfilecmd)
        $(__help___os2_emxbindcmd)
@@ -219,6 +223,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
 $(srcdir)/include/wx/stc/stc.h
 
 # Include dependency info, if present:
-@IF_GNU_MAKE@-include ./.deps/*.d
+@IF_GNU_MAKE@-include .deps/*.d
 
 .PHONY: all install uninstall clean distclean help_bundle data data_doc