From baa6e1d6a8abe16520969302f37d8fd727f34ee3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 28 Jun 2003 16:08:36 +0000 Subject: [PATCH] regenerated git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/console/Makefile.in | 93 ++++++++++++++++++++++++++----------- 1 file changed, 65 insertions(+), 28 deletions(-) diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in index 6fd4108eff..a8c946d3a5 100644 --- a/samples/console/Makefile.in +++ b/samples/console/Makefile.in @@ -32,7 +32,7 @@ CC = @CC@ datadir = @datadir@ PLATFORM_MSDOS = @PLATFORM_MSDOS@ SETFILE = @SETFILE@ -UNICODE = @UNICODE@ +LDFLAGS = @LDFLAGS@ STRIP = @STRIP@ USE_SOVERSOLARIS = @USE_SOVERSOLARIS@ srcdir = @srcdir@ @@ -41,24 +41,26 @@ wxUSE_REGEX = @wxUSE_REGEX@ bindir = @bindir@ PIC_FLAG = @PIC_FLAG@ USE_SOSYMLINKS = @USE_SOSYMLINKS@ -wxUSE_LIBJPEG = @wxUSE_LIBJPEG@ +LDFLAGS_GUI = @LDFLAGS_GUI@ INSTALL_DATA = @INSTALL_DATA@ USE_GUI = @USE_GUI@ PLATFORM_UNIX = @PLATFORM_UNIX@ RANLIB = @RANLIB@ SO_SUFFIX = @SO_SUFFIX@ top_srcdir = @top_srcdir@ +wxUSE_LIBJPEG = @wxUSE_LIBJPEG@ AR = @AR@ BUILD = @BUILD@ PLATFORM_WIN32 = @PLATFORM_WIN32@ USE_MACVERSION = @USE_MACVERSION@ PLATFORM_MACOSX = @PLATFORM_MACOSX@ DEPS_TRACKING = @DEPS_TRACKING@ -TOOLKIT_VERSION = @TOOLKIT_VERSION@ +UNICODE = @UNICODE@ WXUNIV = @WXUNIV@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ CXX = @CXX@ SHARED_LD_CXX = @SHARED_LD_CXX@ +TOOLKIT_VERSION = @TOOLKIT_VERSION@ includedir = @includedir@ LN_S = @LN_S@ CFLAGS = @CFLAGS@ @@ -70,43 +72,77 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) @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_WXUNIV_1@WXUNIVNAME = univ +@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 +@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc -@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib +@COND_BUILD_DEBUG@OPTIMIZEFLAG = off +@COND_BUILD_RELEASE@OPTIMIZEFLAG = speed @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_PLATFORM_MAC_1@__console___mac_setfilecmd = $(SETFILE) -a C console$(EXEEXT) -@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o console$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@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_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 +@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 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc$(WXDEBUGFLAG) @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_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_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_SHARED_1@DLLFLAG = WXUSINGDLL +@COND_MONOLITHIC_0@__MULTILIB_FLAG_p_2 = --define wxUSE_GUI=0 +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) +@COND_WXUSE_REGEX_BUILTIN@INC_REGEX = $(srcdir)/src/regex +@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) +@COND_DEPS_TRACKING_0@CXXC = $(CXX) +@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_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +@COND_WXUSE_LIBPNG_BUILTIN@INC_PNG = $(srcdir)/src/png +@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 +@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@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_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_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ -@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_MONOLITHIC_0@__MULTILIB_FLAG_p_1 = -d wxUSE_GUI=0 +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG) +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG) @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) -@COND_PLATFORM_MAC_1@__console___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex -@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_BUILD_DEBUG@DEBUGFLAG = on +@COND_BUILD_RELEASE@DEBUGFLAG = off +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(srcdir)/src/png +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex$(WXDEBUGFLAG) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) ### Targets: ### @@ -115,15 +151,16 @@ all: console$(EXEEXT) data install-strip: install console.o: $(srcdir)/console.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< + $(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 -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(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___mac_rezcmd) $(__console___mac_setfilecmd) clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f console$(EXEEXT) rm -f ./testdata.fc -- 2.45.2