RCS-IDs

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

diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in
index 56d4bbfc5347fd18dc15e1a087e04538154a4787..40996e1871a20137039169d213703614137ce7b6 100644 (file)
--- a/samples/aui/Makefile.in
+++ b/samples/aui/Makefile.in
@@ -95,10 +95,16 @@ COND_PLATFORM_OS2_1___auidemo___os2_emxbindcmd = $(NM) auidemo$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__auidemo_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = auidemo.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__auidemo_bundle___depname = auidemo_bundle
-@COND_TOOLKIT_COCOA@____auidemo_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@   $(__auidemo_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____auidemo_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_MAC@     $(__auidemo_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_CARBON@____auidemo_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__auidemo_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____auidemo_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__auidemo_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____auidemo_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__auidemo_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_COCOA@____auidemo_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   $(__auidemo_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_AUI_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_AUI_p = $(COND_MONOLITHIC_0___WXLIB_AUI_p)
@@ -157,7 +163,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 auidemo$(EXEEXT): $(AUIDEMO_OBJECTS) $(__auidemo___win32rc)
-       $(CXX) -o $@ $(AUIDEMO_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_AUI_p)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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 $@ $(AUIDEMO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_AUI_p)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
        
        $(__auidemo___mac_setfilecmd)
        $(__auidemo___os2_emxbindcmd)
@@ -202,6 +208,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 auidemo_bundle