]> git.saurik.com Git - wxWidgets.git/commitdiff
adding new toolkits for osx
authorStefan Csomor <csomor@advancedconcepts.ch>
Thu, 11 Sep 2008 12:30:18 +0000 (12:30 +0000)
committerStefan Csomor <csomor@advancedconcepts.ch>
Thu, 11 Sep 2008 12:30:18 +0000 (12:30 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

80 files changed:
samples/access/Makefile.in
samples/animate/Makefile.in
samples/artprov/Makefile.in
samples/aui/Makefile.in
samples/calendar/Makefile.in
samples/caret/Makefile.in
samples/collpane/Makefile.in
samples/combo/Makefile.in
samples/config/Makefile.in
samples/console/Makefile.in
samples/controls/Makefile.in
samples/dataview/Makefile.in
samples/debugrpt/Makefile.in
samples/dialogs/Makefile.in
samples/dialup/Makefile.in
samples/display/Makefile.in
samples/dnd/Makefile.in
samples/docview/Makefile.in
samples/docvwmdi/Makefile.in
samples/dragimag/Makefile.in
samples/drawing/Makefile.in
samples/editlbox/Makefile.in
samples/erase/Makefile.in
samples/event/Makefile.in
samples/except/Makefile.in
samples/exec/Makefile.in
samples/font/Makefile.in
samples/grid/Makefile.in
samples/help/Makefile.in
samples/htlbox/Makefile.in
samples/html/Makefile.in
samples/image/Makefile.in
samples/internat/Makefile.in
samples/ipc/Makefile.in
samples/joytest/Makefile.in
samples/keyboard/Makefile.in
samples/layout/Makefile.in
samples/listctrl/Makefile.in
samples/mdi/Makefile.in
samples/mediaplayer/Makefile.in
samples/memcheck/Makefile.in
samples/menu/Makefile.in
samples/mfc/Makefile.in
samples/minimal/Makefile.in
samples/mobile/Makefile.in
samples/nativdlg/Makefile.in
samples/notebook/Makefile.in
samples/oleauto/Makefile.in
samples/opengl/Makefile.in
samples/ownerdrw/Makefile.in
samples/popup/Makefile.in
samples/power/Makefile.in
samples/printing/Makefile.in
samples/regtest/Makefile.in
samples/render/Makefile.in
samples/richtext/Makefile.in
samples/sashtest/Makefile.in
samples/scroll/Makefile.in
samples/scrollsub/Makefile.in
samples/shaped/Makefile.in
samples/sockets/Makefile.in
samples/sound/Makefile.in
samples/splash/Makefile.in
samples/splitter/Makefile.in
samples/statbar/Makefile.in
samples/stc/Makefile.in
samples/svg/Makefile.in
samples/taborder/Makefile.in
samples/taskbar/Makefile.in
samples/text/Makefile.in
samples/thread/Makefile.in
samples/toolbar/Makefile.in
samples/treectrl/Makefile.in
samples/typetest/Makefile.in
samples/validate/Makefile.in
samples/vscroll/Makefile.in
samples/widgets/Makefile.in
samples/wizard/Makefile.in
samples/wrapsizer/Makefile.in
samples/xrc/Makefile.in

index ff2e014e8c5b11877c9a1b7f47b237847ef9d8b5..2be34f237c757f5d70dff9e56665d1a99447f635 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___accesstest___os2_emxbindcmd = $(NM) accesstest$(EXEEXT) \
 @COND_PLATFORM_MACOSX_1@__accesstest_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = accesstest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__accesstest_bundle___depname = accesstest_bundle
+@COND_TOOLKIT_OSX_CARBON@____accesstest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__accesstest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____accesstest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__accesstest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____accesstest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__accesstest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____accesstest_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__accesstest_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____accesstest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__accesstest_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 accesstest$(EXEEXT): $(ACCESSTEST_OBJECTS) $(__accesstest___win32rc)
-       $(CXX) -o $@ $(ACCESSTEST_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(ACCESSTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__accesstest___mac_setfilecmd)
        $(__accesstest___os2_emxbindcmd)
@@ -186,6 +190,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 accesstest_bundle
index b0a225db7546c1ad1630283c0422b8a0843aa9d7..e8a06ee62d4f5bce23f22af4441baaba7c44c2c1 100644 (file)
@@ -92,10 +92,14 @@ COND_PLATFORM_OS2_1___anitest___os2_emxbindcmd = $(NM) anitest$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__anitest_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = anitest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__anitest_bundle___depname = anitest_bundle
+@COND_TOOLKIT_OSX_CARBON@____anitest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__anitest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____anitest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__anitest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____anitest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__anitest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____anitest_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__anitest_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____anitest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__anitest_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -146,7 +150,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 anitest$(EXEEXT): $(ANITEST_OBJECTS) $(__anitest___win32rc)
-       $(CXX) -o $@ $(ANITEST_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(ANITEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__anitest___mac_setfilecmd)
        $(__anitest___os2_emxbindcmd)
@@ -203,6 +207,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 anitest_bundle catalog
index 25adcf50ab2b778d30801cc090eede7b6180bba3..5a1c8ce2d1668f79ef7f13a7a54f4bc8ed465ee8 100644 (file)
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___arttest___os2_emxbindcmd = $(NM) arttest$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__arttest_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = arttest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__arttest_bundle___depname = arttest_bundle
+@COND_TOOLKIT_OSX_CARBON@____arttest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__arttest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____arttest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__arttest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____arttest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__arttest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____arttest_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__arttest_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____arttest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__arttest_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)
@@ -142,7 +146,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 arttest$(EXEEXT): $(ARTTEST_OBJECTS) $(__arttest___win32rc)
-       $(CXX) -o $@ $(ARTTEST_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(ARTTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__arttest___mac_setfilecmd)
        $(__arttest___os2_emxbindcmd)
@@ -190,6 +194,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 arttest_bundle
index 56d4bbfc5347fd18dc15e1a087e04538154a4787..8ab889be548ab4c8d71d80c69bea85b3d226f86d 100644 (file)
@@ -95,10 +95,14 @@ 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_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_TOOLKIT_MAC@____auidemo_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__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 +161,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 +206,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
index fa4958681d60d9a8c43db514dc0abc2adbc383a7..0b2d7321b51969c1ed87803c19b6a6e2dc7c80d2 100644 (file)
@@ -92,10 +92,14 @@ COND_PLATFORM_OS2_1___calendar___os2_emxbindcmd = $(NM) calendar$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__calendar_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = calendar.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__calendar_bundle___depname = calendar_bundle
+@COND_TOOLKIT_OSX_CARBON@____calendar_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__calendar_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____calendar_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__calendar_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____calendar_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__calendar_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____calendar_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__calendar_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____calendar_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__calendar_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -146,7 +150,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___win32rc)
-       $(CXX) -o $@ $(CALENDAR_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(CALENDAR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__calendar___mac_setfilecmd)
        $(__calendar___os2_emxbindcmd)
@@ -191,6 +195,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 calendar_bundle
index e0e06dc8671039f5650340f2936ad4811f808049..2e1e348dc8f6c011240128f1f534faa329edd23a 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___caret___os2_emxbindcmd = $(NM) caret$(EXEEXT) | if grep -q
 @COND_PLATFORM_MACOSX_1@__caret_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = caret.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__caret_bundle___depname = caret_bundle
+@COND_TOOLKIT_OSX_CARBON@____caret_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__caret_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____caret_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__caret_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____caret_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__caret_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____caret_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__caret_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____caret_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__caret_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 caret$(EXEEXT): $(CARET_OBJECTS) $(__caret___win32rc)
-       $(CXX) -o $@ $(CARET_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(CARET_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__caret___mac_setfilecmd)
        $(__caret___os2_emxbindcmd)
@@ -186,6 +190,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 caret_bundle
index 7f024672229c65fedd8d7da188f0a73875a7c501..c14d9abe371790fef3d1207d7e1a6e9ff826f991 100644 (file)
@@ -92,10 +92,14 @@ COND_PLATFORM_OS2_1___collpane___os2_emxbindcmd = $(NM) collpane$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__collpane_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = collpane.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__collpane_bundle___depname = collpane_bundle
+@COND_TOOLKIT_OSX_CARBON@____collpane_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__collpane_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____collpane_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__collpane_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____collpane_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__collpane_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____collpane_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__collpane_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____collpane_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__collpane_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -146,7 +150,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 collpane$(EXEEXT): $(COLLPANE_OBJECTS) $(__collpane___win32rc)
-       $(CXX) -o $@ $(COLLPANE_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(COLLPANE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__collpane___mac_setfilecmd)
        $(__collpane___os2_emxbindcmd)
@@ -191,6 +195,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 collpane_bundle
index 36215bb6f3025da33a89d5f8b12612f900628d2d..899ac60ab1d9a151dce70a9ff7c29e7ec9a8498b 100644 (file)
@@ -93,10 +93,14 @@ COND_PLATFORM_OS2_1___combo___os2_emxbindcmd = $(NM) combo$(EXEEXT) | if grep -q
 @COND_PLATFORM_MACOSX_1@__combo_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = combo.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__combo_bundle___depname = combo_bundle
+@COND_TOOLKIT_OSX_CARBON@____combo_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__combo_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____combo_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__combo_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____combo_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__combo_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____combo_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__combo_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____combo_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__combo_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -146,7 +150,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 combo$(EXEEXT): $(COMBO_OBJECTS) $(__combo___win32rc)
-       $(CXX) -o $@ $(COMBO_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(COMBO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__combo___mac_setfilecmd)
        $(__combo___os2_emxbindcmd)
@@ -203,6 +207,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 combo_bundle data
index 2c99b6f15987eb4f5a822920172223a70e20fbc1..00105d6fe3211c47e8562a89e1253289d4bb9242 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___conftest___os2_emxbindcmd = $(NM) conftest$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__conftest_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = conftest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__conftest_bundle___depname = conftest_bundle
+@COND_TOOLKIT_OSX_CARBON@____conftest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__conftest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____conftest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__conftest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____conftest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__conftest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____conftest_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__conftest_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____conftest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__conftest_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc)
-       $(CXX) -o $@ $(CONFTEST_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(CONFTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__conftest___mac_setfilecmd)
        $(__conftest___os2_emxbindcmd)
@@ -186,6 +190,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 conftest_bundle
index dbe6dfa1c06981956a4b1afb100d53b94ba589cd..a25679eee03be918bb5d6296dc1877d9da4786e5 100644 (file)
@@ -102,7 +102,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 console$(EXEEXT): $(CONSOLE_OBJECTS)
-       $(CXX) -o $@ $(CONSOLE_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+       $(CXX) -o $@ $(CONSOLE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
        
        $(__console___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
@@ -133,6 +133,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 data
index 71268ebd099396b802bd5f3be84b338c29b9b536..f8f113b2f83b095a71886a6f50f7c4ad0d2278f6 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___controls___os2_emxbindcmd = $(NM) controls$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__controls_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = controls.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__controls_bundle___depname = controls_bundle
+@COND_TOOLKIT_OSX_CARBON@____controls_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__controls_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____controls_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__controls_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____controls_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__controls_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____controls_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__controls_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____controls_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__controls_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 controls$(EXEEXT): $(CONTROLS_OBJECTS) $(__controls___win32rc)
-       $(CXX) -o $@ $(CONTROLS_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(CONTROLS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__controls___mac_setfilecmd)
        $(__controls___os2_emxbindcmd)
@@ -198,6 +202,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 controls_bundle data
index 5509311b297df517ac4c6920b9c7579f886d8ba0..0c49a7bc541e4a8233042051dcd9bde8d8c666db 100644 (file)
@@ -92,10 +92,14 @@ COND_PLATFORM_OS2_1___dataview___os2_emxbindcmd = $(NM) dataview$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__dataview_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = dataview.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__dataview_bundle___depname = dataview_bundle
+@COND_TOOLKIT_OSX_CARBON@____dataview_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__dataview_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____dataview_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__dataview_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____dataview_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__dataview_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____dataview_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__dataview_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____dataview_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__dataview_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -146,7 +150,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 dataview$(EXEEXT): $(DATAVIEW_OBJECTS) $(__dataview___win32rc)
-       $(CXX) -o $@ $(DATAVIEW_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(DATAVIEW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__dataview___mac_setfilecmd)
        $(__dataview___os2_emxbindcmd)
@@ -191,6 +195,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 dataview_bundle
index 89dcc686942c71f6ac0cb6a520c970eac674c923..20b5d8685d2c28cca10a288bab33be291a8a0e8a 100644 (file)
@@ -92,10 +92,14 @@ COND_PLATFORM_OS2_1___debugrpt___os2_emxbindcmd = $(NM) debugrpt$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__debugrpt_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = debugrpt.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__debugrpt_bundle___depname = debugrpt_bundle
+@COND_TOOLKIT_OSX_CARBON@____debugrpt_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__debugrpt_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____debugrpt_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__debugrpt_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____debugrpt_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__debugrpt_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____debugrpt_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__debugrpt_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____debugrpt_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__debugrpt_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_QA_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_QA_p = $(COND_MONOLITHIC_0___WXLIB_QA_p)
@@ -148,7 +152,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 debugrpt$(EXEEXT): $(DEBUGRPT_OBJECTS) $(__debugrpt___win32rc)
-       $(CXX) -o $@ $(DEBUGRPT_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_QA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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 $@ $(DEBUGRPT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_QA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
        
        $(__debugrpt___mac_setfilecmd)
        $(__debugrpt___os2_emxbindcmd)
@@ -193,6 +197,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 debugrpt_bundle
index 5e41f13cbb0bf992efb4275e53d2da74459f46ec..5d89848e0c5a503bbc809aea8473fc1eb8f55dc9 100644 (file)
@@ -95,18 +95,22 @@ COND_PLATFORM_OS2_1___dialogs___os2_emxbindcmd = $(NM) dialogs$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__dialogs_bundle___depname = dialogs_bundle
 @COND_TOOLKIT_COCOA@____dialogs_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__dialogs_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____dialogs_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__dialogs_app_Contents_PkgInfo___depname)
-@COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS \
-@COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@   = dialogs_colrdlgg.o dialogs_dirdlgg.o \
-@COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@   dialogs_filedlgg.o dialogs_fontdlgg.o
+@COND_TOOLKIT_OSX_CARBON@____dialogs_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__dialogs_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____dialogs_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__dialogs_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____dialogs_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__dialogs_app_Contents_PkgInfo___depname)
 @COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS \
 @COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@   = dialogs_colrdlgg.o dialogs_dirdlgg.o \
 @COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@   dialogs_filedlgg.o
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS \
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   = dialogs_filedlgg.o
+@COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS \
+@COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@   = dialogs_colrdlgg.o dialogs_dirdlgg.o \
+@COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@   dialogs_filedlgg.o dialogs_fontdlgg.o
 @COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS \
 @COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@    = dialogs_fontdlgg.o dialogs_filedlgg.o
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS \
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   = dialogs_filedlgg.o
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -157,7 +161,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 dialogs$(EXEEXT): $(DIALOGS_OBJECTS) $(__dialogs___win32rc)
-       $(CXX) -o $@ $(DIALOGS_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(DIALOGS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__dialogs___mac_setfilecmd)
        $(__dialogs___os2_emxbindcmd)
@@ -244,6 +248,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 dialogs_bundle data
index e4d695df6ec3f183a5791d767b780afc69ff51c8..b0dd83b99ef8fc77ac13b3484fb3acf5d1849edb 100644 (file)
@@ -92,10 +92,14 @@ COND_PLATFORM_OS2_1___nettest___os2_emxbindcmd = $(NM) nettest$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@      = nettest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@__nettest_bundle___depname \
 @COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@      = nettest_bundle
+@COND_TOOLKIT_OSX_CARBON@____nettest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__nettest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____nettest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__nettest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____nettest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__nettest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____nettest_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__nettest_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____nettest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__nettest_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)
@@ -143,7 +147,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 @COND_PLATFORM_MSDOS_0@nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc)
-@COND_PLATFORM_MSDOS_0@        $(CXX) -o $@ $(NETTEST_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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)
+@COND_PLATFORM_MSDOS_0@        $(CXX) -o $@ $(NETTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
 @COND_PLATFORM_MSDOS_0@        
 @COND_PLATFORM_MSDOS_0@        $(__nettest___mac_setfilecmd)
 @COND_PLATFORM_MSDOS_0@        $(__nettest___os2_emxbindcmd)
@@ -188,6 +192,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 nettest_bundle
index 3310e9197880d1ed0e1e022d5da82b30025e9716..451f1d4d613906fdef5cbf77da03351f1a8344c5 100644 (file)
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___display___os2_emxbindcmd = $(NM) display$(EXEEXT) | if \
 @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_OSX_CARBON@____display_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__display_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____display_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__display_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____display_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__display_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____display_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__display_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____display_BUNDLE_TGT_REF_DEP = \
-@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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 display$(EXEEXT): $(DISPLAY_OBJECTS) $(__display___win32rc)
-       $(CXX) -o $@ $(DISPLAY_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(DISPLAY_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__display___mac_setfilecmd)
        $(__display___os2_emxbindcmd)
@@ -186,6 +190,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 display_bundle
index 2abcaab25e10a793ff4c6d552ef4e7c50f4631b3..cde0afd8c4a3324afe0c9a155c3febfdd104b7a0 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___dnd___os2_emxbindcmd = $(NM) dnd$(EXEEXT) | if grep -q \
 @COND_PLATFORM_MACOSX_1@__dnd_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = dnd.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__dnd_bundle___depname = dnd_bundle
+@COND_TOOLKIT_OSX_CARBON@____dnd_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__dnd_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____dnd_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__dnd_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____dnd_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__dnd_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____dnd_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__dnd_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____dnd_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__dnd_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 dnd$(EXEEXT): $(DND_OBJECTS) $(__dnd___win32rc)
-       $(CXX) -o $@ $(DND_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(DND_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__dnd___mac_setfilecmd)
        $(__dnd___os2_emxbindcmd)
@@ -198,6 +202,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 dnd_bundle data
index dba3e82c3f67adf00c27c5f861eb18bdf349efff..ff972beacf3365797a010a3c29a368009c133a04 100644 (file)
@@ -92,10 +92,14 @@ COND_PLATFORM_OS2_1___docview___os2_emxbindcmd = $(NM) docview$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__docview_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = docview.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__docview_bundle___depname = docview_bundle
+@COND_TOOLKIT_OSX_CARBON@____docview_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__docview_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____docview_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__docview_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____docview_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__docview_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____docview_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__docview_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____docview_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__docview_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)
@@ -143,7 +147,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc)
-       $(CXX) -o $@ $(DOCVIEW_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(DOCVIEW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__docview___mac_setfilecmd)
        $(__docview___os2_emxbindcmd)
@@ -195,6 +199,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 docview_bundle
index 10bc335da30fe150c1b7b9cda97e8ee5ce4a2eeb..c4bfc6932dd91a0bea6a5fba89acb92677b836f1 100644 (file)
@@ -92,10 +92,14 @@ COND_PLATFORM_OS2_1___docvwmdi___os2_emxbindcmd = $(NM) docvwmdi$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__docvwmdi_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = docvwmdi.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__docvwmdi_bundle___depname = docvwmdi_bundle
+@COND_TOOLKIT_OSX_CARBON@____docvwmdi_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__docvwmdi_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____docvwmdi_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__docvwmdi_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____docvwmdi_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__docvwmdi_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____docvwmdi_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__docvwmdi_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____docvwmdi_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__docvwmdi_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)
@@ -143,7 +147,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 docvwmdi$(EXEEXT): $(DOCVWMDI_OBJECTS) $(__docvwmdi___win32rc)
-       $(CXX) -o $@ $(DOCVWMDI_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(DOCVWMDI_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__docvwmdi___mac_setfilecmd)
        $(__docvwmdi___os2_emxbindcmd)
@@ -194,6 +198,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 docvwmdi_bundle
index 60157073683815c5ce0a90edef0d0a83b7400160..fa031b3fd55a743c6224a6914aef6335b25d4376 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___dragimag___os2_emxbindcmd = $(NM) dragimag$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__dragimag_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = dragimag.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__dragimag_bundle___depname = dragimag_bundle
+@COND_TOOLKIT_OSX_CARBON@____dragimag_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__dragimag_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____dragimag_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__dragimag_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____dragimag_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__dragimag_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____dragimag_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__dragimag_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____dragimag_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__dragimag_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 dragimag$(EXEEXT): $(DRAGIMAG_OBJECTS) $(__dragimag___win32rc)
-       $(CXX) -o $@ $(DRAGIMAG_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(DRAGIMAG_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__dragimag___mac_setfilecmd)
        $(__dragimag___os2_emxbindcmd)
@@ -198,6 +202,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 dragimag_bundle data
index f9e3a1cb52d8c11333778aabf2d9e43f9ae06081..65bcff40f5c1772d76e34c85166a17db70762446 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___drawing___os2_emxbindcmd = $(NM) drawing$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__drawing_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = drawing.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__drawing_bundle___depname = drawing_bundle
+@COND_TOOLKIT_OSX_CARBON@____drawing_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__drawing_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____drawing_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__drawing_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____drawing_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__drawing_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____drawing_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__drawing_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____drawing_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__drawing_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 drawing$(EXEEXT): $(DRAWING_OBJECTS) $(__drawing___win32rc)
-       $(CXX) -o $@ $(DRAWING_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(DRAWING_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__drawing___mac_setfilecmd)
        $(__drawing___os2_emxbindcmd)
@@ -198,6 +202,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 drawing_bundle data
index a4b32d177191a6f281b5f44aa865e5bf4683af39..a5f4bff0cbcfda0eb44f8361fa645819500c22fa 100644 (file)
@@ -93,10 +93,14 @@ COND_PLATFORM_OS2_1___editlbox___os2_emxbindcmd = $(NM) editlbox$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__editlbox_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = editlbox.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__editlbox_bundle___depname = editlbox_bundle
+@COND_TOOLKIT_OSX_CARBON@____editlbox_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__editlbox_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____editlbox_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__editlbox_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____editlbox_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__editlbox_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____editlbox_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__editlbox_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____editlbox_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__editlbox_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -146,7 +150,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 editlbox$(EXEEXT): $(EDITLBOX_OBJECTS) $(__editlbox___win32rc)
-       $(CXX) -o $@ $(EDITLBOX_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(EDITLBOX_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__editlbox___mac_setfilecmd)
        $(__editlbox___os2_emxbindcmd)
@@ -191,6 +195,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 editlbox_bundle
index 68616814de400d7019ac0be84688b901a533a2e3..b02cc73e45afd2496b13c8e85c48d29a9703e516 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___erase___os2_emxbindcmd = $(NM) erase$(EXEEXT) | if grep -q
 @COND_PLATFORM_MACOSX_1@__erase_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = erase.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__erase_bundle___depname = erase_bundle
+@COND_TOOLKIT_OSX_CARBON@____erase_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__erase_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____erase_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__erase_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____erase_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__erase_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____erase_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__erase_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____erase_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__erase_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 erase$(EXEEXT): $(ERASE_OBJECTS) $(__erase___win32rc)
-       $(CXX) -o $@ $(ERASE_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(ERASE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__erase___mac_setfilecmd)
        $(__erase___os2_emxbindcmd)
@@ -186,6 +190,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 erase_bundle
index ef25e8174db82b6ea6b8809ed894bf5cc65b199d..f0371d00427a91314145f40742d3f27ca40985cb 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___event___os2_emxbindcmd = $(NM) event$(EXEEXT) | if grep -q
 @COND_PLATFORM_MACOSX_1@__event_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = event.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__event_bundle___depname = event_bundle
+@COND_TOOLKIT_OSX_CARBON@____event_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__event_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____event_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__event_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____event_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__event_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____event_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__event_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____event_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__event_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 event$(EXEEXT): $(EVENT_OBJECTS) $(__event___win32rc)
-       $(CXX) -o $@ $(EVENT_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(EVENT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__event___mac_setfilecmd)
        $(__event___os2_emxbindcmd)
@@ -186,6 +190,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 event_bundle
index 6dd7f3e4b79dcd6965ec3d0119a722139d981550..f35677602c95d572884742b05a276bca179ea8a2 100644 (file)
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___except___os2_emxbindcmd = $(NM) except$(EXEEXT) | if grep
 @COND_PLATFORM_MACOSX_1@__except_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = except.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__except_bundle___depname = except_bundle
+@COND_TOOLKIT_OSX_CARBON@____except_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__except_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____except_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__except_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____except_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__except_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____except_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__except_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____except_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__except_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 except$(EXEEXT): $(EXCEPT_OBJECTS) $(__except___win32rc)
-       $(CXX) -o $@ $(EXCEPT_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(EXCEPT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__except___mac_setfilecmd)
        $(__except___os2_emxbindcmd)
@@ -186,6 +190,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 except_bundle
index 4341e9f4f12c94a72cfe5417692b0e27eb50c8c6..1feba66fc903a8cd1fe02e2954dc33674d8d64b8 100644 (file)
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___exec___os2_emxbindcmd = $(NM) exec$(EXEEXT) | if grep -q \
 @COND_PLATFORM_MACOSX_1@__exec_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = exec.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__exec_bundle___depname = exec_bundle
+@COND_TOOLKIT_OSX_CARBON@____exec_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__exec_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____exec_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__exec_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____exec_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__exec_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____exec_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__exec_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____exec_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__exec_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc)
-       $(CXX) -o $@ $(EXEC_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(EXEC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__exec___mac_setfilecmd)
        $(__exec___os2_emxbindcmd)
@@ -186,6 +190,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 exec_bundle
index 75710360de37f9faffc214649e58e430c1194a29..3c4a453fc7e9925b6c3161eafb92f23f555ed825 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___font___os2_emxbindcmd = $(NM) font$(EXEEXT) | if grep -q \
 @COND_PLATFORM_MACOSX_1@__font_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = font.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__font_bundle___depname = font_bundle
+@COND_TOOLKIT_OSX_CARBON@____font_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__font_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____font_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__font_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____font_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__font_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____font_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__font_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____font_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__font_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 font$(EXEEXT): $(FONT_OBJECTS) $(__font___win32rc)
-       $(CXX) -o $@ $(FONT_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(FONT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__font___mac_setfilecmd)
        $(__font___os2_emxbindcmd)
@@ -186,6 +190,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 font_bundle
index 2d2c4f505041bb23fee2c6336123650dcbb063cd..a16ab43bf0973b9f28547a6479aad883248d1692 100644 (file)
@@ -94,10 +94,14 @@ COND_PLATFORM_OS2_1___grid___os2_emxbindcmd = $(NM) grid$(EXEEXT) | if grep -q \
 @COND_PLATFORM_MACOSX_1@__grid_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = grid.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__grid_bundle___depname = grid_bundle
+@COND_TOOLKIT_OSX_CARBON@____grid_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__grid_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____grid_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__grid_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____grid_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__grid_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____grid_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__grid_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____grid_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__grid_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -154,7 +158,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc)
-       $(CXX) -o $@ $(GRID_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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 $@ $(GRID_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
        
        $(__grid___mac_setfilecmd)
        $(__grid___os2_emxbindcmd)
@@ -199,6 +203,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 grid_bundle
index 88909d236ce7e6e7e685b997639790eb0e6e1846..155e1c55990d43a4256d65f2d4b0fabc87bb8672 100644 (file)
@@ -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
index d89e15044c37e135437fa86e8201804ddefaa49a..68c3e588d705c069d63ad8f49436c90dcb08ee96 100644 (file)
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___htlbox___os2_emxbindcmd = $(NM) htlbox$(EXEEXT) | if grep
 @COND_PLATFORM_MACOSX_1@__htlbox_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = htlbox.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__htlbox_bundle___depname = htlbox_bundle
+@COND_TOOLKIT_OSX_CARBON@____htlbox_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__htlbox_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____htlbox_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__htlbox_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____htlbox_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__htlbox_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____htlbox_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__htlbox_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____htlbox_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__htlbox_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)
@@ -145,7 +149,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc)
-       $(CXX) -o $@ $(HTLBOX_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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 $@ $(HTLBOX_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
        
        $(__htlbox___mac_setfilecmd)
        $(__htlbox___os2_emxbindcmd)
@@ -190,6 +194,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 htlbox_bundle
index f20c1babadfcd1ac68246926d787849b4aa010e9..d216c12f734fa3d9df6a7e3a99f6a93c51345264 100644 (file)
@@ -78,7 +78,6 @@ zip:
 
 
 # Include dependency info, if present:
-@IF_GNU_MAKE@-include ./.deps/*.d
+@IF_GNU_MAKE@-include .deps/*.d
 
-.PHONY: all install uninstall clean distclean about help helpview printing test \
-       virtual widget zip
+.PHONY: all install uninstall clean distclean about help helpview printing test virtual widget zip
index 7868fd9accbfa7777426abe6d9b26524aebdf943..3e2c5ef0746961e08f211a2556db8c4902adfea7 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___image___os2_emxbindcmd = $(NM) image$(EXEEXT) | if grep -q
 @COND_PLATFORM_MACOSX_1@__image_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = image.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__image_bundle___depname = image_bundle
+@COND_TOOLKIT_OSX_CARBON@____image_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__image_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____image_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__image_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____image_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__image_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____image_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__image_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____image_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__image_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc)
-       $(CXX) -o $@ $(IMAGE_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(IMAGE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__image___mac_setfilecmd)
        $(__image___os2_emxbindcmd)
@@ -198,6 +202,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 image_bundle data
index 0d5dca98663bdbb066022ecb5d38bf43bbe7e987..f682224676b23bd15e5f51175a00f8713bb76989 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___internat___os2_emxbindcmd = $(NM) internat$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__internat_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = internat.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__internat_bundle___depname = internat_bundle
+@COND_TOOLKIT_OSX_CARBON@____internat_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__internat_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____internat_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__internat_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____internat_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__internat_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____internat_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__internat_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____internat_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__internat_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc)
-       $(CXX) -o $@ $(INTERNAT_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(INTERNAT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__internat___mac_setfilecmd)
        $(__internat___os2_emxbindcmd)
@@ -318,7 +322,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 internat_bundle ar bg cs de fr ka pl ru sv \
-       ja ja_JP.EUC-JP
+.PHONY: all install uninstall clean distclean internat_bundle ar bg cs de fr ka pl ru sv ja ja_JP.EUC-JP
index dd5df87b879a65838d4d06ab5bb27cb76d5ef286..e41a15523d0d39627ae7ab37ab121fbfe8349f7c 100644 (file)
@@ -101,8 +101,12 @@ COND_PLATFORM_OS2_1___ipcclient___os2_emxbindcmd = $(NM) ipcclient$(EXEEXT) | \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     = ipcclient_bundle
 @COND_TOOLKIT_COCOA@____ipcclient_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__ipcclient_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____ipcclient_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__ipcclient_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_CARBON@____ipcclient_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__ipcclient_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____ipcclient_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__ipcclient_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____ipcclient_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__ipcclient_app_Contents_PkgInfo___depname)
 @COND_USE_GUI_1@__ipcserver___depname = ipcserver$(EXEEXT)
 @COND_PLATFORM_MAC_0@__ipcserver___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__ipcserver___mac_setfilecmd = \
@@ -117,8 +121,12 @@ COND_PLATFORM_OS2_1___ipcserver___os2_emxbindcmd = $(NM) ipcserver$(EXEEXT) | \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     = ipcserver_bundle
 @COND_TOOLKIT_COCOA@____ipcserver_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__ipcserver_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____ipcserver_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__ipcserver_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_CARBON@____ipcserver_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__ipcserver_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____ipcserver_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__ipcserver_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____ipcserver_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__ipcserver_app_Contents_PkgInfo___depname)
 @COND_PLATFORM_MAC_0@__baseipcclient___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__baseipcclient___mac_setfilecmd \
 @COND_PLATFORM_MAC_1@  = $(SETFILE) -t APPL baseipcclient$(EXEEXT)
@@ -191,7 +199,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 @COND_USE_GUI_1@ipcclient$(EXEEXT): $(IPCCLIENT_OBJECTS) $(__ipcclient___win32rc)
-@COND_USE_GUI_1@       $(CXX) -o $@ $(IPCCLIENT_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_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)
+@COND_USE_GUI_1@       $(CXX) -o $@ $(IPCCLIENT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_NET_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)
 @COND_USE_GUI_1@       
 @COND_USE_GUI_1@       $(__ipcclient___mac_setfilecmd)
 @COND_USE_GUI_1@       $(__ipcclient___os2_emxbindcmd)
@@ -220,7 +228,7 @@ distclean: clean
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcclient_bundle: $(____ipcclient_BUNDLE_TGT_REF_DEP)
 
 @COND_USE_GUI_1@ipcserver$(EXEEXT): $(IPCSERVER_OBJECTS) $(__ipcserver___win32rc)
-@COND_USE_GUI_1@       $(CXX) -o $@ $(IPCSERVER_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_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)
+@COND_USE_GUI_1@       $(CXX) -o $@ $(IPCSERVER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_NET_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)
 @COND_USE_GUI_1@       
 @COND_USE_GUI_1@       $(__ipcserver___mac_setfilecmd)
 @COND_USE_GUI_1@       $(__ipcserver___os2_emxbindcmd)
@@ -249,13 +257,13 @@ distclean: clean
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcserver_bundle: $(____ipcserver_BUNDLE_TGT_REF_DEP)
 
 baseipcclient$(EXEEXT): $(BASEIPCCLIENT_OBJECTS)
-       $(CXX) -o $@ $(BASEIPCCLIENT_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+       $(CXX) -o $@ $(BASEIPCCLIENT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
        
        $(__baseipcclient___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
 
 baseipcserver$(EXEEXT): $(BASEIPCSERVER_OBJECTS)
-       $(CXX) -o $@ $(BASEIPCSERVER_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+       $(CXX) -o $@ $(BASEIPCSERVER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
        
        $(__baseipcserver___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
@@ -289,6 +297,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 ipcclient_bundle ipcserver_bundle
index 208205696ab22fc860e199fa9c1be29cc96d745a..25db5bd4bf7705b426d3f9d22be68054f589abe8 100644 (file)
@@ -92,10 +92,14 @@ COND_PLATFORM_OS2_1___joytest___os2_emxbindcmd = $(NM) joytest$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__joytest_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = joytest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__joytest_bundle___depname = joytest_bundle
+@COND_TOOLKIT_OSX_CARBON@____joytest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__joytest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____joytest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__joytest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____joytest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__joytest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____joytest_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__joytest_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____joytest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__joytest_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -146,7 +150,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc)
-       $(CXX) -o $@ $(JOYTEST_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(JOYTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__joytest___mac_setfilecmd)
        $(__joytest___os2_emxbindcmd)
@@ -191,6 +195,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 joytest_bundle
index 7c8442ec6865d58c21e27ede6968437f3621b384..e49232fd1bb49709ad1e239586ced816966699ab 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___keyboard___os2_emxbindcmd = $(NM) keyboard$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__keyboard_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = keyboard.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__keyboard_bundle___depname = keyboard_bundle
+@COND_TOOLKIT_OSX_CARBON@____keyboard_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__keyboard_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____keyboard_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__keyboard_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____keyboard_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__keyboard_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____keyboard_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__keyboard_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____keyboard_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__keyboard_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc)
-       $(CXX) -o $@ $(KEYBOARD_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(KEYBOARD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__keyboard___mac_setfilecmd)
        $(__keyboard___os2_emxbindcmd)
@@ -186,6 +190,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 keyboard_bundle
index a3314c391ed24218bdb456c510a71e0021cdc1f2..499ae3a70afeb0e69b249c69c4e59001910412bb 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___layout___os2_emxbindcmd = $(NM) layout$(EXEEXT) | if grep
 @COND_PLATFORM_MACOSX_1@__layout_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = layout.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__layout_bundle___depname = layout_bundle
+@COND_TOOLKIT_OSX_CARBON@____layout_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__layout_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____layout_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__layout_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____layout_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__layout_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____layout_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__layout_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____layout_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__layout_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc)
-       $(CXX) -o $@ $(LAYOUT_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(LAYOUT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__layout___mac_setfilecmd)
        $(__layout___os2_emxbindcmd)
@@ -186,6 +190,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 layout_bundle
index 45dc01a3bf54d0a2ee2d853b5e21b9ea7b297dea..913b84cb2f2b5cd27e6f716c84112296b4757a8a 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___listctrl___os2_emxbindcmd = $(NM) listctrl$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__listctrl_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = listctrl.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__listctrl_bundle___depname = listctrl_bundle
+@COND_TOOLKIT_OSX_CARBON@____listctrl_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__listctrl_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____listctrl_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__listctrl_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____listctrl_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__listctrl_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____listctrl_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__listctrl_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____listctrl_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__listctrl_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 listctrl$(EXEEXT): $(LISTCTRL_OBJECTS) $(__listctrl___win32rc)
-       $(CXX) -o $@ $(LISTCTRL_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(LISTCTRL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__listctrl___mac_setfilecmd)
        $(__listctrl___os2_emxbindcmd)
@@ -186,6 +190,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 listctrl_bundle
index 84255a1fe05fb991bc3c7aa26f86a080fe5afac0..a0b22a2cac18a0ce354b01345a20d6db9b13322e 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___mdi___os2_emxbindcmd = $(NM) mdi$(EXEEXT) | if grep -q \
 @COND_PLATFORM_MACOSX_1@__mdi_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = mdi.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__mdi_bundle___depname = mdi_bundle
+@COND_TOOLKIT_OSX_CARBON@____mdi_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__mdi_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____mdi_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__mdi_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____mdi_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__mdi_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____mdi_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__mdi_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____mdi_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__mdi_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 mdi$(EXEEXT): $(MDI_OBJECTS) $(__mdi___win32rc)
-       $(CXX) -o $@ $(MDI_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(MDI_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__mdi___mac_setfilecmd)
        $(__mdi___os2_emxbindcmd)
@@ -186,6 +190,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 mdi_bundle
index b9906c64706e9331368aba9e10efb3bfcbb3e267..61ab38f1403fe682b0482266e6df5676df181752 100644 (file)
@@ -93,10 +93,16 @@ COND_PLATFORM_OS2_1___mediaplayer___os2_emxbindcmd = $(NM) \
 @COND_PLATFORM_MACOSX_1@__mediaplayer_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = mediaplayer.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__mediaplayer_bundle___depname = mediaplayer_bundle
+@COND_TOOLKIT_OSX_CARBON@____mediaplayer_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = \
+@COND_TOOLKIT_OSX_CARBON@      $(__mediaplayer_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____mediaplayer_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__mediaplayer_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____mediaplayer_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = \
+@COND_TOOLKIT_OSX_IPHONE@      $(__mediaplayer_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____mediaplayer_BUNDLE_TGT_REF_DEP \
 @COND_TOOLKIT_COCOA@   = $(__mediaplayer_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____mediaplayer_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__mediaplayer_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0_USE_MEDIA_1___WXLIB_MEDIA_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0_USE_MEDIA_1@__WXLIB_MEDIA_p = $(COND_MONOLITHIC_0_USE_MEDIA_1___WXLIB_MEDIA_p)
@@ -146,7 +152,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 mediaplayer$(EXEEXT): $(MEDIAPLAYER_OBJECTS) $(__mediaplayer___win32rc)
-       $(CXX) -o $@ $(MEDIAPLAYER_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__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 $@ $(MEDIAPLAYER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__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)
        
        $(__mediaplayer___mac_setfilecmd)
        $(__mediaplayer___os2_emxbindcmd)
@@ -191,6 +197,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 mediaplayer_bundle
index 67ebf96d093db71e2b5cac2a1970d133191faf32..4b391928fb531f2c8e223ec9084a13ce318a6302 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___memcheck___os2_emxbindcmd = $(NM) memcheck$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__memcheck_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = memcheck.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__memcheck_bundle___depname = memcheck_bundle
+@COND_TOOLKIT_OSX_CARBON@____memcheck_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__memcheck_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____memcheck_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__memcheck_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____memcheck_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__memcheck_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____memcheck_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__memcheck_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____memcheck_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__memcheck_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 memcheck$(EXEEXT): $(MEMCHECK_OBJECTS) $(__memcheck___win32rc)
-       $(CXX) -o $@ $(MEMCHECK_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(MEMCHECK_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__memcheck___mac_setfilecmd)
        $(__memcheck___os2_emxbindcmd)
@@ -186,6 +190,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 memcheck_bundle
index b357dc2defe123c7e9d5c2570c0af107d3a97c3c..ab0a078d33e59d59f4183626641aaa95f73aa4f2 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___menu___os2_emxbindcmd = $(NM) menu$(EXEEXT) | if grep -q \
 @COND_PLATFORM_MACOSX_1@__menu_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = menu.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__menu_bundle___depname = menu_bundle
+@COND_TOOLKIT_OSX_CARBON@____menu_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__menu_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____menu_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__menu_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____menu_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__menu_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____menu_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__menu_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____menu_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__menu_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc)
-       $(CXX) -o $@ $(MENU_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(MENU_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__menu___mac_setfilecmd)
        $(__menu___os2_emxbindcmd)
@@ -186,6 +190,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 menu_bundle
index f4d013f04ddb2ec54e19e5d312497ed632740485..a8afbc3485bf9b973e240d128e233fbcea8b10df 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___mfctest___os2_emxbindcmd = $(NM) mfctest$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__mfctest_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = mfctest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__mfctest_bundle___depname = mfctest_bundle
+@COND_TOOLKIT_OSX_CARBON@____mfctest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__mfctest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____mfctest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__mfctest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____mfctest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__mfctest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____mfctest_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__mfctest_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____mfctest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__mfctest_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 mfctest$(EXEEXT): $(MFCTEST_OBJECTS) $(__mfctest___win32rc)
-       $(CXX) -o $@ $(MFCTEST_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(MFCTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__mfctest___mac_setfilecmd)
        $(__mfctest___os2_emxbindcmd)
@@ -186,6 +190,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 mfctest_bundle
index d769956013f6fff86a9aaf81df86e48241f025e4..7b3d93e4b4f1d2e50a0391a3979159cff4a893af 100644 (file)
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___minimal___os2_emxbindcmd = $(NM) minimal$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__minimal_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = minimal.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__minimal_bundle___depname = minimal_bundle
+@COND_TOOLKIT_OSX_CARBON@____minimal_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__minimal_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____minimal_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__minimal_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____minimal_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__minimal_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____minimal_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__minimal_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____minimal_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__minimal_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc)
-       $(CXX) -o $@ $(MINIMAL_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(MINIMAL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__minimal___mac_setfilecmd)
        $(__minimal___os2_emxbindcmd)
@@ -186,6 +190,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 minimal_bundle
index 0277306f7e31e41dc36bcb2bb1d06fe10c8949a3..ce6a0fb6a7ee7a8583b3e858a731239a718a9967 100644 (file)
@@ -48,6 +48,6 @@ wxedit:
 
 
 # Include dependency info, if present:
-@IF_GNU_MAKE@-include ./.deps/*.d
+@IF_GNU_MAKE@-include .deps/*.d
 
 .PHONY: all install uninstall clean distclean styles wxedit
index db89e9d500bef5f56ae1f563bdb196dad571ce9a..02b3aea66a35d48667fc120468454487c24c1b75 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___nativdlg___os2_emxbindcmd = $(NM) nativdlg$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__nativdlg_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = nativdlg.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__nativdlg_bundle___depname = nativdlg_bundle
+@COND_TOOLKIT_OSX_CARBON@____nativdlg_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__nativdlg_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____nativdlg_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__nativdlg_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____nativdlg_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__nativdlg_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____nativdlg_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__nativdlg_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____nativdlg_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__nativdlg_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 nativdlg$(EXEEXT): $(NATIVDLG_OBJECTS) $(__nativdlg___win32rc)
-       $(CXX) -o $@ $(NATIVDLG_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(NATIVDLG_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__nativdlg___mac_setfilecmd)
        $(__nativdlg___os2_emxbindcmd)
@@ -186,6 +190,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 nativdlg_bundle
index f3c67146478b4d8e5c675dbd50b21c78e09f8e31..3894d605b3e579913ffaea1ac4212af83f9739d3 100644 (file)
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___notebook___os2_emxbindcmd = $(NM) notebook$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__notebook_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = notebook.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__notebook_bundle___depname = notebook_bundle
+@COND_TOOLKIT_OSX_CARBON@____notebook_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__notebook_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____notebook_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__notebook_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____notebook_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__notebook_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____notebook_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__notebook_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____notebook_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__notebook_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 notebook$(EXEEXT): $(NOTEBOOK_OBJECTS) $(__notebook___win32rc)
-       $(CXX) -o $@ $(NOTEBOOK_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(NOTEBOOK_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__notebook___mac_setfilecmd)
        $(__notebook___os2_emxbindcmd)
@@ -186,6 +190,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 notebook_bundle
index 1e0c8399667597c4397b6997fe2bba27c1227abd..495c1003da0385b7488c01ed1fb1224873c5232d 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___oleauto___os2_emxbindcmd = $(NM) oleauto$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__oleauto_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = oleauto.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__oleauto_bundle___depname = oleauto_bundle
+@COND_TOOLKIT_OSX_CARBON@____oleauto_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__oleauto_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____oleauto_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__oleauto_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____oleauto_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__oleauto_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____oleauto_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__oleauto_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____oleauto_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__oleauto_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 oleauto$(EXEEXT): $(OLEAUTO_OBJECTS) $(__oleauto___win32rc)
-       $(CXX) -o $@ $(OLEAUTO_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(OLEAUTO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__oleauto___mac_setfilecmd)
        $(__oleauto___os2_emxbindcmd)
@@ -186,6 +190,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 oleauto_bundle
index 092ed69cdb8ce0a2338ca9e21507de34a5c19247..5f8b510719a4aa22fa6135b049b5ea4539efb184 100644 (file)
@@ -53,6 +53,6 @@ penguin:
 
 
 # Include dependency info, if present:
-@IF_GNU_MAKE@-include ./.deps/*.d
+@IF_GNU_MAKE@-include .deps/*.d
 
 .PHONY: all install uninstall clean distclean cube isosurf penguin
index c4a746bf733f65035a3e1db25dcb496a9c4bbf5e..4dc2456292b0205183c000d2aeca35a74d76793e 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___ownerdrw___os2_emxbindcmd = $(NM) ownerdrw$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__ownerdrw_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = ownerdrw.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__ownerdrw_bundle___depname = ownerdrw_bundle
+@COND_TOOLKIT_OSX_CARBON@____ownerdrw_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__ownerdrw_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____ownerdrw_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__ownerdrw_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____ownerdrw_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__ownerdrw_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____ownerdrw_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__ownerdrw_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____ownerdrw_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__ownerdrw_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 ownerdrw$(EXEEXT): $(OWNERDRW_OBJECTS) $(__ownerdrw___win32rc)
-       $(CXX) -o $@ $(OWNERDRW_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(OWNERDRW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__ownerdrw___mac_setfilecmd)
        $(__ownerdrw___os2_emxbindcmd)
@@ -198,6 +202,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 ownerdrw_bundle data
index a293c53c019af4965514525f558bbda0f409ac33..914480ba69f9d8e093532114e069fc0f245b389c 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___popup___os2_emxbindcmd = $(NM) popup$(EXEEXT) | if grep -q
 @COND_PLATFORM_MACOSX_1@__popup_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = popup.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__popup_bundle___depname = popup_bundle
+@COND_TOOLKIT_OSX_CARBON@____popup_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__popup_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____popup_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__popup_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____popup_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__popup_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____popup_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__popup_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____popup_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__popup_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 popup$(EXEEXT): $(POPUP_OBJECTS) $(__popup___win32rc)
-       $(CXX) -o $@ $(POPUP_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(POPUP_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__popup___mac_setfilecmd)
        $(__popup___os2_emxbindcmd)
@@ -186,6 +190,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 popup_bundle
index 5f0646fd2f33ee3f4baf2d66f3de0a8c4ef27aaf..0f2b2feff26accd2d947a8f588fe8f1a47ef8f60 100644 (file)
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___power___os2_emxbindcmd = $(NM) power$(EXEEXT) | if grep -q
 @COND_PLATFORM_MACOSX_1@__power_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = power.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__power_bundle___depname = power_bundle
+@COND_TOOLKIT_OSX_CARBON@____power_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__power_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____power_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__power_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____power_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__power_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____power_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__power_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____power_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__power_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 power$(EXEEXT): $(POWER_OBJECTS) $(__power___win32rc)
-       $(CXX) -o $@ $(POWER_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(POWER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__power___mac_setfilecmd)
        $(__power___os2_emxbindcmd)
@@ -186,6 +190,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 power_bundle
index d4b6e1c80f44fab42e1c8fc2833d4ac6e0dd9ab8..c86513aef00e568938a2f4dada5b7bde3ef26f04 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___printing___os2_emxbindcmd = $(NM) printing$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__printing_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = printing.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__printing_bundle___depname = printing_bundle
+@COND_TOOLKIT_OSX_CARBON@____printing_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__printing_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____printing_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__printing_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____printing_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__printing_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____printing_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__printing_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____printing_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__printing_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc)
-       $(CXX) -o $@ $(PRINTING_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(PRINTING_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__printing___mac_setfilecmd)
        $(__printing___os2_emxbindcmd)
@@ -186,6 +190,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 printing_bundle
index 1852820639ad5ec90bc681c988612218276c48ed..a353b3a67b4df493ced98f01067176842bad0be7 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___regtest___os2_emxbindcmd = $(NM) regtest$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__regtest_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = regtest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__regtest_bundle___depname = regtest_bundle
+@COND_TOOLKIT_OSX_CARBON@____regtest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__regtest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____regtest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__regtest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____regtest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__regtest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____regtest_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__regtest_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____regtest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__regtest_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 regtest$(EXEEXT): $(REGTEST_OBJECTS) $(__regtest___win32rc)
-       $(CXX) -o $@ $(REGTEST_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(REGTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__regtest___mac_setfilecmd)
        $(__regtest___os2_emxbindcmd)
@@ -186,6 +190,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 regtest_bundle
index 70e6a221c702b156bf293f126f1c429ebef322d2..9f99cea951ff7993519efd49532a6806ac1809fb 100644 (file)
@@ -88,10 +88,10 @@ RENDDLL_OBJECTS =  \
 @COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = $(WX_VERSION)
 @COND_PLATFORM_UNIX_0@PLUGVERDELIM = 
 @COND_PLATFORM_UNIX_1@PLUGVERDELIM = -
-@COND_BUILD_RELEASE_UNICODE_0@PLUGINSUFFIX = 
 @COND_BUILD_DEBUG_UNICODE_0@PLUGINSUFFIX = d
-@COND_BUILD_RELEASE_UNICODE_1@PLUGINSUFFIX = u
 @COND_BUILD_DEBUG_UNICODE_1@PLUGINSUFFIX = ud
+@COND_BUILD_RELEASE_UNICODE_0@PLUGINSUFFIX = 
+@COND_BUILD_RELEASE_UNICODE_1@PLUGINSUFFIX = u
 @COND_PLATFORM_MAC_0@__render___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__render___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL render$(EXEEXT)
@@ -114,8 +114,12 @@ COND_PLATFORM_OS2_1___render___os2_emxbindcmd = $(NM) render$(EXEEXT) | if grep
 @COND_PLATFORM_MACOSX_1@__render_bundle___depname = render_bundle
 @COND_TOOLKIT_COCOA@____render_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__render_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____render_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__render_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_CARBON@____render_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__render_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____render_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__render_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____render_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__render_app_Contents_PkgInfo___depname)
 COND_SHARED_1___renddll___depname = \
        $(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
 @COND_SHARED_1@__renddll___depname = $(COND_SHARED_1___renddll___depname)
@@ -173,7 +177,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc)
-       $(CXX) -o $@ $(RENDER_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(RENDER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__render___mac_setfilecmd)
        $(__render___os2_emxbindcmd)
@@ -202,7 +206,7 @@ render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc)
 @COND_PLATFORM_MACOSX_1@render_bundle: $(____render_BUNDLE_TGT_REF_DEP)
 
 @COND_SHARED_1@$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(RENDDLL_OBJECTS)
-@COND_SHARED_1@        $(SHARED_LD_MODULE_CXX) $@ $(RENDDLL_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS)  $(__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)
+@COND_SHARED_1@        $(SHARED_LD_MODULE_CXX) $@ $(RENDDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(LIBS) $(__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)
 
 @COND_SHARED_1@install_renddll: 
 @COND_SHARED_1@        $(INSTALL_DIR) $(DESTDIR)$(PLUGINS_INST_DIR)
@@ -231,7 +235,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 render_bundle install_renddll \
-       uninstall_renddll
+.PHONY: all install uninstall clean distclean render_bundle install_renddll uninstall_renddll
index 343af81a3d01770e649812de527805beadb6ea75..b180fdc83d1addb7e9aa13a193b01cce7a77e595 100644 (file)
@@ -94,10 +94,14 @@ COND_PLATFORM_OS2_1___richtext___os2_emxbindcmd = $(NM) richtext$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__richtext_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = richtext.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__richtext_bundle___depname = richtext_bundle
+@COND_TOOLKIT_OSX_CARBON@____richtext_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__richtext_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____richtext_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__richtext_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____richtext_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__richtext_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____richtext_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__richtext_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____richtext_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__richtext_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_RICHTEXT_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_RICHTEXT_p = $(COND_MONOLITHIC_0___WXLIB_RICHTEXT_p)
@@ -157,7 +161,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 richtext$(EXEEXT): $(RICHTEXT_OBJECTS) $(__richtext___win32rc)
-       $(CXX) -o $@ $(RICHTEXT_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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 $@ $(RICHTEXT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
        
        $(__richtext___mac_setfilecmd)
        $(__richtext___os2_emxbindcmd)
@@ -202,6 +206,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 richtext_bundle
index a9fd72ce595f4a0c8336a38af6f7b3771c639758..d9034dda7800c41cd3997520c53711ffbfcd4306 100644 (file)
@@ -92,10 +92,14 @@ COND_PLATFORM_OS2_1___sashtest___os2_emxbindcmd = $(NM) sashtest$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__sashtest_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = sashtest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__sashtest_bundle___depname = sashtest_bundle
+@COND_TOOLKIT_OSX_CARBON@____sashtest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__sashtest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____sashtest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__sashtest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____sashtest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__sashtest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____sashtest_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__sashtest_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____sashtest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__sashtest_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -146,7 +150,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 sashtest$(EXEEXT): $(SASHTEST_OBJECTS) $(__sashtest___win32rc)
-       $(CXX) -o $@ $(SASHTEST_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(SASHTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__sashtest___mac_setfilecmd)
        $(__sashtest___os2_emxbindcmd)
@@ -191,6 +195,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 sashtest_bundle
index 9788dc4fd6f59a5ce993a4eae75bf9c4291de9c2..4ed2b26bb0b4545d1b5cba014d07fa162c1b65a0 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___scroll___os2_emxbindcmd = $(NM) scroll$(EXEEXT) | if grep
 @COND_PLATFORM_MACOSX_1@__scroll_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = scroll.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__scroll_bundle___depname = scroll_bundle
+@COND_TOOLKIT_OSX_CARBON@____scroll_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__scroll_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____scroll_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__scroll_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____scroll_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__scroll_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____scroll_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__scroll_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____scroll_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__scroll_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 scroll$(EXEEXT): $(SCROLL_OBJECTS) $(__scroll___win32rc)
-       $(CXX) -o $@ $(SCROLL_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(SCROLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__scroll___mac_setfilecmd)
        $(__scroll___os2_emxbindcmd)
@@ -186,6 +190,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 scroll_bundle
index 9bb2a2e512422a8d696721ae24ac5d0aeaa911d4..87a830c9de7db60918a725b994af0694029ba5bc 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___scrollsub___os2_emxbindcmd = $(NM) scrollsub$(EXEEXT) | \
 @COND_PLATFORM_MACOSX_1@__scrollsub_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = scrollsub.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__scrollsub_bundle___depname = scrollsub_bundle
+@COND_TOOLKIT_OSX_CARBON@____scrollsub_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__scrollsub_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____scrollsub_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__scrollsub_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____scrollsub_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__scrollsub_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____scrollsub_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__scrollsub_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____scrollsub_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__scrollsub_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 scrollsub$(EXEEXT): $(SCROLLSUB_OBJECTS) $(__scrollsub___win32rc)
-       $(CXX) -o $@ $(SCROLLSUB_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(SCROLLSUB_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__scrollsub___mac_setfilecmd)
        $(__scrollsub___os2_emxbindcmd)
@@ -186,6 +190,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 scrollsub_bundle
index 95c77e330f635aad820e240e5ea5f5d55e7cc9a5..439f371863eebff9616e53b1079be3e2f3a6a8a4 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___shaped___os2_emxbindcmd = $(NM) shaped$(EXEEXT) | if grep
 @COND_PLATFORM_MACOSX_1@__shaped_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = shaped.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__shaped_bundle___depname = shaped_bundle
+@COND_TOOLKIT_OSX_CARBON@____shaped_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__shaped_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____shaped_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__shaped_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____shaped_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__shaped_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____shaped_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__shaped_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____shaped_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__shaped_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc)
-       $(CXX) -o $@ $(SHAPED_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(SHAPED_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__shaped___mac_setfilecmd)
        $(__shaped___os2_emxbindcmd)
@@ -198,6 +202,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 shaped_bundle data
index 4ce75a22a03de270927ea896f2da52d7e0d89790..47d063aab2dac00b325f2b2e35a02cfa7a6f5bbb 100644 (file)
@@ -99,8 +99,12 @@ COND_PLATFORM_OS2_1___client___os2_emxbindcmd = $(NM) client$(EXEEXT) | if grep
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@__client_bundle___depname = client_bundle
 @COND_TOOLKIT_COCOA@____client_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__client_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____client_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__client_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_CARBON@____client_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__client_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____client_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__client_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____client_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__client_app_Contents_PkgInfo___depname)
 @COND_PLATFORM_WIN32_1@__client___win32rc = client_client_rc.o
 @COND_USE_GUI_1@__server___depname = server$(EXEEXT)
 @COND_PLATFORM_MAC_0@__server___mac_setfilecmd = @true
@@ -114,8 +118,12 @@ COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@__server_bundle___depname = server_bundle
 @COND_TOOLKIT_COCOA@____server_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__server_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____server_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__server_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_CARBON@____server_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__server_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____server_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__server_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____server_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__server_app_Contents_PkgInfo___depname)
 @COND_PLATFORM_WIN32_1@__server___win32rc = server_server_rc.o
 @COND_PLATFORM_MAC_0@__baseclient___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__baseclient___mac_setfilecmd = \
@@ -189,7 +197,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 @COND_USE_GUI_1@client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc)
-@COND_USE_GUI_1@       $(CXX) -o $@ $(CLIENT_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_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)
+@COND_USE_GUI_1@       $(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_NET_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)
 @COND_USE_GUI_1@       
 @COND_USE_GUI_1@       $(__client___mac_setfilecmd)
 @COND_USE_GUI_1@       $(__client___os2_emxbindcmd)
@@ -218,7 +226,7 @@ distclean: clean
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@client_bundle: $(____client_BUNDLE_TGT_REF_DEP)
 
 @COND_USE_GUI_1@server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc)
-@COND_USE_GUI_1@       $(CXX) -o $@ $(SERVER_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_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)
+@COND_USE_GUI_1@       $(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_NET_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)
 @COND_USE_GUI_1@       
 @COND_USE_GUI_1@       $(__server___mac_setfilecmd)
 @COND_USE_GUI_1@       $(__server___os2_emxbindcmd)
@@ -247,13 +255,13 @@ distclean: clean
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@server_bundle: $(____server_BUNDLE_TGT_REF_DEP)
 
 baseclient$(EXEEXT): $(BASECLIENT_OBJECTS)
-       $(CXX) -o $@ $(BASECLIENT_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+       $(CXX) -o $@ $(BASECLIENT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
        
        $(__baseclient___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
 
 baseserver$(EXEEXT): $(BASESERVER_OBJECTS)
-       $(CXX) -o $@ $(BASESERVER_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+       $(CXX) -o $@ $(BASESERVER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
        
        $(__baseserver___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
@@ -287,6 +295,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 client_bundle server_bundle
index f72b42cf3b257160816b9660f3e5049ce43b9601..a36eb14e0acab44a6137cee5aa219cdf078d89dd 100644 (file)
@@ -92,10 +92,14 @@ COND_PLATFORM_OS2_1___sound___os2_emxbindcmd = $(NM) sound$(EXEEXT) | if grep -q
 @COND_PLATFORM_MACOSX_1@__sound_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = sound.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__sound_bundle___depname = sound_bundle
+@COND_TOOLKIT_OSX_CARBON@____sound_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__sound_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____sound_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__sound_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____sound_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__sound_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____sound_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__sound_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____sound_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__sound_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -146,7 +150,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 sound$(EXEEXT): $(SOUND_OBJECTS) $(__sound___win32rc)
-       $(CXX) -o $@ $(SOUND_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(SOUND_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__sound___mac_setfilecmd)
        $(__sound___os2_emxbindcmd)
@@ -203,6 +207,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 sound_bundle data
index 5e9d1502d3bfeb9ca48716cd02c587fd03e989d1..a945ef8f1beef157583fa8833e0c8a4b3e316dcf 100644 (file)
@@ -93,10 +93,14 @@ COND_PLATFORM_OS2_1___splash___os2_emxbindcmd = $(NM) splash$(EXEEXT) | if grep
 @COND_PLATFORM_MACOSX_1@__splash_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = splash.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__splash_bundle___depname = splash_bundle
+@COND_TOOLKIT_OSX_CARBON@____splash_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__splash_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____splash_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__splash_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____splash_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__splash_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____splash_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__splash_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____splash_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__splash_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0_USE_MEDIA_1___WXLIB_MEDIA_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0_USE_MEDIA_1@__WXLIB_MEDIA_p = $(COND_MONOLITHIC_0_USE_MEDIA_1___WXLIB_MEDIA_p)
@@ -150,7 +154,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 splash$(EXEEXT): $(SPLASH_OBJECTS) $(__splash___win32rc)
-       $(CXX) -o $@ $(SPLASH_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__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 $@ $(SPLASH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__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)
        
        $(__splash___mac_setfilecmd)
        $(__splash___os2_emxbindcmd)
@@ -207,6 +211,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 splash_bundle data
index 7f5e9ee290ded95e224e757118bcca1774b9ba4f..288408afe88ae396eb24944cfe0b954b9a486094 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___splitter___os2_emxbindcmd = $(NM) splitter$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__splitter_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = splitter.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__splitter_bundle___depname = splitter_bundle
+@COND_TOOLKIT_OSX_CARBON@____splitter_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__splitter_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____splitter_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__splitter_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____splitter_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__splitter_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____splitter_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__splitter_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____splitter_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__splitter_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 splitter$(EXEEXT): $(SPLITTER_OBJECTS) $(__splitter___win32rc)
-       $(CXX) -o $@ $(SPLITTER_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(SPLITTER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__splitter___mac_setfilecmd)
        $(__splitter___os2_emxbindcmd)
@@ -186,6 +190,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 splitter_bundle
index 3f614bad2609808e62e0a131bb6d525d192ec148..57bb2f9a8d33cc7328dce7f855e9864c38de53e6 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___statbar___os2_emxbindcmd = $(NM) statbar$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__statbar_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = statbar.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__statbar_bundle___depname = statbar_bundle
+@COND_TOOLKIT_OSX_CARBON@____statbar_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__statbar_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____statbar_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__statbar_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____statbar_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__statbar_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____statbar_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__statbar_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____statbar_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__statbar_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 statbar$(EXEEXT): $(STATBAR_OBJECTS) $(__statbar___win32rc)
-       $(CXX) -o $@ $(STATBAR_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(STATBAR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__statbar___mac_setfilecmd)
        $(__statbar___os2_emxbindcmd)
@@ -186,6 +190,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 statbar_bundle
index 3633e9effff2a8820c00ad90c00d3a162d471864..5723f6475e2e4576f22cbffda7c1430c7a371f0c 100644 (file)
@@ -92,10 +92,14 @@ COND_PLATFORM_OS2_1___stctest___os2_emxbindcmd = $(NM) stctest$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__stctest_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = stctest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__stctest_bundle___depname = stctest_bundle
+@COND_TOOLKIT_OSX_CARBON@____stctest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__stctest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____stctest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__stctest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____stctest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__stctest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____stctest_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__stctest_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____stctest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__stctest_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_STC_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_STC_p = $(COND_MONOLITHIC_0___WXLIB_STC_p)
@@ -146,7 +150,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc)
-       $(CXX) -o $@ $(STCTEST_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_STC_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__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 $@ $(STCTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_STC_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__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)
        
        $(__stctest___mac_setfilecmd)
        $(__stctest___os2_emxbindcmd)
@@ -209,6 +213,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 stctest_bundle data
index 04ce54926bd50ec95a9a5e7dcb977aa2d095cfdd..3d104aa126d25543a2fe3080faf0d03ba4ea9439 100644 (file)
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___svgtest___os2_emxbindcmd = $(NM) svgtest$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__svgtest_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = svgtest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__svgtest_bundle___depname = svgtest_bundle
+@COND_TOOLKIT_OSX_CARBON@____svgtest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__svgtest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____svgtest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__svgtest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____svgtest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__svgtest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____svgtest_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__svgtest_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____svgtest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__svgtest_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc)
-       $(CXX) -o $@ $(SVGTEST_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(SVGTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__svgtest___mac_setfilecmd)
        $(__svgtest___os2_emxbindcmd)
@@ -186,6 +190,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 svgtest_bundle
index d72eed203d50c39c333b5b2425225d7b15498d6d..e3c71db26e9f0353b6677fbd387d7eb4d3857e72 100644 (file)
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___taborder___os2_emxbindcmd = $(NM) taborder$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__taborder_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = taborder.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__taborder_bundle___depname = taborder_bundle
+@COND_TOOLKIT_OSX_CARBON@____taborder_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__taborder_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____taborder_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__taborder_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____taborder_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__taborder_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____taborder_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__taborder_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____taborder_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__taborder_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 taborder$(EXEEXT): $(TABORDER_OBJECTS) $(__taborder___win32rc)
-       $(CXX) -o $@ $(TABORDER_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(TABORDER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__taborder___mac_setfilecmd)
        $(__taborder___os2_emxbindcmd)
@@ -186,6 +190,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 taborder_bundle
index 8105b5e79bd273498394affbadf8127296551f52..d64e498c64431c69d6e3902ffb4771ba0a50bea8 100644 (file)
@@ -93,10 +93,14 @@ COND_PLATFORM_OS2_1___taskbar___os2_emxbindcmd = $(NM) taskbar$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__taskbar_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = taskbar.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__taskbar_bundle___depname = taskbar_bundle
+@COND_TOOLKIT_OSX_CARBON@____taskbar_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__taskbar_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____taskbar_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__taskbar_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____taskbar_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__taskbar_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____taskbar_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__taskbar_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____taskbar_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__taskbar_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -146,7 +150,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc)
-       $(CXX) -o $@ $(TASKBAR_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(TASKBAR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__taskbar___mac_setfilecmd)
        $(__taskbar___os2_emxbindcmd)
@@ -191,6 +195,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 taskbar_bundle
index e746aa6540ab512e3914a1f6f96eb7f48c0f39e9..0bffb638f255131dd767e8181acfb1c0500f6ee5 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___text___os2_emxbindcmd = $(NM) text$(EXEEXT) | if grep -q \
 @COND_PLATFORM_MACOSX_1@__text_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = text.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__text_bundle___depname = text_bundle
+@COND_TOOLKIT_OSX_CARBON@____text_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__text_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____text_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__text_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____text_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__text_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____text_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__text_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____text_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__text_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 text$(EXEEXT): $(TEXT_OBJECTS) $(__text___win32rc)
-       $(CXX) -o $@ $(TEXT_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(TEXT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__text___mac_setfilecmd)
        $(__text___os2_emxbindcmd)
@@ -186,6 +190,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 text_bundle
index d3f502edfa016adcfa66ec136fd00de81db66589..cb667576ec337a6db3d76a16d2bb144492b3071f 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___thread___os2_emxbindcmd = $(NM) thread$(EXEEXT) | if grep
 @COND_PLATFORM_MACOSX_1@__thread_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = thread.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__thread_bundle___depname = thread_bundle
+@COND_TOOLKIT_OSX_CARBON@____thread_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__thread_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____thread_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__thread_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____thread_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__thread_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____thread_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__thread_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____thread_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__thread_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 thread$(EXEEXT): $(THREAD_OBJECTS) $(__thread___win32rc)
-       $(CXX) -o $@ $(THREAD_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(THREAD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__thread___mac_setfilecmd)
        $(__thread___os2_emxbindcmd)
@@ -186,6 +190,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 thread_bundle
index db16047381c0f649983cccd95b8333dc368a8071..d31a471b23e3e6f57964ca5c9e2c57bc9ac3062e 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___toolbar___os2_emxbindcmd = $(NM) toolbar$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__toolbar_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = toolbar.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__toolbar_bundle___depname = toolbar_bundle
+@COND_TOOLKIT_OSX_CARBON@____toolbar_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__toolbar_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____toolbar_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__toolbar_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____toolbar_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__toolbar_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____toolbar_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__toolbar_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____toolbar_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__toolbar_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 toolbar$(EXEEXT): $(TOOLBAR_OBJECTS) $(__toolbar___win32rc)
-       $(CXX) -o $@ $(TOOLBAR_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(TOOLBAR_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__toolbar___mac_setfilecmd)
        $(__toolbar___os2_emxbindcmd)
@@ -186,6 +190,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 toolbar_bundle
index a885a2f1e76c06edad1c54a830fbe380ebe0f2d6..1ea1bc9aae709f1602189ba15e3b41b9b7687286 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___treectrl___os2_emxbindcmd = $(NM) treectrl$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__treectrl_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = treectrl.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__treectrl_bundle___depname = treectrl_bundle
+@COND_TOOLKIT_OSX_CARBON@____treectrl_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__treectrl_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____treectrl_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__treectrl_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____treectrl_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__treectrl_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____treectrl_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__treectrl_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____treectrl_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__treectrl_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 treectrl$(EXEEXT): $(TREECTRL_OBJECTS) $(__treectrl___win32rc)
-       $(CXX) -o $@ $(TREECTRL_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(TREECTRL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__treectrl___mac_setfilecmd)
        $(__treectrl___os2_emxbindcmd)
@@ -186,6 +190,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 treectrl_bundle
index babc5d8d4cbbc48cafe59120bdda7df31e23942f..95c0209c9f6251be16569504b6d150ce1e9415d8 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___typetest___os2_emxbindcmd = $(NM) typetest$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__typetest_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = typetest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__typetest_bundle___depname = typetest_bundle
+@COND_TOOLKIT_OSX_CARBON@____typetest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__typetest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____typetest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__typetest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____typetest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__typetest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____typetest_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__typetest_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____typetest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__typetest_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 typetest$(EXEEXT): $(TYPETEST_OBJECTS) $(__typetest___win32rc)
-       $(CXX) -o $@ $(TYPETEST_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(TYPETEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__typetest___mac_setfilecmd)
        $(__typetest___os2_emxbindcmd)
@@ -186,6 +190,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 typetest_bundle
index 72879b8eccdcc50c6c9830fdd5fc76a19b071b9b..def5091a4713c98003b8dc53a542143b437b9785 100644 (file)
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___validate___os2_emxbindcmd = $(NM) validate$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__validate_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = validate.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__validate_bundle___depname = validate_bundle
+@COND_TOOLKIT_OSX_CARBON@____validate_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__validate_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____validate_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__validate_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____validate_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__validate_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____validate_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__validate_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____validate_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__validate_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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 validate$(EXEEXT): $(VALIDATE_OBJECTS) $(__validate___win32rc)
-       $(CXX) -o $@ $(VALIDATE_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(VALIDATE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__validate___mac_setfilecmd)
        $(__validate___os2_emxbindcmd)
@@ -186,6 +190,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 validate_bundle
index 85be4c8725ad4768a6b29e779ed078319cf3c247..a7f22707a886b57795db727d89c0bd94a4ce832a 100644 (file)
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___vstest___os2_emxbindcmd = $(NM) vstest$(EXEEXT) | if grep
 @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_OSX_CARBON@____vstest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__vstest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____vstest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__vstest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____vstest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__vstest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____vstest_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__vstest_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____vstest_BUNDLE_TGT_REF_DEP = \
-@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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 vstest$(EXEEXT): $(VSTEST_OBJECTS) $(__vstest___win32rc)
-       $(CXX) -o $@ $(VSTEST_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(VSTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__vstest___mac_setfilecmd)
        $(__vstest___os2_emxbindcmd)
@@ -186,6 +190,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 vstest_bundle
index ec78426853d4e7eb9156325398be01e977f6f8c2..b77a1bcd53078fddda6675aaaff36cc601a1e963 100644 (file)
@@ -118,10 +118,14 @@ COND_PLATFORM_OS2_1___widgets___os2_emxbindcmd = $(NM) widgets$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__widgets_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = widgets.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__widgets_bundle___depname = widgets_bundle
+@COND_TOOLKIT_OSX_CARBON@____widgets_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__widgets_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____widgets_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__widgets_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____widgets_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__widgets_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____widgets_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__widgets_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____widgets_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__widgets_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -172,7 +176,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 widgets$(EXEEXT): $(WIDGETS_OBJECTS) $(__widgets___win32rc)
-       $(CXX) -o $@ $(WIDGETS_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(WIDGETS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__widgets___mac_setfilecmd)
        $(__widgets___os2_emxbindcmd)
@@ -295,6 +299,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 widgets_bundle
index a46bcdc331a2719a196dacab95701e70463b7c80..08257485663cbb317caeb104f4a4e6020d464cb7 100644 (file)
@@ -92,10 +92,14 @@ COND_PLATFORM_OS2_1___wizard___os2_emxbindcmd = $(NM) wizard$(EXEEXT) | if grep
 @COND_PLATFORM_MACOSX_1@__wizard_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = wizard.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__wizard_bundle___depname = wizard_bundle
+@COND_TOOLKIT_OSX_CARBON@____wizard_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__wizard_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____wizard_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__wizard_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____wizard_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__wizard_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____wizard_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__wizard_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____wizard_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__wizard_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -146,7 +150,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc)
-       $(CXX) -o $@ $(WIZARD_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(WIZARD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__wizard___mac_setfilecmd)
        $(__wizard___os2_emxbindcmd)
@@ -191,6 +195,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 wizard_bundle
index 162b2117ed964791b7ae228fce1644f489a26350..4275b5b3ce1182cec6af772574c6e462fcd55e8e 100644 (file)
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___wrapsizer___os2_emxbindcmd = $(NM) wrapsizer$(EXEEXT) | \
 @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_OSX_CARBON@____wrapsizer_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__wrapsizer_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____wrapsizer_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__wrapsizer_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____wrapsizer_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__wrapsizer_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____wrapsizer_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__wrapsizer_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____wrapsizer_BUNDLE_TGT_REF_DEP = \
-@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)
@@ -141,7 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 wrapsizer$(EXEEXT): $(WRAPSIZER_OBJECTS) $(__wrapsizer___win32rc)
-       $(CXX) -o $@ $(WRAPSIZER_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__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 $@ $(WRAPSIZER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__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)
        
        $(__wrapsizer___mac_setfilecmd)
        $(__wrapsizer___os2_emxbindcmd)
@@ -186,6 +190,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 wrapsizer_bundle
index 2477beb64170978e7c8ae600f7d2d83a5745ecf9..6572a594030501b139d55eec86288660421920f9 100644 (file)
@@ -97,10 +97,14 @@ COND_PLATFORM_OS2_1___xrcdemo___os2_emxbindcmd = $(NM) xrcdemo$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__xrcdemo_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = xrcdemo.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__xrcdemo_bundle___depname = xrcdemo_bundle
+@COND_TOOLKIT_OSX_CARBON@____xrcdemo_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__xrcdemo_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____xrcdemo_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__xrcdemo_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____xrcdemo_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__xrcdemo_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____xrcdemo_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__xrcdemo_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____xrcdemo_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__xrcdemo_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_XRC_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_XRC_p = $(COND_MONOLITHIC_0___WXLIB_XRC_p)
@@ -160,7 +164,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc)
-       $(CXX) -o $@ $(XRCDEMO_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_XRC_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 $@ $(XRCDEMO_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_XRC_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)
        
        $(__xrcdemo___mac_setfilecmd)
        $(__xrcdemo___os2_emxbindcmd)
@@ -226,6 +230,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 xrcdemo_bundle data