stop usign a deprecated method, and ensure that the imagelist

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

diff --git a/samples/tab/Makefile.in b/samples/tab/Makefile.in
index 1a54eff0c8db4b25706add5cd65139b4153785d4..352c38034912d46e66f115abe674c5d9bdc9c187 100644 (file)
--- a/samples/tab/Makefile.in
+++ b/samples/tab/Makefile.in
@@ -7,129 +7,111 @@
 
 @MAKE_SET@
 
 
 @MAKE_SET@
 

-CPPFLAGS = @CPPFLAGS@
-INSTALL_DIR = @INSTALL_DIR@
-DEREZ = @DEREZ@
-wxUSE_ZLIB = @wxUSE_ZLIB@
-MONOLITHIC = @MONOLITHIC@
-SONAME_FLAG = @SONAME_FLAG@
-CXXFLAGS = @CXXFLAGS@

 prefix = @prefix@
 prefix = @prefix@

+exec_prefix = @exec_prefix@

 INSTALL = @INSTALL@
 INSTALL = @INSTALL@

+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@

 EXEEXT = @EXEEXT@
 EXEEXT = @EXEEXT@

+EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
+LDFLAGS = @LDFLAGS@
+LDFLAGS_GUI = @LDFLAGS_GUI@

 RESCOMP = @RESCOMP@
 RESCOMP = @RESCOMP@

-PLATFORM_MAC = @PLATFORM_MAC@
-USE_SOVERSION = @USE_SOVERSION@

 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@

-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-wxUSE_LIBPNG = @wxUSE_LIBPNG@
-wxUSE_LIBTIFF = @wxUSE_LIBTIFF@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-TOOLKIT = @TOOLKIT@
-EXTRALIBS = @EXTRALIBS@
-CC = @CC@
-datadir = @datadir@
-PLATFORM_MSDOS = @PLATFORM_MSDOS@

 SETFILE = @SETFILE@
 SETFILE = @SETFILE@

-UNICODE = @UNICODE@
-STRIP = @STRIP@
-USE_SOVERSOLARIS = @USE_SOVERSOLARIS@
-srcdir = @srcdir@
-wxUSE_ODBC = @wxUSE_ODBC@
-wxUSE_REGEX = @wxUSE_REGEX@
-bindir = @bindir@
-PIC_FLAG = @PIC_FLAG@
-USE_SOSYMLINKS = @USE_SOSYMLINKS@
-wxUSE_LIBJPEG = @wxUSE_LIBJPEG@
-INSTALL_DATA = @INSTALL_DATA@
-USE_GUI = @USE_GUI@
-PLATFORM_UNIX = @PLATFORM_UNIX@
-RANLIB = @RANLIB@
-SO_SUFFIX = @SO_SUFFIX@
-top_srcdir = @top_srcdir@
-AR = @AR@
-BUILD = @BUILD@
-PLATFORM_WIN32 = @PLATFORM_WIN32@
-USE_MACVERSION = @USE_MACVERSION@
-PLATFORM_MACOSX = @PLATFORM_MACOSX@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-WXUNIV = @WXUNIV@
+TOOLKIT = @TOOLKIT@

 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@

-DEPS_TYPE = @DEPS_TYPE@
-SHARED_LD_CXX = @SHARED_LD_CXX@
-CXX = @CXX@
-includedir = @includedir@
-LN_S = @LN_S@
-CFLAGS = @CFLAGS@
-DLLPREFIX = @DLLPREFIX@
-SHARED = @SHARED@
-USE_SOVERLINUX = @USE_SOVERLINUX@
+TOOLKIT_VERSION = @TOOLKIT_VERSION@
+srcdir = @srcdir@

 top_builddir = @top_builddir@
 top_builddir = @top_builddir@

-SHARED_LD_CC = @SHARED_LD_CC@
+top_srcdir = @top_srcdir@
+
+### Variables: ###
+
+TAB_CXXFLAGS = $(CPPFLAGS)   -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p)   -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS)

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 

-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib
-@COND_UNICODE_1@WXUNICODEFLAG = u
+@COND_DEPS_TRACKING_0@CXXC = $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_USE_GUI_0@PORTNAME = base
+@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+@COND_TOOLKIT_MAC@WXBASEPORT = _carbon

 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d

-@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
-@COND_PLATFORM_WIN32_1@__tab___win32rc = tab_rc.o
-@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_UNICODE_1@WXUNICODEFLAG = u

 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_WXUNIV_1@WXUNIVNAME = univ

-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
-@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
-@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_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_REGEX_BUILTIN@LIB_REGEX = wxregex
-@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_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
+@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
+@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
+@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
+@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg
+@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg
+@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc
+@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc
+@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc
+@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png
+@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png
+@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png
+@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex
+@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex
+@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex
+@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff
+@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff
+@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff
+@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib
+@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib
+@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib
+@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG)
+@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG)
+@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG)
+@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)   -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o tab$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
+@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
+@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5

 @COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5

-@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg
-@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff
-@COND_PLATFORM_MAC_1@__tab___mac_rezcmd = $(__MACOSX_RESOURCES_p)
-@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 tab$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
+@COND_PLATFORM_MAC_1@__tab___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)

 @COND_PLATFORM_MAC_1@__tab___mac_setfilecmd = $(SETFILE) -a C tab$(EXEEXT)
 @COND_PLATFORM_MAC_1@__tab___mac_setfilecmd = $(SETFILE) -a C tab$(EXEEXT)

-@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d
+@COND_PLATFORM_WIN32_1@__tab___win32rc = tab_tab_rc.o

 
 ### Targets: ###
 
 all: tab$(EXEEXT)
 
 
 ### Targets: ###
 
 all: tab$(EXEEXT)
 

-install-strip: install
+clean: 
+       rm -rf ./.deps
+       rm -f -f ./*.o
+       rm -f tab$(EXEEXT)
+
+distclean: clean
+       rm -f configure config.cache config.log config.status
+       rm -f bk-deps shared-ld-sh
+
+install: all

 
 

-tab_rc.o: $(srcdir)/tab.rc
-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ --define $(WXUNIV_DEFINE) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
+install-strip: install

 
 

-tab$(EXEEXT): tab.o $(__tab___win32rc)
-       $(CXX) -o $@  tab.o $(__tab___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)
+tab$(EXEEXT): tab_tab.o $(__tab___win32rc)
+       $(CXX) -o $@  tab_tab.o $(__tab___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)

        $(__tab___mac_rezcmd)
        $(__tab___mac_setfilecmd)
 
        $(__tab___mac_rezcmd)
        $(__tab___mac_setfilecmd)
 

-clean: 
-       rm -f ./*.o ./*.d
-       rm -f tab$(EXEEXT)
+tab_tab.o: $(srcdir)/tab.cpp
+       $(CXXC) -c -o $@ $(TAB_CXXFLAGS) $<

 
 

-tab.o: $(srcdir)/tab.cpp
-       $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(DEPS_FLAG) $(CXXFLAGS) $<
+tab_tab_rc.o: $(srcdir)/tab.rc
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2)

 
 uninstall: 
 
 
 uninstall: 
 

-install: all
-

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

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

 
 

-.PHONY: all
+.PHONY: all clean distclean install uninstall