X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/509f339a81d66c65fe2af1a67d63d6c856046ec2..9044b125fd8542dab159d4a1585aae62e5547ae6:/samples/font/Makefile.in?ds=inline

diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in
index 75710360de..b62a851f95 100644
--- a/samples/font/Makefile.in
+++ b/samples/font/Makefile.in
@@ -90,10 +90,16 @@ 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_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_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_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 +147,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 +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 font_bundle