function key support

[wxWidgets.git] / samples / config / Makefile.in

diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in
index dbd57f348fe4c31757c4972f5c1c0d4dd2a512fd..d671c0d427c7cb95330a9dfd13ac290dae0f8b5f 100644 (file)
--- a/samples/config/Makefile.in
+++ b/samples/config/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@
@@ -74,6 +74,8 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @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_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
@@ -84,6 +86,8 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_MAC_1@__conftest___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
@@ -105,7 +109,6 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN32_1@__conftest___win32rc = conftest_rc.o
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex
 @COND_PLATFORM_MAC_1@__conftest___mac_setfilecmd = $(SETFILE) -a C conftest$(EXEEXT)
-@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d
 
 ### Targets: ###
 
@@ -114,7 +117,7 @@ all: conftest$(EXEEXT)
 install-strip: install
 
 clean: 
-       rm -f ./*.o ./*.d
+       rm -f ./*.o ./.deps/*
        rm -f conftest$(EXEEXT)
 
 install: all
@@ -122,6 +125,10 @@ install: all
 conftest_rc.o: $(srcdir)/conftest.rc
        $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --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
+
 uninstall: 
 
 conftest$(EXEEXT): conftest.o $(__conftest___win32rc)
@@ -130,10 +137,10 @@ conftest$(EXEEXT): conftest.o $(__conftest___win32rc)
        $(__conftest___mac_setfilecmd)
 
 conftest.o: $(srcdir)/conftest.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) $<
 
 
 # Include dependency info, if present:
-@IF_GNU_MAKE@-include *.d
+@IF_GNU_MAKE@-include .deps/*.d
 
 .PHONY: all