compilation fix

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

diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in
index 266b23715a94372c08bf247c3b2e3dd6a28a7e8e..32a5c048a0ed76a513214f353f07a715d02efdd4 100644 (file)
--- a/samples/access/Makefile.in
+++ b/samples/access/Makefile.in
@@ -53,12 +53,12 @@ BUILD = @BUILD@
 PLATFORM_WIN32 = @PLATFORM_WIN32@
 USE_MACVERSION = @USE_MACVERSION@
 PLATFORM_MACOSX = @PLATFORM_MACOSX@
 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@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 WXUNIV = @WXUNIV@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@

-DEPS_TYPE = @DEPS_TYPE@
-SHARED_LD_CXX = @SHARED_LD_CXX@

 CXX = @CXX@
 CXX = @CXX@

+SHARED_LD_CXX = @SHARED_LD_CXX@

 includedir = @includedir@
 LN_S = @LN_S@
 CFLAGS = @CFLAGS@
 includedir = @includedir@
 LN_S = @LN_S@
 CFLAGS = @CFLAGS@


@@ -74,34 +74,41 @@ 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_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg

-@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
+@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_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc

+@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng

 @COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5

-@COND_WXUNIV_1@WXUNIVNAME = univ

 @COND_PLATFORM_MAC_1@__accesstest___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_PLATFORM_MAC_1@__accesstest___mac_rezcmd = $(__MACOSX_RESOURCES_p)

+@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@__accesstest___mac_setfilecmd = $(SETFILE) -a C accesstest$(EXEEXT)
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@__accesstest___win32rc = accesstest_rc.o
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_PLATFORM_MAC_1@__accesstest___mac_setfilecmd = $(SETFILE) -a C accesstest$(EXEEXT)
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
 @COND_PLATFORM_WIN32_1@__accesstest___win32rc = accesstest_rc.o

-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+@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_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r

-@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
+@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_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_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
-@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5

 @COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg
 @COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg

+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
+@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_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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o accesstest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
+@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o accesstest$(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
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex
 @COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex

-@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d

 
 ### Targets: ###
 
 
 ### Targets: ###
 


@@ -110,13 +117,17 @@ all: accesstest$(EXEEXT)
 install-strip: install
 
 clean: 
 install-strip: install
 
 clean: 

-       rm -f ./*.o ./*.d
+       rm -f ./*.o ./.deps/*

        rm -f accesstest$(EXEEXT)
 
 install: all
 
 accesstest.o: $(srcdir)/accesstest.cpp
        rm -f accesstest$(EXEEXT)
 
 install: all
 
 accesstest.o: $(srcdir)/accesstest.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) $<
+
+distclean: clean
+       rm -f configure config.cache config.log config.status
+       rm -f bk-deps shared-ld-sh

 
 accesstest$(EXEEXT): accesstest.o $(__accesstest___win32rc)
        $(CXX) -o $@  accesstest.o $(__accesstest___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)
 
 accesstest$(EXEEXT): accesstest.o $(__accesstest___win32rc)
        $(CXX) -o $@  accesstest.o $(__accesstest___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)


@@ -124,12 +135,12 @@ accesstest$(EXEEXT): accesstest.o $(__accesstest___win32rc)
        $(__accesstest___mac_setfilecmd)
 
 accesstest_rc.o: $(srcdir)/accesstest.rc
        $(__accesstest___mac_setfilecmd)
 
 accesstest_rc.o: $(srcdir)/accesstest.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ --define $(WXUNIV_DEFINE) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir)

 
 uninstall: 
 
 
 # Include dependency info, if present:
 
 uninstall: 
 
 
 # Include dependency info, if present:

-@IF_GNU_MAKE@-include *.d
+@IF_GNU_MAKE@-include .deps/*.d

 
 .PHONY: all
 
 .PHONY: all