adding new toolkits for osx

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in
index 6985fb5be2d08b156703f8a03f37b34819c8ac26..d76ad7ff3e069bffbb299f39cb0b82ec94de9f91 100644 (file)
--- a/samples/html/about/Makefile.in
+++ b/samples/html/about/Makefile.in
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___about___os2_emxbindcmd = $(NM) about$(EXEEXT) | if grep -q
 @COND_PLATFORM_MACOSX_1@__about_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = about.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__about_bundle___depname = about_bundle
+@COND_TOOLKIT_OSX_CARBON@____about_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__about_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____about_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__about_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____about_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__about_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____about_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__about_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____about_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__about_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
 
 about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc)
-       $(CXX) -o $@ $(ABOUT_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 $@ $(ABOUT_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)
        
        $(__about___mac_setfilecmd)
        $(__about___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 about_bundle data_files

diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in
index d9ee468e5a9f36c59697ddc55d87148a0d9f7112..ae72a03d05b9efdb2a42bb60dd13223faec4fac9 100644 (file)
--- a/samples/html/help/Makefile.in
+++ b/samples/html/help/Makefile.in
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___htmlhelp___os2_emxbindcmd = $(NM) htmlhelp$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__htmlhelp_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = htmlhelp.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__htmlhelp_bundle___depname = htmlhelp_bundle
+@COND_TOOLKIT_OSX_CARBON@____htmlhelp_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__htmlhelp_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____htmlhelp_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__htmlhelp_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____htmlhelp_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__htmlhelp_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____htmlhelp_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__htmlhelp_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____htmlhelp_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__htmlhelp_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
 
 htmlhelp$(EXEEXT): $(HTMLHELP_OBJECTS) $(__htmlhelp___win32rc)
-       $(CXX) -o $@ $(HTMLHELP_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 $@ $(HTMLHELP_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)
        
        $(__htmlhelp___mac_setfilecmd)
        $(__htmlhelp___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 htmlhelp_bundle data

diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in
index 25d0f1fa69ec547132ce167ae7234c5dcca9831f..71294404d0172a872a0a8d0e8a0b175f31df77fb 100644 (file)
--- a/samples/html/helpview/Makefile.in
+++ b/samples/html/helpview/Makefile.in
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___helpview___os2_emxbindcmd = $(NM) helpview$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__helpview_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = helpview.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__helpview_bundle___depname = helpview_bundle
+@COND_TOOLKIT_OSX_CARBON@____helpview_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__helpview_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____helpview_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__helpview_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____helpview_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__helpview_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____helpview_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__helpview_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____helpview_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__helpview_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
 
 helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
-       $(CXX) -o $@ $(HELPVIEW_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 $@ $(HELPVIEW_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)
        
        $(__helpview___mac_setfilecmd)
        $(__helpview___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 helpview_bundle data

diff --git a/samples/html/htmlctrl/Makefile.in b/samples/html/htmlctrl/Makefile.in
index ebb937a156c00c8dd60f56f781a1766bbd0f0ccf..b93fc1349343ed25d43854acfe07114e0fc14f55 100644 (file)
--- a/samples/html/htmlctrl/Makefile.in
+++ b/samples/html/htmlctrl/Makefile.in
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___htmlctrl___os2_emxbindcmd = $(NM) htmlctrl$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__htmlctrl_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = htmlctrl.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__htmlctrl_bundle___depname = htmlctrl_bundle
+@COND_TOOLKIT_OSX_CARBON@____htmlctrl_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__htmlctrl_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____htmlctrl_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__htmlctrl_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____htmlctrl_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__htmlctrl_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____htmlctrl_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__htmlctrl_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____htmlctrl_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__htmlctrl_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
 
 htmlctrl$(EXEEXT): $(HTMLCTRL_OBJECTS) $(__htmlctrl___win32rc)
-       $(CXX) -o $@ $(HTMLCTRL_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 $@ $(HTMLCTRL_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)
        
        $(__htmlctrl___mac_setfilecmd)
        $(__htmlctrl___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 htmlctrl_bundle

diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in
index 9e0d23cc8294f20cb745f673b1dd5fb35b7a6737..b0279de3b5b3ef65dce925b1d6240e0f24ebe7c7 100644 (file)
--- a/samples/html/printing/Makefile.in
+++ b/samples/html/printing/Makefile.in
@@ -93,10 +93,17 @@ COND_PLATFORM_OS2_1___htmlprinting___os2_emxbindcmd = $(NM) \
 @COND_PLATFORM_MACOSX_1@       = htmlprinting.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__htmlprinting_bundle___depname \
 @COND_PLATFORM_MACOSX_1@       = htmlprinting_bundle
+@COND_TOOLKIT_OSX_CARBON@____htmlprinting_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = \
+@COND_TOOLKIT_OSX_CARBON@      $(__htmlprinting_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____htmlprinting_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = \
+@COND_TOOLKIT_OSX_COCOA@       $(__htmlprinting_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____htmlprinting_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = \
+@COND_TOOLKIT_OSX_IPHONE@      $(__htmlprinting_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____htmlprinting_BUNDLE_TGT_REF_DEP \
 @COND_TOOLKIT_COCOA@   = $(__htmlprinting_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____htmlprinting_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__htmlprinting_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)
@@ -148,7 +155,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 htmlprinting$(EXEEXT): $(HTMLPRINTING_OBJECTS) $(__htmlprinting___win32rc)
-       $(CXX) -o $@ $(HTMLPRINTING_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 $@ $(HTMLPRINTING_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)
        
        $(__htmlprinting___mac_setfilecmd)
        $(__htmlprinting___os2_emxbindcmd)
@@ -205,6 +212,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 htmlprinting_bundle data

diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in
index 16224b6af570992052a54d2bbfe8a712b5c08fc0..1a6556ef958975b605e7cec57bca44c8cf050742 100644 (file)
--- a/samples/html/test/Makefile.in
+++ b/samples/html/test/Makefile.in
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___test___os2_emxbindcmd = $(NM) test$(EXEEXT) | if grep -q \
 @COND_PLATFORM_MACOSX_1@__test_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = test.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__test_bundle___depname = test_bundle
+@COND_TOOLKIT_OSX_CARBON@____test_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__test_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____test_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__test_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____test_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__test_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____test_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__test_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____test_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__test_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)
@@ -148,7 +152,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
-       $(CXX) -o $@ $(TEST_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
+       $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
        
        $(__test___mac_setfilecmd)
        $(__test___os2_emxbindcmd)
@@ -205,6 +209,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 test_bundle data

diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in
index dec9b6504b031e0038ac786bdfb5664bfd5e7363..ba3bb8425ebbb9a5a0b60b44dc864bee8a8b4bb3 100644 (file)
--- a/samples/html/virtual/Makefile.in
+++ b/samples/html/virtual/Makefile.in
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___virtual___os2_emxbindcmd = $(NM) virtual$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1@__virtual_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = virtual.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__virtual_bundle___depname = virtual_bundle
+@COND_TOOLKIT_OSX_CARBON@____virtual_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__virtual_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____virtual_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__virtual_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____virtual_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__virtual_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____virtual_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__virtual_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____virtual_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__virtual_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
 
 virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc)
-       $(CXX) -o $@ $(VIRTUAL_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 $@ $(VIRTUAL_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)
        
        $(__virtual___mac_setfilecmd)
        $(__virtual___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 virtual_bundle data

diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in
index 1ae69cc5d75879b84b376b1d2805b4e25ec01fa8..02b0e8074ced373d6a268a1285b2c013d1b6c9a4 100644 (file)
--- a/samples/html/widget/Makefile.in
+++ b/samples/html/widget/Makefile.in
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___widget___os2_emxbindcmd = $(NM) widget$(EXEEXT) | if grep
 @COND_PLATFORM_MACOSX_1@__widget_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = widget.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__widget_bundle___depname = widget_bundle
+@COND_TOOLKIT_OSX_CARBON@____widget_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__widget_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____widget_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__widget_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____widget_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__widget_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____widget_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__widget_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____widget_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__widget_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
 
 widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc)
-       $(CXX) -o $@ $(WIDGET_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 $@ $(WIDGET_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)
        
        $(__widget___mac_setfilecmd)
        $(__widget___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 widget_bundle data

diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in
index 0711135f0d39f79b685d043b53f6ef40f5ef1ce3..cd615182775da1f8f37add55a89c81223cc59eb8 100644 (file)
--- a/samples/html/zip/Makefile.in
+++ b/samples/html/zip/Makefile.in
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___zip___os2_emxbindcmd = $(NM) zip$(EXEEXT) | if grep -q \
 @COND_PLATFORM_MACOSX_1@__zip_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = zip.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__zip_bundle___depname = zip_bundle
+@COND_TOOLKIT_OSX_CARBON@____zip_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__zip_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____zip_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__zip_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____zip_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__zip_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____zip_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__zip_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____zip_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__zip_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
 
 zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc)
-       $(CXX) -o $@ $(ZIP_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 $@ $(ZIP_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)
        
        $(__zip___mac_setfilecmd)
        $(__zip___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 zip_bundle data

diff --git a/samples/mobile/styles/Makefile.in b/samples/mobile/styles/Makefile.in
index 8f0a0557604e05404653404e1e20a5e6ff32f2ee..3504cb4cdfd6d6e0829a8ff8aa110af6b11bf8cb 100644 (file)
--- a/samples/mobile/styles/Makefile.in
+++ b/samples/mobile/styles/Makefile.in
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___styles___os2_emxbindcmd = $(NM) styles$(EXEEXT) | if grep
 @COND_PLATFORM_MACOSX_1@__styles_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = styles.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__styles_bundle___depname = styles_bundle
+@COND_TOOLKIT_OSX_CARBON@____styles_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__styles_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____styles_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__styles_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____styles_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__styles_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____styles_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__styles_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____styles_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__styles_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
 
 styles$(EXEEXT): $(STYLES_OBJECTS) $(__styles___win32rc)
-       $(CXX) -o $@ $(STYLES_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 $@ $(STYLES_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)
        
        $(__styles___mac_setfilecmd)
        $(__styles___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 styles_bundle data

diff --git a/samples/mobile/wxedit/Makefile.in b/samples/mobile/wxedit/Makefile.in
index 9a4993c892cdac9382286fe208bde7ef37565040..c7090a836c50d356610ed577f453ca26de79c77a 100644 (file)
--- a/samples/mobile/wxedit/Makefile.in
+++ b/samples/mobile/wxedit/Makefile.in
@@ -91,10 +91,14 @@ COND_PLATFORM_OS2_1___wxedit___os2_emxbindcmd = $(NM) wxedit$(EXEEXT) | if grep
 @COND_PLATFORM_MACOSX_1@__wxedit_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = wxedit.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__wxedit_bundle___depname = wxedit_bundle
+@COND_TOOLKIT_OSX_CARBON@____wxedit_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__wxedit_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____wxedit_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__wxedit_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____wxedit_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__wxedit_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____wxedit_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__wxedit_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____wxedit_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__wxedit_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
 
 wxedit$(EXEEXT): $(WXEDIT_OBJECTS) $(__wxedit___win32rc)
-       $(CXX) -o $@ $(WXEDIT_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 $@ $(WXEDIT_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)
        
        $(__wxedit___mac_setfilecmd)
        $(__wxedit___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 wxedit_bundle

diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in
index c0ef7b652e27abf24a2a319f0423c20dd5f82ade..ad39ef81c337705205d5feeaef9df01a38701885 100644 (file)
--- a/samples/opengl/cube/Makefile.in
+++ b/samples/opengl/cube/Makefile.in
@@ -92,10 +92,14 @@ COND_PLATFORM_OS2_1___cube___os2_emxbindcmd = $(NM) cube$(EXEEXT) | if grep -q \
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__cube_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@  = cube.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__cube_bundle___depname = cube_bundle
+@COND_TOOLKIT_OSX_CARBON@____cube_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__cube_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____cube_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__cube_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____cube_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__cube_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____cube_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__cube_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____cube_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__cube_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_USE_OPENGL_1@cube$(EXEEXT): $(CUBE_OBJECTS) $(__cube___win32rc)
-@COND_USE_OPENGL_1@    $(CXX) -o $@ $(CUBE_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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_USE_OPENGL_1@    $(CXX) -o $@ $(CUBE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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_USE_OPENGL_1@    
 @COND_USE_OPENGL_1@    $(__cube___mac_setfilecmd)
 @COND_USE_OPENGL_1@    $(__cube___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 cube_bundle

diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in
index dbd786b0d9f6418802876be31e87686229755995..7fed8a44c50463d09b8a64113f96e94d00a98891 100644 (file)
--- a/samples/opengl/isosurf/Makefile.in
+++ b/samples/opengl/isosurf/Makefile.in
@@ -94,10 +94,14 @@ COND_PLATFORM_OS2_1___isosurf___os2_emxbindcmd = $(NM) isosurf$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@  = isosurf.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__isosurf_bundle___depname \
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@  = isosurf_bundle
+@COND_TOOLKIT_OSX_CARBON@____isosurf_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__isosurf_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____isosurf_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__isosurf_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____isosurf_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__isosurf_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____isosurf_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__isosurf_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____isosurf_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__isosurf_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)
@@ -144,7 +148,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 @COND_USE_OPENGL_1@isosurf$(EXEEXT): $(ISOSURF_OBJECTS) $(__isosurf___win32rc)
-@COND_USE_OPENGL_1@    $(CXX) -o $@ $(ISOSURF_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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_USE_OPENGL_1@    $(CXX) -o $@ $(ISOSURF_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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_USE_OPENGL_1@    
 @COND_USE_OPENGL_1@    $(__isosurf___mac_setfilecmd)
 @COND_USE_OPENGL_1@    $(__isosurf___os2_emxbindcmd)
@@ -201,6 +205,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 isosurf_bundle data

diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in
index 54cd9b1eeb964cd04135271acfc7a63a65bfcd99..29463976f5d9166523132bd4296487e6988a1ad3 100644 (file)
--- a/samples/opengl/penguin/Makefile.in
+++ b/samples/opengl/penguin/Makefile.in
@@ -103,10 +103,14 @@ COND_PLATFORM_OS2_1___penguin___os2_emxbindcmd = $(NM) penguin$(EXEEXT) | if \
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@  = penguin.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__penguin_bundle___depname \
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@  = penguin_bundle
+@COND_TOOLKIT_OSX_CARBON@____penguin_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__penguin_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____penguin_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__penguin_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____penguin_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__penguin_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____penguin_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__penguin_app_Contents_PkgInfo___depname)
-@COND_TOOLKIT_MAC@____penguin_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__penguin_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)
@@ -154,7 +158,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 @COND_USE_OPENGL_1@penguin$(EXEEXT): $(PENGUIN_OBJECTS) $(__penguin___win32rc)
-@COND_USE_OPENGL_1@    $(CXX) -o $@ $(PENGUIN_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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_USE_OPENGL_1@    $(CXX) -o $@ $(PENGUIN_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__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_USE_OPENGL_1@    
 @COND_USE_OPENGL_1@    $(__penguin___mac_setfilecmd)
 @COND_USE_OPENGL_1@    $(__penguin___os2_emxbindcmd)
@@ -217,6 +221,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 penguin_bundle data