X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cbd63f42f6a7a2dd6cc2182497c4817dbb5f1433..6c3e36af8f9d2d1562bda395ef79e971ae5b7d13:/samples/caret/Makefile.in

diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in
index 5f17b72013..637dd6e171 100644
--- a/samples/caret/Makefile.in
+++ b/samples/caret/Makefile.in
@@ -53,12 +53,12 @@ BUILD = @BUILD@
 PLATFORM_WIN32 = @PLATFORM_WIN32@
 USE_MACVERSION = @USE_MACVERSION@
 PLATFORM_MACOSX = @PLATFORM_MACOSX@
+DEPS_TRACKING = @DEPS_TRACKING@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 WXUNIV = @WXUNIV@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-DEPS_TYPE = @DEPS_TYPE@
-SHARED_LD_CXX = @SHARED_LD_CXX@
 CXX = @CXX@
+SHARED_LD_CXX = @SHARED_LD_CXX@
 includedir = @includedir@
 LN_S = @LN_S@
 CFLAGS = @CFLAGS@
@@ -70,66 +70,77 @@ SHARED_LD_CC = @SHARED_LD_CC@
 
 ### Conditionally set variables: ###
 
-@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib
-@COND_UNICODE1@WXUNICODEFLAG = u
-@COND_BUILDDEBUG@WXDEBUGFLAG = d
-@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg
-@COND_WXUSE_LIBPNGBUILTIN@LIB_PNG = wxpng
-@COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_p = -lwxodbc
-@COND_MONOLITHIC0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
-@COND_WXUNIV1@WXUNIVNAME = univ
-@COND_WXUNIV1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_PLATFORM_WIN321@WXCOMPILER = _gcc
-@COND_PLATFORM_MAC1@__caret___mac_setfilecmd = $(SETFILE) -a C caret$(EXEEXT)
-@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib
-@COND_PLATFORM_MAC1@__caret___mac_rezcmd = $(__MACOSX_RESOURCES_p)
-@COND_TOOLKITMAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
-@COND_WXUSE_LIBPNGBUILTIN@__LIB_PNG_p = -lwxpng
-@COND_PLATFORM_WIN321@DLLIMPEXT = .a
-@COND_PLATFORM_WIN320@DLLIMPEXT = .$(SO_SUFFIX)
-@COND_WXUNIV1@WXUNIV_DEFINE = __WXUNIVERSAL__
-@COND_MONOLITHIC1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
-@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff
-@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
-@COND_PLATFORM_WIN321@__caret___win32rc = caret_rc.o
-@COND_WXUSE_ODBCBUILTIN@LIB_ODBC = wxodbc
-@COND_MONOLITHIC1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
-@COND_WXUSE_LIBJPEGBUILTIN@LIB_JPEG = wxjpeg
-@COND_WXUSE_LIBTIFFBUILTIN@LIB_TIFF = wxtiff
-@COND_USE_GUI0@PORTNAME = base
-@COND_USE_GUI1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKITMAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o caret$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
-@COND_WXUSE_REGEXBUILTIN@__LIB_REGEX_p = -lwxregex
-@COND_WXUSE_REGEXBUILTIN@LIB_REGEX = wxregex
-@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d
+@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib
+@COND_UNICODE_1@WXUNICODEFLAG = u
+@COND_BUILD_DEBUG@WXDEBUGFLAG = d
+@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_0@CXXC = $(CXX)
+@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
+@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
+@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc
+@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
+@COND_WXUNIV_1@WXUNIVNAME = univ
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
+@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
+@COND_PLATFORM_MAC_1@__caret___mac_setfilecmd = $(SETFILE) -a C caret$(EXEEXT)
+@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
+@COND_PLATFORM_MAC_1@__caret___mac_rezcmd = $(__MACOSX_RESOURCES_p)
+@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
+@COND_DEPS_TRACKING_0@CCC = $(CC)
+@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
+@COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
+@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a
+@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX)
+@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__
+@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
+@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff
+@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
+@COND_PLATFORM_WIN32_1@__caret___win32rc = caret_rc.o
+@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5
+@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
+@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
+@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff
+@COND_USE_GUI_0@PORTNAME = base
+@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o caret$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex
+@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex
 
 ### Targets: ###
 
 all: caret$(EXEEXT)
 
 caret$(EXEEXT): caret.o $(__caret___win32rc)
-	$(CXX) -o $@  caret.o $(__caret___win32rc)  -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p)
+	$(CXX) -o $@  caret.o $(__caret___win32rc)  -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p)
 	$(__caret___mac_rezcmd)
 	$(__caret___mac_setfilecmd)
 
 install-strip: install
 
 clean: 
-	rm -f ./*.o ./*.d
+	rm -f ./*.o ./.deps/*
 	rm -f caret$(EXEEXT)
 
 install: all
 
-caret_rc.o: $(srcdir)/caret.rc
-	$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ --define $(WXUNIV_DEFINE) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
+distclean: clean
+	rm -f configure config.cache config.log config.status
+	rm -f bk-deps shared-ld-sh
 
 caret.o: $(srcdir)/caret.cpp
-	$(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(DEPS_FLAG) $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $<
+
+caret_rc.o: $(srcdir)/caret.rc
+	$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
 
 uninstall: 
 
 
 # Include dependency info, if present:
-@IF_GNU_MAKE@-include *.d
+@IF_GNU_MAKE@-include .deps/*.d
 
 .PHONY: all