diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in index ff2e014e8c..2be34f237c 100644 --- a/samples/access/Makefile.in +++ b/samples/access/Makefile.in @@ -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 diff --git a/samples/animate/Makefile.in b/samples/animate/Makefile.in index b0a225db75..e8a06ee62d 100644 --- a/samples/animate/Makefile.in +++ b/samples/animate/Makefile.in @@ -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 diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in index 25adcf50ab..5a1c8ce2d1 100644 --- a/samples/artprov/Makefile.in +++ b/samples/artprov/Makefile.in @@ -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 diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in index 56d4bbfc53..8ab889be54 100644 --- a/samples/aui/Makefile.in +++ b/samples/aui/Makefile.in @@ -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 diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in index fa4958681d..0b2d7321b5 100644 --- a/samples/calendar/Makefile.in +++ b/samples/calendar/Makefile.in @@ -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 diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in index e0e06dc867..2e1e348dc8 100644 --- a/samples/caret/Makefile.in +++ b/samples/caret/Makefile.in @@ -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 diff --git a/samples/collpane/Makefile.in b/samples/collpane/Makefile.in index 7f02467222..c14d9abe37 100644 --- a/samples/collpane/Makefile.in +++ b/samples/collpane/Makefile.in @@ -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 diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in index 36215bb6f3..899ac60ab1 100644 --- a/samples/combo/Makefile.in +++ b/samples/combo/Makefile.in @@ -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 diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in index 2c99b6f159..00105d6fe3 100644 --- a/samples/config/Makefile.in +++ b/samples/config/Makefile.in @@ -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 diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in index dbe6dfa1c0..a25679eee0 100644 --- a/samples/console/Makefile.in +++ b/samples/console/Makefile.in @@ -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 diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in index 71268ebd09..f8f113b2f8 100644 --- a/samples/controls/Makefile.in +++ b/samples/controls/Makefile.in @@ -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 diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in index 5509311b29..0c49a7bc54 100644 --- a/samples/dataview/Makefile.in +++ b/samples/dataview/Makefile.in @@ -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 diff --git a/samples/debugrpt/Makefile.in b/samples/debugrpt/Makefile.in index 89dcc68694..20b5d8685d 100644 --- a/samples/debugrpt/Makefile.in +++ b/samples/debugrpt/Makefile.in @@ -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 diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index 5e41f13cbb..5d89848e0c 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/Makefile.in @@ -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 diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in index e4d695df6e..b0dd83b99e 100644 --- a/samples/dialup/Makefile.in +++ b/samples/dialup/Makefile.in @@ -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 diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in index 3310e91978..451f1d4d61 100644 --- a/samples/display/Makefile.in +++ b/samples/display/Makefile.in @@ -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 diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in index 2abcaab25e..cde0afd8c4 100644 --- a/samples/dnd/Makefile.in +++ b/samples/dnd/Makefile.in @@ -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 diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in index dba3e82c3f..ff972beacf 100644 --- a/samples/docview/Makefile.in +++ b/samples/docview/Makefile.in @@ -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 diff --git a/samples/docvwmdi/Makefile.in b/samples/docvwmdi/Makefile.in index 10bc335da3..c4bfc6932d 100644 --- a/samples/docvwmdi/Makefile.in +++ b/samples/docvwmdi/Makefile.in @@ -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 diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in index 6015707368..fa031b3fd5 100644 --- a/samples/dragimag/Makefile.in +++ b/samples/dragimag/Makefile.in @@ -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 diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in index f9e3a1cb52..65bcff40f5 100644 --- a/samples/drawing/Makefile.in +++ b/samples/drawing/Makefile.in @@ -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 diff --git a/samples/editlbox/Makefile.in b/samples/editlbox/Makefile.in index a4b32d1771..a5f4bff0cb 100644 --- a/samples/editlbox/Makefile.in +++ b/samples/editlbox/Makefile.in @@ -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 diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in index 68616814de..b02cc73e45 100644 --- a/samples/erase/Makefile.in +++ b/samples/erase/Makefile.in @@ -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 diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in index ef25e8174d..f0371d0042 100644 --- a/samples/event/Makefile.in +++ b/samples/event/Makefile.in @@ -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 diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in index 6dd7f3e4b7..f35677602c 100644 --- a/samples/except/Makefile.in +++ b/samples/except/Makefile.in @@ -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 diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in index 4341e9f4f1..1feba66fc9 100644 --- a/samples/exec/Makefile.in +++ b/samples/exec/Makefile.in @@ -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 diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in index 75710360de..3c4a453fc7 100644 --- a/samples/font/Makefile.in +++ b/samples/font/Makefile.in @@ -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 diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in index 2d2c4f5050..a16ab43bf0 100644 --- a/samples/grid/Makefile.in +++ b/samples/grid/Makefile.in @@ -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 diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in index 88909d236c..155e1c5599 100644 --- a/samples/help/Makefile.in +++ b/samples/help/Makefile.in @@ -93,10 +93,14 @@ COND_PLATFORM_OS2_1___help___os2_emxbindcmd = $(NM) help$(EXEEXT) | if grep -q \ @COND_PLATFORM_MACOSX_1@__help_app_Contents_PkgInfo___depname \ @COND_PLATFORM_MACOSX_1@ = help.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__help_bundle___depname = help_bundle +@COND_TOOLKIT_OSX_CARBON@____help_BUNDLE_TGT_REF_DEP \ +@COND_TOOLKIT_OSX_CARBON@ = $(__help_app_Contents_PkgInfo___depname) +@COND_TOOLKIT_OSX_COCOA@____help_BUNDLE_TGT_REF_DEP \ +@COND_TOOLKIT_OSX_COCOA@ = $(__help_app_Contents_PkgInfo___depname) +@COND_TOOLKIT_OSX_IPHONE@____help_BUNDLE_TGT_REF_DEP \ +@COND_TOOLKIT_OSX_IPHONE@ = $(__help_app_Contents_PkgInfo___depname) @COND_TOOLKIT_COCOA@____help_BUNDLE_TGT_REF_DEP = \ @COND_TOOLKIT_COCOA@ $(__help_app_Contents_PkgInfo___depname) -@COND_TOOLKIT_MAC@____help_BUNDLE_TGT_REF_DEP = \ -@COND_TOOLKIT_MAC@ $(__help_app_Contents_PkgInfo___depname) COND_MONOLITHIC_0___WXLIB_HTML_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p) @@ -150,7 +154,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc) - $(CXX) -o $@ $(HELP_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + $(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__help___mac_setfilecmd) $(__help___os2_emxbindcmd) @@ -219,6 +223,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ $(srcdir)/include/wx/stc/stc.h # Include dependency info, if present: -@IF_GNU_MAKE@-include ./.deps/*.d +@IF_GNU_MAKE@-include .deps/*.d .PHONY: all install uninstall clean distclean help_bundle data data_doc diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in index d89e15044c..68c3e588d7 100644 --- a/samples/htlbox/Makefile.in +++ b/samples/htlbox/Makefile.in @@ -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 diff --git a/samples/html/Makefile.in b/samples/html/Makefile.in index f20c1babad..d216c12f73 100644 --- a/samples/html/Makefile.in +++ b/samples/html/Makefile.in @@ -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 diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in index 7868fd9acc..3e2c5ef074 100644 --- a/samples/image/Makefile.in +++ b/samples/image/Makefile.in @@ -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 diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in index 0d5dca9866..f682224676 100644 --- a/samples/internat/Makefile.in +++ b/samples/internat/Makefile.in @@ -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 diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in index dd5df87b87..e41a15523d 100644 --- a/samples/ipc/Makefile.in +++ b/samples/ipc/Makefile.in @@ -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 diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in index 208205696a..25db5bd4bf 100644 --- a/samples/joytest/Makefile.in +++ b/samples/joytest/Makefile.in @@ -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 diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in index 7c8442ec68..e49232fd1b 100644 --- a/samples/keyboard/Makefile.in +++ b/samples/keyboard/Makefile.in @@ -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 diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in index a3314c391e..499ae3a70a 100644 --- a/samples/layout/Makefile.in +++ b/samples/layout/Makefile.in @@ -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 diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in index 45dc01a3bf..913b84cb2f 100644 --- a/samples/listctrl/Makefile.in +++ b/samples/listctrl/Makefile.in @@ -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 diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in index 84255a1fe0..a0b22a2cac 100644 --- a/samples/mdi/Makefile.in +++ b/samples/mdi/Makefile.in @@ -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 diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in index b9906c6470..61ab38f140 100644 --- a/samples/mediaplayer/Makefile.in +++ b/samples/mediaplayer/Makefile.in @@ -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 diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in index 67ebf96d09..4b391928fb 100644 --- a/samples/memcheck/Makefile.in +++ b/samples/memcheck/Makefile.in @@ -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 diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in index b357dc2def..ab0a078d33 100644 --- a/samples/menu/Makefile.in +++ b/samples/menu/Makefile.in @@ -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 diff --git a/samples/mfc/Makefile.in b/samples/mfc/Makefile.in index f4d013f04d..a8afbc3485 100644 --- a/samples/mfc/Makefile.in +++ b/samples/mfc/Makefile.in @@ -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 diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in index d769956013..7b3d93e4b4 100644 --- a/samples/minimal/Makefile.in +++ b/samples/minimal/Makefile.in @@ -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 diff --git a/samples/mobile/Makefile.in b/samples/mobile/Makefile.in index 0277306f7e..ce6a0fb6a7 100644 --- a/samples/mobile/Makefile.in +++ b/samples/mobile/Makefile.in @@ -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 diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in index db89e9d500..02b3aea66a 100644 --- a/samples/nativdlg/Makefile.in +++ b/samples/nativdlg/Makefile.in @@ -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 diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in index f3c6714647..3894d605b3 100644 --- a/samples/notebook/Makefile.in +++ b/samples/notebook/Makefile.in @@ -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 diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in index 1e0c839966..495c1003da 100644 --- a/samples/oleauto/Makefile.in +++ b/samples/oleauto/Makefile.in @@ -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 diff --git a/samples/opengl/Makefile.in b/samples/opengl/Makefile.in index 092ed69cdb..5f8b510719 100644 --- a/samples/opengl/Makefile.in +++ b/samples/opengl/Makefile.in @@ -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 diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in index c4a746bf73..4dc2456292 100644 --- a/samples/ownerdrw/Makefile.in +++ b/samples/ownerdrw/Makefile.in @@ -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 diff --git a/samples/popup/Makefile.in b/samples/popup/Makefile.in index a293c53c01..914480ba69 100644 --- a/samples/popup/Makefile.in +++ b/samples/popup/Makefile.in @@ -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 diff --git a/samples/power/Makefile.in b/samples/power/Makefile.in index 5f0646fd2f..0f2b2feff2 100644 --- a/samples/power/Makefile.in +++ b/samples/power/Makefile.in @@ -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 diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in index d4b6e1c80f..c86513aef0 100644 --- a/samples/printing/Makefile.in +++ b/samples/printing/Makefile.in @@ -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 diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in index 1852820639..a353b3a67b 100644 --- a/samples/regtest/Makefile.in +++ b/samples/regtest/Makefile.in @@ -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 diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in index 70e6a221c7..9f99cea951 100644 --- a/samples/render/Makefile.in +++ b/samples/render/Makefile.in @@ -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 diff --git a/samples/richtext/Makefile.in b/samples/richtext/Makefile.in index 343af81a3d..b180fdc83d 100644 --- a/samples/richtext/Makefile.in +++ b/samples/richtext/Makefile.in @@ -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 diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in index a9fd72ce59..d9034dda78 100644 --- a/samples/sashtest/Makefile.in +++ b/samples/sashtest/Makefile.in @@ -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 diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in index 9788dc4fd6..4ed2b26bb0 100644 --- a/samples/scroll/Makefile.in +++ b/samples/scroll/Makefile.in @@ -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 diff --git a/samples/scrollsub/Makefile.in b/samples/scrollsub/Makefile.in index 9bb2a2e512..87a830c9de 100644 --- a/samples/scrollsub/Makefile.in +++ b/samples/scrollsub/Makefile.in @@ -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 diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in index 95c77e330f..439f371863 100644 --- a/samples/shaped/Makefile.in +++ b/samples/shaped/Makefile.in @@ -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 diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in index 4ce75a22a0..47d063aab2 100644 --- a/samples/sockets/Makefile.in +++ b/samples/sockets/Makefile.in @@ -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 diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in index f72b42cf3b..a36eb14e0a 100644 --- a/samples/sound/Makefile.in +++ b/samples/sound/Makefile.in @@ -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 diff --git a/samples/splash/Makefile.in b/samples/splash/Makefile.in index 5e9d1502d3..a945ef8f1b 100644 --- a/samples/splash/Makefile.in +++ b/samples/splash/Makefile.in @@ -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 diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in index 7f5e9ee290..288408afe8 100644 --- a/samples/splitter/Makefile.in +++ b/samples/splitter/Makefile.in @@ -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 diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in index 3f614bad26..57bb2f9a8d 100644 --- a/samples/statbar/Makefile.in +++ b/samples/statbar/Makefile.in @@ -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 diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in index 3633e9efff..5723f6475e 100644 --- a/samples/stc/Makefile.in +++ b/samples/stc/Makefile.in @@ -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 diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in index 04ce54926b..3d104aa126 100644 --- a/samples/svg/Makefile.in +++ b/samples/svg/Makefile.in @@ -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 diff --git a/samples/taborder/Makefile.in b/samples/taborder/Makefile.in index d72eed203d..e3c71db26e 100644 --- a/samples/taborder/Makefile.in +++ b/samples/taborder/Makefile.in @@ -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 diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in index 8105b5e79b..d64e498c64 100644 --- a/samples/taskbar/Makefile.in +++ b/samples/taskbar/Makefile.in @@ -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 diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in index e746aa6540..0bffb638f2 100644 --- a/samples/text/Makefile.in +++ b/samples/text/Makefile.in @@ -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 diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in index d3f502edfa..cb667576ec 100644 --- a/samples/thread/Makefile.in +++ b/samples/thread/Makefile.in @@ -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 diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in index db16047381..d31a471b23 100644 --- a/samples/toolbar/Makefile.in +++ b/samples/toolbar/Makefile.in @@ -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 diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in index a885a2f1e7..1ea1bc9aae 100644 --- a/samples/treectrl/Makefile.in +++ b/samples/treectrl/Makefile.in @@ -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 diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in index babc5d8d4c..95c0209c9f 100644 --- a/samples/typetest/Makefile.in +++ b/samples/typetest/Makefile.in @@ -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 diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in index 72879b8ecc..def5091a47 100644 --- a/samples/validate/Makefile.in +++ b/samples/validate/Makefile.in @@ -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 diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in index 85be4c8725..a7f22707a8 100644 --- a/samples/vscroll/Makefile.in +++ b/samples/vscroll/Makefile.in @@ -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 diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in index ec78426853..b77a1bcd53 100644 --- a/samples/widgets/Makefile.in +++ b/samples/widgets/Makefile.in @@ -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 diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in index a46bcdc331..0825748566 100644 --- a/samples/wizard/Makefile.in +++ b/samples/wizard/Makefile.in @@ -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 diff --git a/samples/wrapsizer/Makefile.in b/samples/wrapsizer/Makefile.in index 162b2117ed..4275b5b3ce 100644 --- a/samples/wrapsizer/Makefile.in +++ b/samples/wrapsizer/Makefile.in @@ -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 diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in index 2477beb641..6572a59403 100644 --- a/samples/xrc/Makefile.in +++ b/samples/xrc/Makefile.in @@ -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