regenerated

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

diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in
index a8c946d3a57448cf6d6d7392da503be6e5660821..6602d7b52a9b3e9a3bfa9a8bb821b5b2baf092b5 100644 (file)
--- a/samples/console/Makefile.in
+++ b/samples/console/Makefile.in
@@ -55,11 +55,13 @@ PLATFORM_WIN32 = @PLATFORM_WIN32@
 USE_MACVERSION = @USE_MACVERSION@
 PLATFORM_MACOSX = @PLATFORM_MACOSX@
 DEPS_TRACKING = @DEPS_TRACKING@
+OFFICIAL_BUILD = @OFFICIAL_BUILD@
 UNICODE = @UNICODE@
 WXUNIV = @WXUNIV@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 CXX = @CXX@
 SHARED_LD_CXX = @SHARED_LD_CXX@
+VENDOR = @VENDOR@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 includedir = @includedir@
 LN_S = @LN_S@
@@ -70,11 +72,18 @@ USE_SOVERLINUX = @USE_SOVERLINUX@
 top_builddir = @top_builddir@
 SHARED_LD_CC = @SHARED_LD_CC@
 
+### Variables: ###
+
+CONSOLE_CFLAGS = $(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) $(__MULTILIB_FLAG_p) $(CFLAGS)
+CONSOLE_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) $(__MULTILIB_FLAG_p) $(CXXFLAGS)
+
 ### Conditionally set variables: ###
 
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG)
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
+@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5
 @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(srcdir)/src/jpeg
 @COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng$(WXDEBUGFLAG)
 @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(srcdir)/src/zlib
@@ -89,6 +98,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib
 @COND_PLATFORM_MAC_1@__console___mac_setfilecmd = $(SETFILE) -a C console$(EXEEXT)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(INC_TIFF) -i $(INC_JPEG) -i $(INC_PNG) -i $(INC_ZLIB) -i $(INC_ODBC) -i $(INC_REGEX) -i $(srcdir) $(__DLLFLAG_p_1) $(__MULTILIB_FLAG_p_1) -o console$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
@@ -97,10 +107,10 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
 @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = --include-dir $(srcdir)/src/png
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = --include-dir $(srcdir)/src/tiff
+@COND_WXUSE_LIBPNG_BUILTIN@INC_PNG = $(srcdir)/src/png
 @COND_PLATFORM_MAC_1@__console___mac_rezcmd = $(__MACOSX_RESOURCES_p)
 @COND_MONOLITHIC_0@__MULTILIB_FLAG_p = -DwxUSE_GUI=0
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg
+@COND_MONOLITHIC_0@MULTILIB_FLAG = wxUSE_GUI=0
 @COND_SHARED_1@DLLFLAG = WXUSINGDLL
 @COND_MONOLITHIC_0@__MULTILIB_FLAG_p_2 = --define wxUSE_GUI=0
 @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
@@ -111,8 +121,10 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_UNIX_1@TIFF_PLATFORM_SRC = src/tiff/tif_unix.c
 @COND_PLATFORM_MACOSX_1@TIFF_PLATFORM_SRC = src/tiff/tif_unix.c
 @COND_PLATFORM_WIN32_1@TIFF_PLATFORM_SRC = src/tiff/tif_win32.c
+@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)25
+@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-@COND_WXUSE_LIBPNG_BUILTIN@INC_PNG = $(srcdir)/src/png
+@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = --include-dir $(srcdir)/src/tiff
 @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(srcdir)/src/odbc
 @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = --include-dir $(srcdir)/src/odbc
 @COND_WXUNIV_1@WXUNIVNAME = univ
@@ -121,15 +133,18 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib$(WXDEBUGFLAG)
 @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(srcdir)/src/regex
 @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib
+@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wx25
+@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx
 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
 @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(srcdir)/src/tiff
 @COND_WXUSE_LIBTIFF_BUILTIN@INC_TIFF = $(srcdir)/src/tiff
 @COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5
 @COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__
 @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
-@COND_MONOLITHIC_0@MULTILIB_FLAG = wxUSE_GUI=0
+@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg
 @COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+@COND_OFFICIAL_BUILD_1@VENDORTAG = 
+@COND_OFFICIAL_BUILD_0@VENDORTAG = _$(VENDOR)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_MONOLITHIC_0@__MULTILIB_FLAG_p_1 = -d wxUSE_GUI=0
@@ -150,11 +165,8 @@ all: console$(EXEEXT) data
 
 install-strip: install
 
-console.o: $(srcdir)/console.cpp
-       $(CXXC) -c -o $@ $(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) $(__MULTILIB_FLAG_p) $(CXXFLAGS) $<
-
-console$(EXEEXT): console.o
-       $(CXX) -o $@  console.o $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_BASE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p)
+console$(EXEEXT): console-console.o
+       $(CXX) -o $@  console-console.o $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI)  $(__WXLIB_MONO_p) $(__WXLIB_BASE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p)
        $(__console___mac_rezcmd)
        $(__console___mac_setfilecmd)
 
@@ -170,6 +182,8 @@ distclean: clean
        rm -f configure config.cache config.log config.status
        rm -f bk-deps shared-ld-sh
 
+uninstall: 
+
 data: 
        @mkdir -p .
        @for f in testdata.fc; do \
@@ -178,7 +192,8 @@ data:
        fi; \
        done
 
-uninstall: 
+console-console.o: $(srcdir)/console.cpp
+       $(CXXC) -c -o $@ $(CONSOLE_CXXFLAGS) $<
 
 
 # Include dependency info, if present: