From fcf61db4d15311d0a70c2885700c1743efd0299e Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 29 Jun 2003 00:43:30 +0000 Subject: [PATCH] regenerated git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/gizmos/Makefile.in | 232 ++++++++++------ contrib/src/xrc/Makefile.in | 470 +++++++++++++++++++-------------- samples/Makefile.in | 55 ++-- samples/access/Makefile.in | 117 +++++--- samples/artprov/Makefile.in | 119 ++++++--- samples/calendar/Makefile.in | 125 ++++++--- samples/caret/Makefile.in | 113 +++++--- samples/checklst/Makefile.in | 119 ++++++--- samples/config/Makefile.in | 121 ++++++--- samples/console/Makefile.in | 37 ++- samples/controls/Makefile.in | 117 +++++--- samples/db/Makefile.in | 121 ++++++--- samples/dialogs/Makefile.in | 115 +++++--- samples/dialup/Makefile.in | 117 +++++--- samples/display/Makefile.in | 109 +++++--- samples/dnd/Makefile.in | 125 ++++++--- samples/docview/Makefile.in | 125 ++++++--- samples/docvwmdi/Makefile.in | 127 ++++++--- samples/dragimag/Makefile.in | 117 +++++--- samples/drawing/Makefile.in | 125 ++++++--- samples/dynamic/Makefile.in | 115 +++++--- samples/erase/Makefile.in | 121 ++++++--- samples/event/Makefile.in | 123 ++++++--- samples/exec/Makefile.in | 115 +++++--- samples/font/Makefile.in | 117 +++++--- samples/grid/Makefile.in | 113 +++++--- samples/help/Makefile.in | 111 +++++--- samples/htlbox/Makefile.in | 121 ++++++--- samples/image/Makefile.in | 121 ++++++--- samples/internat/Makefile.in | 115 +++++--- samples/ipc/Makefile.in | 115 +++++--- samples/joytest/Makefile.in | 117 +++++--- samples/keyboard/Makefile.in | 121 ++++++--- samples/layout/Makefile.in | 119 ++++++--- samples/listbox/Makefile.in | 115 +++++--- samples/listctrl/Makefile.in | 115 +++++--- samples/mdi/Makefile.in | 117 +++++--- samples/memcheck/Makefile.in | 119 ++++++--- samples/menu/Makefile.in | 117 +++++--- samples/mfc/Makefile.in | 115 +++++--- samples/minifram/Makefile.in | 117 +++++--- samples/minimal/Makefile.in | 31 ++- samples/mobile/Makefile.in | 123 ++++++--- samples/multimon/Makefile.in | 117 +++++--- samples/nativdlg/Makefile.in | 115 +++++--- samples/newgrid/Makefile.in | 115 +++++--- samples/notebook/Makefile.in | 117 +++++--- samples/oleauto/Makefile.in | 119 ++++++--- samples/opengl/Makefile.in | 119 ++++++--- samples/ownerdrw/Makefile.in | 115 +++++--- samples/png/Makefile.in | 119 ++++++--- samples/printing/Makefile.in | 115 +++++--- samples/propsize/Makefile.in | 119 ++++++--- samples/regtest/Makefile.in | 115 +++++--- samples/richedit/Makefile.in | 111 +++++--- samples/rotate/Makefile.in | 117 +++++--- samples/sashtest/Makefile.in | 115 +++++--- samples/scroll/Makefile.in | 119 ++++++--- samples/scrollsub/Makefile.in | 119 ++++++--- samples/shaped/Makefile.in | 119 ++++++--- samples/sockets/Makefile.in | 115 +++++--- samples/splitter/Makefile.in | 115 +++++--- samples/statbar/Makefile.in | 117 +++++--- samples/tab/Makefile.in | 115 +++++--- samples/taskbar/Makefile.in | 117 +++++--- samples/text/Makefile.in | 117 +++++--- samples/thread/Makefile.in | 119 ++++++--- samples/toolbar/Makefile.in | 123 ++++++--- samples/treectrl/Makefile.in | 115 +++++--- samples/typetest/Makefile.in | 117 +++++--- samples/validate/Makefile.in | 123 ++++++--- samples/vscroll/Makefile.in | 117 +++++--- samples/widgets/Makefile.in | 117 +++++--- samples/wizard/Makefile.in | 123 ++++++--- samples/wxtest/Makefile.in | 115 +++++--- src/xrc/Makefile.in | 470 +++++++++++++++++++-------------- 76 files changed, 6536 insertions(+), 3003 deletions(-) diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in index 488017e152..0ba482dbe9 100644 --- a/contrib/src/gizmos/Makefile.in +++ b/contrib/src/gizmos/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,100 +72,162 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +GIZMOSLIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(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) $(__DEBUGFLAG_5) $(__OPTIMIZEFLAG_7) -I$(srcdir)/../../include $(CFLAGS) +GIZMOSLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(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) $(__DEBUGFLAG_5) $(__OPTIMIZEFLAG_7) -I$(srcdir)/../../include $(CXXFLAGS) +GIZMOSDLL_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) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -I$(srcdir)/../../include -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) +GIZMOSDLL_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) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -I$(srcdir)/../../include -DWXMAKINGDLL $(CFLAGS) $(PIC_FLAG) + ### Conditionally set variables: ### -@COND_USE_SOVERLINUX_1@__gizmosdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf2) -@COND_USE_SOVERSOLARIS_1@__gizmosdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf3) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) @COND_UNICODE_1@WXUNICODEFLAG = u @COND_BUILD_DEBUG@WXDEBUGFLAG = d -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_inst_cmd = rm -f libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf3) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf2) libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) -@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) -@COND_DEPS_TRACKING_0@CXXC = $(CXX) -@COND_SHARED_1@__install_gizmosdll___depname = install_gizmosdll -@COND_USE_SOVERSION_1_PLATFORM_MACOSX_0@__gizmosdll___targetsuf3 = .$(SO_SUFFIX).0.0.0 -@COND_USE_SOVERSION_1_PLATFORM_MACOSX_1@__gizmosdll___targetsuf3 = .0.0.0.$(SO_SUFFIX) -@COND_USE_SOVERSION_1_PLATFORM_MACOSX_0@__gizmosdll___targetsuf2 = .$(SO_SUFFIX).0 -@COND_USE_SOVERSION_1_PLATFORM_MACOSX_1@__gizmosdll___targetsuf2 = .0.$(SO_SUFFIX) -@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc -@COND_PLATFORM_WIN32_1@__gizmosdll___importlib = -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) -@COND_PLATFORM_WIN32_1@__gizmosdll___importlib = -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) -@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = +@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 +@COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_inst_cmd = rm -f libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) +@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@INC_ZLIB = $(srcdir)/src/zlib @COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_BUILD_DEBUG@OPTIMIZEFLAG = off +@COND_BUILD_RELEASE@OPTIMIZEFLAG = speed @COND_SHARED_0@__gizmoslib___depname = $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5.a -@COND_SHARED_1@__gizmosdll___depname = $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf3) +@COND_SHARED_1@__gizmosdll___depname = $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) @COND_PLATFORM_MACOSX_1@__gizmosdll___macver = -compatibility_version 2.5 -current_version 2.5.0 -@COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_cmd = rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf3) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf2) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) +@COND_BUILD_DEBUG@__OPTIMIZEFLAG_2 = +@COND_BUILD_RELEASE@__OPTIMIZEFLAG_2 = @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC) @COND_DEPS_TRACKING_0@CCC = $(CC) -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) @COND_SHARED_0@__install_gizmoslib___depname = install_gizmoslib @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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_PLATFORM_MACOSX_1@__gizmosdll___macinstnamecmd = -install_name $(libdir)/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf2) -@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = -D__WXUNIVERSAL__ -@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-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_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = -I$(srcdir)/src/tiff +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = -I$(srcdir)/src/png +@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_ZLIB_BUILTIN@__INC_ZLIB_p_2 = -I$(srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = -I$(srcdir)/src/jpeg +@COND_BUILD_DEBUG@__OPTIMIZEFLAG_7 = +@COND_BUILD_RELEASE@__OPTIMIZEFLAG_7 = +@COND_USE_SOVERLINUX_1@__gizmosdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) +@COND_USE_SOVERSOLARIS_1@__gizmosdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) +@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_PLATFORM_MACOSX_0_USE_SOVERSION_1@__gizmosdll___targetsuf3 = .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmosdll___targetsuf3 = .0.0.0.$(SO_SUFFIX) +@COND_USE_SOVERSION_0@__gizmosdll___targetsuf3 = .$(SO_SUFFIX) +@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)25 +@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) +@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_PLATFORM_WIN32_1@__gizmosdll___importlib = -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__gizmosdll___importlib = -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) +@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__gizmosdll___targetsuf2 = .$(SO_SUFFIX).0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmosdll___targetsuf2 = .0.$(SO_SUFFIX) +@COND_USE_SOVERSION_0@__gizmosdll___targetsuf2 = .$(SO_SUFFIX) +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib$(WXDEBUGFLAG) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(srcdir)/src/regex +@COND_USE_SOSYMLINKS_1@__gizmosdll___so_symlinks_cmd = rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wx25 +@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx +@COND_BUILD_DEBUG@__DEBUGFLAG_1 = +@COND_BUILD_RELEASE@__DEBUGFLAG_1 = +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@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_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = -I$(srcdir)/src/odbc +@COND_SHARED_1@__install_gizmosdll___depname = install_gizmosdll +@COND_PLATFORM_MACOSX_1@__gizmosdll___macinstnamecmd = -install_name $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) +@COND_OFFICIAL_BUILD_1@VENDORTAG = +@COND_OFFICIAL_BUILD_0@VENDORTAG = _$(VENDOR) @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ -@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = -D__WXUNIVERSAL__ +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex +@COND_BUILD_DEBUG@__DEBUGFLAG_0 = +@COND_BUILD_RELEASE@__DEBUGFLAG_0 = +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG) +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = -I$(srcdir)/src/regex +@COND_BUILD_DEBUG@__DEBUGFLAG_5 = +@COND_BUILD_RELEASE@__DEBUGFLAG_5 = +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG) +@COND_BUILD_DEBUG@__DEBUGFLAG_6 = +@COND_BUILD_RELEASE@__DEBUGFLAG_6 = @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex -@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) ### Targets: ### all: $(__gizmosdll___depname) $(__gizmoslib___depname) install-strip: install - $(STRIP) $(libdir)/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf3) + $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) -$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5.a: gizmoslib-dynamicsash.o gizmoslib-editlbox.o gizmoslib-ledctrl.o gizmoslib-multicell.o gizmoslib-splittree.o gizmoslib-statpict.o - rm -f $@ - $(AR) rcu $@ gizmoslib-dynamicsash.o gizmoslib-editlbox.o gizmoslib-ledctrl.o gizmoslib-multicell.o gizmoslib-splittree.o gizmoslib-statpict.o - $(RANLIB) $@ +@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5.a: gizmoslib-dynamicsash.o gizmoslib-editlbox.o gizmoslib-ledctrl.o gizmoslib-multicell.o gizmoslib-splittree.o gizmoslib-statpict.o +@COND_SHARED_0@ rm -f $@ +@COND_SHARED_0@ $(AR) rcu $@ gizmoslib-dynamicsash.o gizmoslib-editlbox.o gizmoslib-ledctrl.o gizmoslib-multicell.o gizmoslib-splittree.o gizmoslib-statpict.o +@COND_SHARED_0@ $(RANLIB) $@ gizmoslib-editlbox.o: $(srcdir)/editlbox.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< -distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh +gizmosdll-multicell.o: $(srcdir)/multicell.cpp + $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< -install_gizmosdll: - $(INSTALL_DIR) $(libdir) - $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) $(libdir) - $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf3) $(libdir) - (cd $(libdir) ; $(__gizmosdll___so_symlinks_inst_cmd)) +gizmosdll-statpict.o: $(srcdir)/statpict.cpp + $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< -gizmoslib-ledctrl.o: $(srcdir)/ledctrl.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include $(CXXFLAGS) $< +gizmosdll-dynamicsash.o: $(srcdir)/dynamicsash.cpp + $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< -editlbox.o: $(srcdir)/editlbox.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) $< +@COND_SHARED_1@install_gizmosdll: +@COND_SHARED_1@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) $(libdir) +@COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) $(libdir) +@COND_SHARED_1@ (cd $(libdir) ; $(__gizmosdll___so_symlinks_inst_cmd)) -$(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf3): dynamicsash.o editlbox.o ledctrl.o multicell.o splittree.o statpict.o - $(SHARED_LD_CXX) $@ dynamicsash.o editlbox.o ledctrl.o multicell.o splittree.o statpict.o $(__gizmosdll___importlib) -L$(top_builddir)lib $(__gizmosdll___importlib) $(__gizmosdll___macinstnamecmd) $(__gizmosdll___soname_flags) $(__gizmosdll___macver) $(__WXLIB_MONO_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__WXLIB_CORE_p) - $(__gizmosdll___so_symlinks_cmd) +gizmoslib-ledctrl.o: $(srcdir)/ledctrl.cpp + $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< -gizmoslib-splittree.o: $(srcdir)/splittree.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include $(CXXFLAGS) $< +gizmosdll-editlbox.o: $(srcdir)/editlbox.cpp + $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< + +@COND_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3): gizmosdll-dynamicsash.o gizmosdll-editlbox.o gizmosdll-ledctrl.o gizmosdll-multicell.o gizmosdll-splittree.o gizmosdll-statpict.o +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ gizmosdll-dynamicsash.o gizmosdll-editlbox.o gizmosdll-ledctrl.o gizmosdll-multicell.o gizmosdll-splittree.o gizmosdll-statpict.o $(LDFLAGS) $(__gizmosdll___importlib) -L$(top_builddir)lib $(__gizmosdll___macinstnamecmd) $(__DEBUGFLAG_1) $(__gizmosdll___importlib) $(__gizmosdll___soname_flags) $(__gizmosdll___macver) $(__WXLIB_MONO_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__WXLIB_CORE_p) +@COND_SHARED_1@ $(__gizmosdll___so_symlinks_cmd) install: all $(__install_gizmosdll___depname) $(__install_gizmoslib___depname) $(INSTALL_DIR) $(includedir) @@ -172,39 +238,39 @@ install: all $(__install_gizmosdll___depname) $(__install_gizmoslib___depname) $(INSTALL_DATA) $(srcdir)/../../include//$$f $(includedir)/$$f; \ done -ledctrl.o: $(srcdir)/ledctrl.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) $< +gizmosdll-ledctrl.o: $(srcdir)/ledctrl.cpp + $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< -gizmoslib-multicell.o: $(srcdir)/multicell.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include $(CXXFLAGS) $< +gizmoslib-splittree.o: $(srcdir)/splittree.cpp + $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< -dynamicsash.o: $(srcdir)/dynamicsash.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) $< +gizmoslib-multicell.o: $(srcdir)/multicell.cpp + $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< -multicell.o: $(srcdir)/multicell.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) $< +gizmosdll-splittree.o: $(srcdir)/splittree.cpp + $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< clean: - rm -f ./*.o ./.deps/* - rm -f $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf3) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)-2.5$(__gizmosdll___targetsuf2) + rm -rf ./.deps + rm -f -f ./*.o + rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf2) rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5.a -statpict.o: $(srcdir)/statpict.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) $< - gizmoslib-statpict.o: $(srcdir)/statpict.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< gizmoslib-dynamicsash.o: $(srcdir)/dynamicsash.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< -splittree.o: $(srcdir)/splittree.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL $(CXXFLAGS) $(PIC_FLAG) $< +distclean: clean + rm -f configure config.cache config.log config.status + rm -f bk-deps shared-ld-sh -install_gizmoslib: - $(INSTALL_DIR) $(libdir) - $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5.a $(libdir) +@COND_SHARED_0@install_gizmoslib: +@COND_SHARED_0@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5.a $(libdir) uninstall: diff --git a/contrib/src/xrc/Makefile.in b/contrib/src/xrc/Makefile.in index 19d1a54952..13c5eb4fb5 100644 --- a/contrib/src/xrc/Makefile.in +++ b/contrib/src/xrc/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,223 +72,268 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +XRCDLL_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) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) +XRCDLL_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) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $(PIC_FLAG) +XRCLIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(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) $(__DEBUGFLAG_5) $(__OPTIMIZEFLAG_7) -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) +XRCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(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) $(__DEBUGFLAG_5) $(__OPTIMIZEFLAG_7) -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) + ### 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_LIBPNG_BUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@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 +@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib +@COND_BUILD_DEBUG@OPTIMIZEFLAG = off +@COND_BUILD_RELEASE@OPTIMIZEFLAG = speed +@COND_SHARED_1@__install_xrcdll___depname = install_xrcdll @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC) @COND_DEPS_TRACKING_0@CCC = $(CC) -@COND_USE_SOVERSION_1_PLATFORM_MACOSX_0@__xrcdll___targetsuf2 = .$(SO_SUFFIX).0 -@COND_USE_SOVERSION_1_PLATFORM_MACOSX_1@__xrcdll___targetsuf2 = .0.$(SO_SUFFIX) -@COND_USE_SOVERSION_1_PLATFORM_MACOSX_0@__xrcdll___targetsuf3 = .$(SO_SUFFIX).0.0.0 -@COND_USE_SOVERSION_1_PLATFORM_MACOSX_1@__xrcdll___targetsuf3 = .0.0.0.$(SO_SUFFIX) +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__xrcdll___targetsuf2 = .$(SO_SUFFIX).0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf2 = .0.$(SO_SUFFIX) +@COND_USE_SOVERSION_0@__xrcdll___targetsuf2 = .$(SO_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc$(WXDEBUGFLAG) @COND_PLATFORM_WIN32_1@DLLIMPEXT = .a @COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) @COND_SHARED_0@__xrclib___depname = $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_cmd = rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) -@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_cmd = rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) +@COND_BUILD_DEBUG@__OPTIMIZEFLAG_2 = +@COND_BUILD_RELEASE@__OPTIMIZEFLAG_2 = +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__xrcdll___targetsuf3 = .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf3 = .0.0.0.$(SO_SUFFIX) +@COND_USE_SOVERSION_0@__xrcdll___targetsuf3 = .$(SO_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_HTML_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(srcdir)/src/png @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_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd = rm -f libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2) libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) -@COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2) -@COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3) -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = -I$(srcdir)/src/regex +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = -I$(srcdir)/src/tiff +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = -I$(srcdir)/src/png +@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_BUILD_DEBUG@__DEBUGFLAG_5 = +@COND_BUILD_RELEASE@__DEBUGFLAG_5 = +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = -I$(srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) +@COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = -I$(srcdir)/src/jpeg +@COND_BUILD_DEBUG@__OPTIMIZEFLAG_7 = +@COND_BUILD_RELEASE@__OPTIMIZEFLAG_7 = +@COND_PLATFORM_MACOSX_1@__xrcdll___macver = -compatibility_version 2.5 -current_version 2.5.0 +@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_MACOSX_1@__xrcdll___macver = -compatibility_version 2.5 -current_version 2.5.0 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) +@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)25 +@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) +@COND_WXUSE_LIBPNG_BUILTIN@INC_PNG = $(srcdir)/src/png +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(srcdir)/src/odbc +@COND_PLATFORM_WIN32_1@__xrcdll___importlib = -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__xrcdll___importlib = -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) @COND_WXUNIV_1@WXUNIVNAME = univ -@COND_PLATFORM_MACOSX_1@__xrcdll___macinstnamecmd = -install_name $(libdir)/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib -@COND_SHARED_1@__install_xrcdll___depname = install_xrcdll +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib$(WXDEBUGFLAG) +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(srcdir)/src/regex @COND_SHARED_0@__install_xrclib___depname = install_xrclib -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng -@COND_PLATFORM_WIN32_1@__xrcdll___importlib = -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) -@COND_PLATFORM_WIN32_1@__xrcdll___importlib = -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) -@COND_MONOLITHIC_0@__WXLIB_HTML_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 +@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wx25 +@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx +@COND_BUILD_DEBUG@__DEBUGFLAG_1 = +@COND_BUILD_RELEASE@__DEBUGFLAG_1 = +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@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_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = -I$(srcdir)/src/odbc +@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd = rm -f libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5 -@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = -D__WXUNIVERSAL__ -@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ -@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = -D__WXUNIVERSAL__ +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex +@COND_BUILD_DEBUG@__DEBUGFLAG_0 = +@COND_BUILD_RELEASE@__DEBUGFLAG_0 = +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG) +@COND_PLATFORM_MACOSX_1@__xrcdll___macinstnamecmd = -install_name $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = --include-dir $(srcdir)/src/odbc +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG) +@COND_BUILD_DEBUG@__DEBUGFLAG_6 = +@COND_BUILD_RELEASE@__DEBUGFLAG_6 = @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) -@COND_SHARED_1@__xrcdll___depname = $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3) -@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_BUILD_DEBUG@DEBUGFLAG = on +@COND_BUILD_RELEASE@DEBUGFLAG = off +@COND_SHARED_1@__xrcdll___depname = $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex$(WXDEBUGFLAG) +@COND_OFFICIAL_BUILD_1@VENDORTAG = +@COND_OFFICIAL_BUILD_0@VENDORTAG = _$(VENDOR) ### Targets: ### all: $(__xrcdll___depname) $(__xrclib___depname) install-strip: install - $(STRIP) $(libdir)/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3) + $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) -xh_notbk.o: $(srcdir)/xh_notbk.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_toolb.o: $(srcdir)/xh_toolb.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xh_listb.o: $(srcdir)/xh_listb.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_tree.o: $(srcdir)/xh_tree.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrclib-xh_listc.o: $(srcdir)/xh_listc.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< +xrcdll-xh_combo.o: $(srcdir)/xh_combo.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xh_stlin.o: $(srcdir)/xh_stlin.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xmlparse.o: $(srcdir)/expat/xmlparse/xmlparse.c + $(CCC) -c -o $@ $(XRCDLL_CFLAGS) $< -xh_toolb.o: $(srcdir)/xh_toolb.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_radbt.o: $(srcdir)/xh_radbt.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xmlparse.o: $(srcdir)/expat/xmlparse/xmlparse.c - $(CCC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $(PIC_FLAG) $< +xrcdll-xh_stbmp.o: $(srcdir)/xh_stbmp.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrclib-xh_html.o: $(srcdir)/xh_html.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xh_sttxt.o: $(srcdir)/xh_sttxt.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xh_gdctl.o: $(srcdir)/xh_gdctl.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a: xrclib-xmlparse.o xrclib-xmltok.o xrclib-xmlrole.o xrclib-xml.o xrclib-xmlres.o xrclib-xh_bmp.o xrclib-xh_bmpbt.o xrclib-xh_bttn.o xrclib-xh_cald.o xrclib-xh_chckb.o xrclib-xh_chckl.o xrclib-xh_choic.o xrclib-xh_combo.o xrclib-xh_dlg.o xrclib-xh_frame.o xrclib-xh_gauge.o xrclib-xh_gdctl.o xrclib-xh_html.o xrclib-xh_listb.o xrclib-xh_listc.o xrclib-xh_menu.o xrclib-xh_notbk.o xrclib-xh_panel.o xrclib-xh_radbt.o xrclib-xh_radbx.o xrclib-xh_scrol.o xrclib-xh_scwin.o xrclib-xh_sizer.o xrclib-xh_slidr.o xrclib-xh_spin.o xrclib-xh_split.o xrclib-xh_stbmp.o xrclib-xh_stbox.o xrclib-xh_stlin.o xrclib-xh_sttxt.o xrclib-xh_text.o xrclib-xh_toolb.o xrclib-xh_tree.o xrclib-xh_unkwn.o xrclib-xh_wizrd.o xrclib-xmlrsall.o - rm -f $@ - $(AR) rcu $@ xrclib-xmlparse.o xrclib-xmltok.o xrclib-xmlrole.o xrclib-xml.o xrclib-xmlres.o xrclib-xh_bmp.o xrclib-xh_bmpbt.o xrclib-xh_bttn.o xrclib-xh_cald.o xrclib-xh_chckb.o xrclib-xh_chckl.o xrclib-xh_choic.o xrclib-xh_combo.o xrclib-xh_dlg.o xrclib-xh_frame.o xrclib-xh_gauge.o xrclib-xh_gdctl.o xrclib-xh_html.o xrclib-xh_listb.o xrclib-xh_listc.o xrclib-xh_menu.o xrclib-xh_notbk.o xrclib-xh_panel.o xrclib-xh_radbt.o xrclib-xh_radbx.o xrclib-xh_scrol.o xrclib-xh_scwin.o xrclib-xh_sizer.o xrclib-xh_slidr.o xrclib-xh_spin.o xrclib-xh_split.o xrclib-xh_stbmp.o xrclib-xh_stbox.o xrclib-xh_stlin.o xrclib-xh_sttxt.o xrclib-xh_text.o xrclib-xh_toolb.o xrclib-xh_tree.o xrclib-xh_unkwn.o xrclib-xh_wizrd.o xrclib-xmlrsall.o - $(RANLIB) $@ +@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a: xrclib-xmlparse.o xrclib-xmltok.o xrclib-xmlrole.o xrclib-xml.o xrclib-xmlres.o xrclib-xh_bmp.o xrclib-xh_bmpbt.o xrclib-xh_bttn.o xrclib-xh_cald.o xrclib-xh_chckb.o xrclib-xh_chckl.o xrclib-xh_choic.o xrclib-xh_combo.o xrclib-xh_dlg.o xrclib-xh_frame.o xrclib-xh_gauge.o xrclib-xh_gdctl.o xrclib-xh_html.o xrclib-xh_listb.o xrclib-xh_listc.o xrclib-xh_menu.o xrclib-xh_notbk.o xrclib-xh_panel.o xrclib-xh_radbt.o xrclib-xh_radbx.o xrclib-xh_scrol.o xrclib-xh_scwin.o xrclib-xh_sizer.o xrclib-xh_slidr.o xrclib-xh_spin.o xrclib-xh_split.o xrclib-xh_stbmp.o xrclib-xh_stbox.o xrclib-xh_stlin.o xrclib-xh_sttxt.o xrclib-xh_text.o xrclib-xh_toolb.o xrclib-xh_tree.o xrclib-xh_unkwn.o xrclib-xh_wizrd.o xrclib-xmlrsall.o +@COND_SHARED_0@ rm -f $@ +@COND_SHARED_0@ $(AR) rcu $@ xrclib-xmlparse.o xrclib-xmltok.o xrclib-xmlrole.o xrclib-xml.o xrclib-xmlres.o xrclib-xh_bmp.o xrclib-xh_bmpbt.o xrclib-xh_bttn.o xrclib-xh_cald.o xrclib-xh_chckb.o xrclib-xh_chckl.o xrclib-xh_choic.o xrclib-xh_combo.o xrclib-xh_dlg.o xrclib-xh_frame.o xrclib-xh_gauge.o xrclib-xh_gdctl.o xrclib-xh_html.o xrclib-xh_listb.o xrclib-xh_listc.o xrclib-xh_menu.o xrclib-xh_notbk.o xrclib-xh_panel.o xrclib-xh_radbt.o xrclib-xh_radbx.o xrclib-xh_scrol.o xrclib-xh_scwin.o xrclib-xh_sizer.o xrclib-xh_slidr.o xrclib-xh_spin.o xrclib-xh_split.o xrclib-xh_stbmp.o xrclib-xh_stbox.o xrclib-xh_stlin.o xrclib-xh_sttxt.o xrclib-xh_text.o xrclib-xh_toolb.o xrclib-xh_tree.o xrclib-xh_unkwn.o xrclib-xh_wizrd.o xrclib-xmlrsall.o +@COND_SHARED_0@ $(RANLIB) $@ -xh_sttxt.o: $(srcdir)/xh_sttxt.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrclib-xh_radbx.o: $(srcdir)/xh_radbx.cpp + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib-xh_menu.o: $(srcdir)/xh_menu.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< +xrcdll-xh_spin.o: $(srcdir)/xh_spin.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrclib-xh_text.o: $(srcdir)/xh_text.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< +xrcdll-xh_slidr.o: $(srcdir)/xh_slidr.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xh_html.o: $(srcdir)/xh_html.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrclib-xh_text.o: $(srcdir)/xh_text.cpp + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xh_unkwn.o: $(srcdir)/xh_unkwn.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_gdctl.o: $(srcdir)/xh_gdctl.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_radbx.o: $(srcdir)/xh_radbx.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrclib-xh_cald.o: $(srcdir)/xh_cald.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< - -xrclib-xh_listb.o: $(srcdir)/xh_listb.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_split.o: $(srcdir)/xh_split.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrclib-xh_notbk.o: $(srcdir)/xh_notbk.cpp + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xh_spin.o: $(srcdir)/xh_spin.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrclib-xmlparse.o: $(srcdir)/expat/xmlparse/xmlparse.c - $(CCC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $< + $(CCC) -c -o $@ $(XRCLIB_CFLAGS) $< xrclib-xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xh_split.o: $(srcdir)/xh_split.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< - -xh_bttn.o: $(srcdir)/xh_bttn.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_listc.o: $(srcdir)/xh_listc.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_bmp.o: $(srcdir)/xh_bmp.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xmlrole.o: $(srcdir)/expat/xmltok/xmlrole.c - $(CCC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $(PIC_FLAG) $< +xrcdll-xh_notbk.o: $(srcdir)/xh_notbk.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xh_scwin.o: $(srcdir)/xh_scwin.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_gdctl.o: $(srcdir)/xh_gdctl.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xh_spin.o: $(srcdir)/xh_spin.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< - -xh_stbox.o: $(srcdir)/xh_stbox.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrclib-xh_toolb.o: $(srcdir)/xh_toolb.cpp + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xh_frame.o: $(srcdir)/xh_frame.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xh_chckb.o: $(srcdir)/xh_chckb.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_choic.o: $(srcdir)/xh_choic.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_stlin.o: $(srcdir)/xh_stlin.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xmlres.o: $(srcdir)/xmlres.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< - -xh_dlg.o: $(srcdir)/xh_dlg.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< - -xmltok.o: $(srcdir)/expat/xmltok/xmltok.c - $(CCC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $(PIC_FLAG) $< +xrcdll-xh_wizrd.o: $(srcdir)/xh_wizrd.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrclib-xh_stbmp.o: $(srcdir)/xh_stbmp.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xh_wizrd.o: $(srcdir)/xh_wizrd.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< - -xh_radbx.o: $(srcdir)/xh_radbx.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xh_panel.o: $(srcdir)/xh_panel.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< - -xh_wizrd.o: $(srcdir)/xh_wizrd.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xmltok.o: $(srcdir)/expat/xmltok/xmltok.c - $(CCC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $< + $(CCC) -c -o $@ $(XRCLIB_CFLAGS) $< -xh_combo.o: $(srcdir)/xh_combo.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_scrol.o: $(srcdir)/xh_scrol.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -$(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3): xmlparse.o xmltok.o xmlrole.o xml.o xmlres.o xh_bmp.o xh_bmpbt.o xh_bttn.o xh_cald.o xh_chckb.o xh_chckl.o xh_choic.o xh_combo.o xh_dlg.o xh_frame.o xh_gauge.o xh_gdctl.o xh_html.o xh_listb.o xh_listc.o xh_menu.o xh_notbk.o xh_panel.o xh_radbt.o xh_radbx.o xh_scrol.o xh_scwin.o xh_sizer.o xh_slidr.o xh_spin.o xh_split.o xh_stbmp.o xh_stbox.o xh_stlin.o xh_sttxt.o xh_text.o xh_toolb.o xh_tree.o xh_unkwn.o xh_wizrd.o xmlrsall.o - $(SHARED_LD_CXX) $@ xmlparse.o xmltok.o xmlrole.o xml.o xmlres.o xh_bmp.o xh_bmpbt.o xh_bttn.o xh_cald.o xh_chckb.o xh_chckl.o xh_choic.o xh_combo.o xh_dlg.o xh_frame.o xh_gauge.o xh_gdctl.o xh_html.o xh_listb.o xh_listc.o xh_menu.o xh_notbk.o xh_panel.o xh_radbt.o xh_radbx.o xh_scrol.o xh_scwin.o xh_sizer.o xh_slidr.o xh_spin.o xh_split.o xh_stbmp.o xh_stbox.o xh_stlin.o xh_sttxt.o xh_text.o xh_toolb.o xh_tree.o xh_unkwn.o xh_wizrd.o xmlrsall.o $(__xrcdll___importlib) -L$(top_builddir)lib $(__xrcdll___importlib) $(__xrcdll___macinstnamecmd) $(__xrcdll___soname_flags) $(__xrcdll___macver) $(__WXLIB_MONO_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__WXLIB_CORE_p) $(__WXLIB_HTML_p) - $(__xrcdll___so_symlinks_cmd) +@COND_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): xrcdll-xmlparse.o xrcdll-xmltok.o xrcdll-xmlrole.o xrcdll-xml.o xrcdll-xmlres.o xrcdll-xh_bmp.o xrcdll-xh_bmpbt.o xrcdll-xh_bttn.o xrcdll-xh_cald.o xrcdll-xh_chckb.o xrcdll-xh_chckl.o xrcdll-xh_choic.o xrcdll-xh_combo.o xrcdll-xh_dlg.o xrcdll-xh_frame.o xrcdll-xh_gauge.o xrcdll-xh_gdctl.o xrcdll-xh_html.o xrcdll-xh_listb.o xrcdll-xh_listc.o xrcdll-xh_menu.o xrcdll-xh_notbk.o xrcdll-xh_panel.o xrcdll-xh_radbt.o xrcdll-xh_radbx.o xrcdll-xh_scrol.o xrcdll-xh_scwin.o xrcdll-xh_sizer.o xrcdll-xh_slidr.o xrcdll-xh_spin.o xrcdll-xh_split.o xrcdll-xh_stbmp.o xrcdll-xh_stbox.o xrcdll-xh_stlin.o xrcdll-xh_sttxt.o xrcdll-xh_text.o xrcdll-xh_toolb.o xrcdll-xh_tree.o xrcdll-xh_unkwn.o xrcdll-xh_wizrd.o xrcdll-xmlrsall.o +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ xrcdll-xmlparse.o xrcdll-xmltok.o xrcdll-xmlrole.o xrcdll-xml.o xrcdll-xmlres.o xrcdll-xh_bmp.o xrcdll-xh_bmpbt.o xrcdll-xh_bttn.o xrcdll-xh_cald.o xrcdll-xh_chckb.o xrcdll-xh_chckl.o xrcdll-xh_choic.o xrcdll-xh_combo.o xrcdll-xh_dlg.o xrcdll-xh_frame.o xrcdll-xh_gauge.o xrcdll-xh_gdctl.o xrcdll-xh_html.o xrcdll-xh_listb.o xrcdll-xh_listc.o xrcdll-xh_menu.o xrcdll-xh_notbk.o xrcdll-xh_panel.o xrcdll-xh_radbt.o xrcdll-xh_radbx.o xrcdll-xh_scrol.o xrcdll-xh_scwin.o xrcdll-xh_sizer.o xrcdll-xh_slidr.o xrcdll-xh_spin.o xrcdll-xh_split.o xrcdll-xh_stbmp.o xrcdll-xh_stbox.o xrcdll-xh_stlin.o xrcdll-xh_sttxt.o xrcdll-xh_text.o xrcdll-xh_toolb.o xrcdll-xh_tree.o xrcdll-xh_unkwn.o xrcdll-xh_wizrd.o xrcdll-xmlrsall.o $(LDFLAGS) $(__xrcdll___importlib) -L$(top_builddir)lib $(__xrcdll___macinstnamecmd) $(__DEBUGFLAG_1) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(__xrcdll___macver) $(__WXLIB_MONO_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__WXLIB_CORE_p) $(__WXLIB_HTML_p) +@COND_SHARED_1@ $(__xrcdll___so_symlinks_cmd) xrclib-xh_slidr.o: $(srcdir)/xh_slidr.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +xrcdll-xh_listc.o: $(srcdir)/xh_listc.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrclib-xh_chckl.o: $(srcdir)/xh_chckl.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_text.o: $(srcdir)/xh_text.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xmlres.o: $(srcdir)/xmlres.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrclib-xh_combo.o: $(srcdir)/xh_combo.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_sizer.o: $(srcdir)/xh_sizer.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_stbox.o: $(srcdir)/xh_stbox.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xh_unkwn.o: $(srcdir)/xh_unkwn.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_frame.o: $(srcdir)/xh_frame.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +xrcdll-xh_dlg.o: $(srcdir)/xh_dlg.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< install: all $(__install_xrcdll___depname) $(__install_xrclib___depname) $(INSTALL_DIR) $(includedir) @@ -299,123 +348,140 @@ distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -xh_tree.o: $(srcdir)/xh_tree.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrclib-xh_gauge.o: $(srcdir)/xh_gauge.cpp + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +xrcdll-xh_scwin.o: $(srcdir)/xh_scwin.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xh_stbmp.o: $(srcdir)/xh_stbmp.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_chckb.o: $(srcdir)/xh_chckb.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrclib-xh_bttn.o: $(srcdir)/xh_bttn.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +xrcdll-xh_bttn.o: $(srcdir)/xh_bttn.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +xrcdll-xh_choic.o: $(srcdir)/xh_choic.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +xrcdll-xh_menu.o: $(srcdir)/xh_menu.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrclib-xh_tree.o: $(srcdir)/xh_tree.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -install_xrcdll: - $(INSTALL_DIR) $(libdir) - $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(libdir) - $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3) $(libdir) - (cd $(libdir) ; $(__xrcdll___so_symlinks_inst_cmd)) +@COND_SHARED_1@install_xrcdll: +@COND_SHARED_1@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(libdir) +@COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(libdir) +@COND_SHARED_1@ (cd $(libdir) ; $(__xrcdll___so_symlinks_inst_cmd)) -xrclib-xmlrole.o: $(srcdir)/expat/xmltok/xmlrole.c - $(CCC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $< +xrcdll-xml.o: $(srcdir)/xml.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xh_slidr.o: $(srcdir)/xh_slidr.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrclib-xmlrole.o: $(srcdir)/expat/xmltok/xmlrole.c + $(CCC) -c -o $@ $(XRCLIB_CFLAGS) $< -xh_scrol.o: $(srcdir)/xh_scrol.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_cald.o: $(srcdir)/xh_cald.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xh_cald.o: $(srcdir)/xh_cald.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_text.o: $(srcdir)/xh_text.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrclib-xh_scwin.o: $(srcdir)/xh_scwin.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< - -xh_gauge.o: $(srcdir)/xh_gauge.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xh_scrol.o: $(srcdir)/xh_scrol.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_bmp.o: $(srcdir)/xh_bmp.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< - -xrclib-xh_radbx.o: $(srcdir)/xh_radbx.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< +xrclib-xh_listc.o: $(srcdir)/xh_listc.cpp + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -install_xrclib: - $(INSTALL_DIR) $(libdir) - $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a $(libdir) +xrcdll-xh_sizer.o: $(srcdir)/xh_sizer.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xh_menu.o: $(srcdir)/xh_menu.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +@COND_SHARED_0@install_xrclib: +@COND_SHARED_0@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a $(libdir) -xml.o: $(srcdir)/xml.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_html.o: $(srcdir)/xh_html.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrclib-xh_toolb.o: $(srcdir)/xh_toolb.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< +xrcdll-xmltok.o: $(srcdir)/expat/xmltok/xmltok.c + $(CCC) -c -o $@ $(XRCDLL_CFLAGS) $< -xh_frame.o: $(srcdir)/xh_frame.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +clean: + rm -rf ./.deps + rm -f -f ./*.o + rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a xrclib-xh_choic.o: $(srcdir)/xh_choic.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xml.o: $(srcdir)/xml.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +xrcdll-xh_gauge.o: $(srcdir)/xh_gauge.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrclib-xh_bmp.o: $(srcdir)/xh_bmp.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_radbt.o: $(srcdir)/xh_radbt.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_split.o: $(srcdir)/xh_split.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrclib-xh_stbox.o: $(srcdir)/xh_stbox.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xmlrsall.o: $(srcdir)/xmlrsall.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xmlrsall.o: $(srcdir)/xmlrsall.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +xrclib-xh_stlin.o: $(srcdir)/xh_stlin.cpp + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xh_sizer.o: $(srcdir)/xh_sizer.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_panel.o: $(srcdir)/xh_panel.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_sttxt.o: $(srcdir)/xh_sttxt.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrclib-xh_radbt.o: $(srcdir)/xh_radbt.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< +xrcdll-xh_panel.o: $(srcdir)/xh_panel.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrclib-xh_gauge.o: $(srcdir)/xh_gauge.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< +xrclib-xh_radbt.o: $(srcdir)/xh_radbt.cpp + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xmlrsall.o: $(srcdir)/xmlrsall.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib-xh_notbk.o: $(srcdir)/xh_notbk.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< +xrcdll-xh_chckl.o: $(srcdir)/xh_chckl.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrclib-xh_dlg.o: $(srcdir)/xh_dlg.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< +xrcdll-xh_unkwn.o: $(srcdir)/xh_unkwn.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -clean: - rm -f ./*.o ./.deps/* - rm -f $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a +xrcdll-xh_listb.o: $(srcdir)/xh_listb.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrclib-xh_stlin.o: $(srcdir)/xh_stlin.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< +xrclib-xh_listb.o: $(srcdir)/xh_listb.cpp + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +xrclib-xh_dlg.o: $(srcdir)/xh_dlg.cpp + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_chckb.o: $(srcdir)/xh_chckb.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrclib-xh_menu.o: $(srcdir)/xh_menu.cpp + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_chckl.o: $(srcdir)/xh_chckl.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xmlrole.o: $(srcdir)/expat/xmltok/xmlrole.c + $(CCC) -c -o $@ $(XRCDLL_CFLAGS) $< xrclib-xmlres.o: $(srcdir)/xmlres.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< uninstall: diff --git a/samples/Makefile.in b/samples/Makefile.in index 331de0e916..5d9378fd3b 100644 --- a/samples/Makefile.in +++ b/samples/Makefile.in @@ -29,13 +29,14 @@ CC = @CC@ datadir = @datadir@ PLATFORM_MSDOS = @PLATFORM_MSDOS@ SETFILE = @SETFILE@ -UNICODE = @UNICODE@ +LDFLAGS = @LDFLAGS@ STRIP = @STRIP@ USE_SOVERSOLARIS = @USE_SOVERSOLARIS@ srcdir = @srcdir@ bindir = @bindir@ PIC_FLAG = @PIC_FLAG@ USE_SOSYMLINKS = @USE_SOSYMLINKS@ +LDFLAGS_GUI = @LDFLAGS_GUI@ INSTALL_DATA = @INSTALL_DATA@ USE_GUI = @USE_GUI@ PLATFORM_UNIX = @PLATFORM_UNIX@ @@ -47,12 +48,15 @@ BUILD = @BUILD@ PLATFORM_WIN32 = @PLATFORM_WIN32@ USE_MACVERSION = @USE_MACVERSION@ PLATFORM_MACOSX = @PLATFORM_MACOSX@ -TOOLKIT_VERSION = @TOOLKIT_VERSION@ +DEPS_TRACKING = @DEPS_TRACKING@ +OFFICIAL_BUILD = @OFFICIAL_BUILD@ +UNICODE = @UNICODE@ WXUNIV = @WXUNIV@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ -DEPS_TYPE = @DEPS_TYPE@ -SHARED_LD_CXX = @SHARED_LD_CXX@ CXX = @CXX@ +SHARED_LD_CXX = @SHARED_LD_CXX@ +VENDOR = @VENDOR@ +TOOLKIT_VERSION = @TOOLKIT_VERSION@ includedir = @includedir@ LN_S = @LN_S@ CFLAGS = @CFLAGS@ @@ -62,12 +66,18 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + + ### Conditionally set variables: ### @COND_PLATFORM_WIN32_1@DLLIMPEXT = .a @COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) @COND_USE_GUI_0@__console___depname = console -@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) +@COND_DEPS_TRACKING_0@CXXC = $(CXX) +@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC) +@COND_DEPS_TRACKING_0@CCC = $(CC) ### Targets: ### @@ -83,14 +93,6 @@ install-strip: install dialogs: (cd dialogs && $(MAKE) all) -clean: - rm -f ./*.o ./*.d - (cd artprov && $(MAKE) clean) - (cd console && $(MAKE) clean) - (cd dialogs && $(MAKE) clean) - (cd image && $(MAKE) clean) - (cd minimal && $(MAKE) clean) - install: all (cd artprov && $(MAKE) install) (cd console && $(MAKE) install) @@ -98,14 +100,27 @@ install: all (cd image && $(MAKE) install) (cd minimal && $(MAKE) install) +image: + (cd image && $(MAKE) all) + +@COND_USE_GUI_0@console: +@COND_USE_GUI_0@ (cd console && $(MAKE) all) + +clean: + rm -rf ./.deps + rm -f -f ./*.o + (cd artprov && $(MAKE) clean) + (cd console && $(MAKE) clean) + (cd dialogs && $(MAKE) clean) + (cd image && $(MAKE) clean) + (cd minimal && $(MAKE) clean) + artprov: (cd artprov && $(MAKE) all) -console: - (cd console && $(MAKE) all) - -image: - (cd image && $(MAKE) all) +distclean: clean + rm -f configure config.cache config.log config.status + rm -f bk-deps shared-ld-sh minimal: (cd minimal && $(MAKE) all) @@ -114,6 +129,6 @@ uninstall: # Include dependency info, if present: -@IF_GNU_MAKE@-include *.d +@IF_GNU_MAKE@-include .deps/*.d -.PHONY: all dialogs artprov console image minimal +.PHONY: all dialogs image console artprov minimal diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in index 32a5c048a0..2c9a5b8a8a 100644 --- a/samples/access/Makefile.in +++ b/samples/access/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +ACCESSTEST_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) $(CFLAGS) +ACCESSTEST_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: ### -@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_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_PLATFORM_MAC_1@__accesstest___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_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_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib +@COND_PLATFORM_WIN32_1@__accesstest___win32rc = accesstest-accesstest_rc.o +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_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_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) -o accesstest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_PLATFORM_MAC_1@__accesstest___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc +@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$(WXDEBUGFLAG) +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(srcdir)/src/regex +@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@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_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_OFFICIAL_BUILD_1@VENDORTAG = +@COND_OFFICIAL_BUILD_0@VENDORTAG = _$(VENDOR) @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_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_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_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_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) ### Targets: ### @@ -116,26 +162,27 @@ all: accesstest$(EXEEXT) install-strip: install +accesstest-accesstest.o: $(srcdir)/accesstest.cpp + $(CXXC) -c -o $@ $(ACCESSTEST_CXXFLAGS) $< + clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f accesstest$(EXEEXT) install: all -accesstest.o: $(srcdir)/accesstest.cpp - $(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-accesstest.o $(__accesstest___win32rc) + $(CXX) -o $@ accesstest-accesstest.o $(__accesstest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__accesstest___mac_rezcmd) $(__accesstest___mac_setfilecmd) -accesstest_rc.o: $(srcdir)/accesstest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +accesstest-accesstest_rc.o: $(srcdir)/accesstest.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) uninstall: diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in index 59ef6d35e7..236b49883a 100644 --- a/samples/artprov/Makefile.in +++ b/samples/artprov/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,77 +72,120 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +ARTTEST_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) +ARTTEST_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) $(CFLAGS) + ### 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_PLATFORM_MAC_1@__arttest___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_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_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 +@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg @COND_PLATFORM_MAC_1@__arttest___mac_setfilecmd = $(SETFILE) -a C arttest$(EXEEXT) -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_PLATFORM_WIN32_1@__arttest___win32rc = arttest_rc.o -@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_PLATFORM_WIN32_1@__arttest___win32rc = arttest-arttest_rc.o +@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_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) -o arttest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +@COND_PLATFORM_MAC_1@__arttest___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o arttest$(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_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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) ### Targets: ### all: arttest$(EXEEXT) -arttest$(EXEEXT): arttest.o artbrows.o $(__arttest___win32rc) - $(CXX) -o $@ arttest.o artbrows.o $(__arttest___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) +arttest$(EXEEXT): arttest-arttest.o arttest-artbrows.o $(__arttest___win32rc) + $(CXX) -o $@ arttest-arttest.o arttest-artbrows.o $(__arttest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__arttest___mac_rezcmd) $(__arttest___mac_setfilecmd) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f arttest$(EXEEXT) install: all -arttest.o: $(srcdir)/arttest.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +arttest-artbrows.o: $(srcdir)/artbrows.cpp + $(CXXC) -c -o $@ $(ARTTEST_CXXFLAGS) $< distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -artbrows.o: $(srcdir)/artbrows.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +arttest-arttest.o: $(srcdir)/arttest.cpp + $(CXXC) -c -o $@ $(ARTTEST_CXXFLAGS) $< -arttest_rc.o: $(srcdir)/arttest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +arttest-arttest_rc.o: $(srcdir)/arttest.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) uninstall: diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in index 4e233d9311..7ce5898eb2 100644 --- a/samples/calendar/Makefile.in +++ b/samples/calendar/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,74 +72,117 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +CALENDAR_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) +CALENDAR_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) $(CFLAGS) + ### 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_PLATFORM_MAC_1@__calendar___mac_setfilecmd = $(SETFILE) -a C calendar$(EXEEXT) -@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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_MAC_1@__calendar___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_PLATFORM_WIN32_1@__calendar___win32rc = calendar_rc.o -@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_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_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) -o calendar$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) +@COND_PLATFORM_MAC_1@__calendar___mac_setfilecmd = $(SETFILE) -a C calendar$(EXEEXT) +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wx25 +@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx +@COND_PLATFORM_MAC_1@__calendar___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex +@COND_PLATFORM_WIN32_1@__calendar___win32rc = calendar-calendar_rc.o +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o calendar$(EXEEXT) 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_REGEX_BUILTIN@LIB_REGEX = wxregex -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@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: ### all: calendar$(EXEEXT) -calendar_rc.o: $(srcdir)/calendar.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) - install-strip: install +calendar-calendar.o: $(srcdir)/calendar.cpp + $(CXXC) -c -o $@ $(CALENDAR_CXXFLAGS) $< + clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f calendar$(EXEEXT) install: all -distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh +calendar-calendar_rc.o: $(srcdir)/calendar.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) -calendar$(EXEEXT): calendar.o $(__calendar___win32rc) - $(CXX) -o $@ calendar.o $(__calendar___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) +calendar$(EXEEXT): calendar-calendar.o $(__calendar___win32rc) + $(CXX) -o $@ calendar-calendar.o $(__calendar___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__calendar___mac_rezcmd) $(__calendar___mac_setfilecmd) -calendar.o: $(srcdir)/calendar.cpp - $(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 uninstall: diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in index 637dd6e171..a6d2edffa7 100644 --- a/samples/caret/Makefile.in +++ b/samples/caret/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,24 +72,27 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +CARET_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) $(CFLAGS) +CARET_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: ### -@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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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@INC_ZLIB = $(srcdir)/src/zlib @COND_PLATFORM_MAC_1@__caret___mac_setfilecmd = $(SETFILE) -a C caret$(EXEEXT) -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_BUILD_DEBUG@OPTIMIZEFLAG = off +@COND_BUILD_RELEASE@OPTIMIZEFLAG = speed @COND_PLATFORM_MAC_1@__caret___mac_rezcmd = $(__MACOSX_RESOURCES_p) @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC) @COND_DEPS_TRACKING_0@CCC = $(CC) @@ -93,49 +100,89 @@ 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_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_PLATFORM_WIN32_1@__caret___win32rc = caret_rc.o -@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 +@COND_PLATFORM_WIN32_1@__caret___win32rc = caret-caret_rc.o +@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_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) -o caret$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o caret$(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_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) ### Targets: ### all: caret$(EXEEXT) -caret$(EXEEXT): caret.o $(__caret___win32rc) - $(CXX) -o $@ caret.o $(__caret___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) +caret$(EXEEXT): caret-caret.o $(__caret___win32rc) + $(CXX) -o $@ caret-caret.o $(__caret___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__caret___mac_rezcmd) $(__caret___mac_setfilecmd) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f caret$(EXEEXT) install: all +caret-caret.o: $(srcdir)/caret.cpp + $(CXXC) -c -o $@ $(CARET_CXXFLAGS) $< + distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -caret.o: $(srcdir)/caret.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - -caret_rc.o: $(srcdir)/caret.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +caret-caret_rc.o: $(srcdir)/caret.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) uninstall: diff --git a/samples/checklst/Makefile.in b/samples/checklst/Makefile.in index 1518533faa..01610c6580 100644 --- a/samples/checklst/Makefile.in +++ b/samples/checklst/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,75 +72,118 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +CHECKLST_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) $(CFLAGS) +CHECKLST_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: ### -@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_PLATFORM_WIN32_1@WXDLLVERSIONTAG = +@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 @COND_PLATFORM_MAC_1@__checklst___mac_setfilecmd = $(SETFILE) -a C checklst$(EXEEXT) -@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_PLATFORM_WIN32_1@__checklst___win32rc = checklst_rc.o -@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_PLATFORM_MAC_1@__checklst___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_WXUNIV_1@WXUNIVNAME = univ -@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_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_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) -o checklst$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_PLATFORM_WIN32_1@__checklst___win32rc = checklst-checklst_rc.o +@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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_MAC_1@__checklst___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o checklst$(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_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) ### Targets: ### all: checklst$(EXEEXT) +checklst-checklst_rc.o: $(srcdir)/checklst.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + install-strip: install -clean: - rm -f ./*.o ./.deps/* - rm -f checklst$(EXEEXT) +checklst-checklst.o: $(srcdir)/checklst.cpp + $(CXXC) -c -o $@ $(CHECKLST_CXXFLAGS) $< install: all -checklst$(EXEEXT): checklst.o $(__checklst___win32rc) - $(CXX) -o $@ checklst.o $(__checklst___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) +checklst$(EXEEXT): checklst-checklst.o $(__checklst___win32rc) + $(CXX) -o $@ checklst-checklst.o $(__checklst___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__checklst___mac_rezcmd) $(__checklst___mac_setfilecmd) -checklst.o: $(srcdir)/checklst.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +clean: + rm -rf ./.deps + rm -f -f ./*.o + rm -f checklst$(EXEEXT) distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -checklst_rc.o: $(srcdir)/checklst.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) - uninstall: diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in index d671c0d427..7a1536f26a 100644 --- a/samples/config/Makefile.in +++ b/samples/config/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,46 +72,88 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +CONFTEST_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) +CONFTEST_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) $(CFLAGS) + ### 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_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc -@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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@LIB_ZLIB = wxzlib$(WXDEBUGFLAG) +@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_PLATFORM_MAC_1@__conftest___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @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_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_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_LIBPNG_BUILTIN@INC_PNG = $(srcdir)/src/png +@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) -o conftest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(srcdir)/src/zlib +@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_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) +@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_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 +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_MAC_1@__conftest___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(srcdir)/src/regex +@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@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_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex$(WXDEBUGFLAG) +@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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG) +@COND_PLATFORM_WIN32_1@__conftest___win32rc = conftest-conftest_rc.o +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG) @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)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o conftest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_PLATFORM_WIN32_1@__conftest___win32rc = conftest_rc.o -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_BUILD_DEBUG@DEBUGFLAG = on +@COND_BUILD_RELEASE@DEBUGFLAG = off +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(srcdir)/src/png @COND_PLATFORM_MAC_1@__conftest___mac_setfilecmd = $(SETFILE) -a C conftest$(EXEEXT) ### Targets: ### @@ -117,27 +163,28 @@ all: conftest$(EXEEXT) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f conftest$(EXEEXT) 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) +conftest-conftest.o: $(srcdir)/conftest.cpp + $(CXXC) -c -o $@ $(CONFTEST_CXXFLAGS) $< + +conftest$(EXEEXT): conftest-conftest.o $(__conftest___win32rc) + $(CXX) -o $@ conftest-conftest.o $(__conftest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(__conftest___mac_rezcmd) + $(__conftest___mac_setfilecmd) 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) - $(CXX) -o $@ conftest.o $(__conftest___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) - $(__conftest___mac_rezcmd) - $(__conftest___mac_setfilecmd) +conftest-conftest_rc.o: $(srcdir)/conftest.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) -conftest.o: $(srcdir)/conftest.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +uninstall: # Include dependency info, if present: diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in index a8c946d3a5..6602d7b52a 100644 --- 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: diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in index 8bee58b1f1..63c13a4ac1 100644 --- a/samples/controls/Makefile.in +++ b/samples/controls/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +CONTROLS_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) $(CFLAGS) +CONTROLS_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: ### -@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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg @COND_PLATFORM_MAC_1@__controls___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc -@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib -@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@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_PLATFORM_WIN32_1@__controls___win32rc = controls_rc.o -@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@__controls___win32rc = controls-controls_rc.o +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_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_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) -o controls$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@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_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_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG) @COND_PLATFORM_MAC_1@__controls___mac_setfilecmd = $(SETFILE) -a C controls$(EXEEXT) -@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG) @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)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o controls$(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_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) ### Targets: ### @@ -117,27 +163,28 @@ all: controls$(EXEEXT) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f controls$(EXEEXT) install: all -controls.o: $(srcdir)/controls.cpp - $(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 -controls_rc.o: $(srcdir)/controls.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +uninstall: + +controls-controls_rc.o: $(srcdir)/controls.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) -controls$(EXEEXT): controls.o $(__controls___win32rc) - $(CXX) -o $@ controls.o $(__controls___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) +controls$(EXEEXT): controls-controls.o $(__controls___win32rc) + $(CXX) -o $@ controls-controls.o $(__controls___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__controls___mac_rezcmd) $(__controls___mac_setfilecmd) -uninstall: +controls-controls.o: $(srcdir)/controls.cpp + $(CXXC) -c -o $@ $(CONTROLS_CXXFLAGS) $< # Include dependency info, if present: diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in index 08ddeede78..76d55b64ec 100644 --- a/samples/db/Makefile.in +++ b/samples/db/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +DBTEST_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) $(CFLAGS) +DBTEST_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: ### -@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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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@__dbtest___mac_setfilecmd = $(SETFILE) -a C dbtest$(EXEEXT) -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@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 +@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg +@COND_PLATFORM_MAC_1@__dbtest___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg -@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_PLATFORM_MAC_1@__dbtest___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ -@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-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_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) -o dbtest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_MAC_1@__dbtest___mac_setfilecmd = $(SETFILE) -a C dbtest$(EXEEXT) +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib$(WXDEBUGFLAG) +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(srcdir)/src/regex +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o dbtest$(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_PLATFORM_WIN32_1@__dbtest___win32rc = dbtest_rc.o +@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_PLATFORM_WIN32_1@__dbtest___win32rc = dbtest-dbtest_rc.o ### Targets: ### @@ -116,17 +162,18 @@ all: dbtest$(EXEEXT) install-strip: install -listdb.o: $(srcdir)/listdb.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +dbtest-listdb.o: $(srcdir)/listdb.cpp + $(CXXC) -c -o $@ $(DBTEST_CXXFLAGS) $< clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f dbtest$(EXEEXT) install: all -dbtest$(EXEEXT): dbtest.o listdb.o $(__dbtest___win32rc) - $(CXX) -o $@ dbtest.o listdb.o $(__dbtest___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) +dbtest$(EXEEXT): dbtest-dbtest.o dbtest-listdb.o $(__dbtest___win32rc) + $(CXX) -o $@ dbtest-dbtest.o dbtest-listdb.o $(__dbtest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__dbtest___mac_rezcmd) $(__dbtest___mac_setfilecmd) @@ -134,11 +181,11 @@ distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -dbtest.o: $(srcdir)/dbtest.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +dbtest-dbtest.o: $(srcdir)/dbtest.cpp + $(CXXC) -c -o $@ $(DBTEST_CXXFLAGS) $< -dbtest_rc.o: $(srcdir)/dbtest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +dbtest-dbtest_rc.o: $(srcdir)/dbtest.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) uninstall: diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index 9aeca5557f..06caf16121 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +DIALOGS_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) $(CFLAGS) +DIALOGS_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: ### -@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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_MAC_1@__dialogs___mac_setfilecmd = $(SETFILE) -a C dialogs$(EXEEXT) -@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 @COND_PLATFORM_MAC_1@__dialogs___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_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_LIBPNG_BUILTIN@INC_PNG = $(srcdir)/src/png +@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) -o dialogs$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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 +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_MAC_1@__dialogs___mac_setfilecmd = $(SETFILE) -a C dialogs$(EXEEXT) +@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_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_PLATFORM_WIN32_1@__dialogs___win32rc = dialogs-dialogs_rc.o +@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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff -@COND_PLATFORM_WIN32_1@__dialogs___win32rc = dialogs_rc.o +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o dialogs$(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_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) ### Targets: ### @@ -116,21 +162,22 @@ all: dialogs$(EXEEXT) data install-strip: install -dialogs.o: $(srcdir)/dialogs.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - -dialogs$(EXEEXT): dialogs.o $(__dialogs___win32rc) - $(CXX) -o $@ dialogs.o $(__dialogs___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) +dialogs$(EXEEXT): dialogs-dialogs.o $(__dialogs___win32rc) + $(CXX) -o $@ dialogs-dialogs.o $(__dialogs___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__dialogs___mac_rezcmd) $(__dialogs___mac_setfilecmd) clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f dialogs$(EXEEXT) rm -f ./tips.txt install: all +dialogs-dialogs.o: $(srcdir)/dialogs.cpp + $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $< + distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh @@ -143,8 +190,8 @@ data: fi; \ done -dialogs_rc.o: $(srcdir)/dialogs.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +dialogs-dialogs_rc.o: $(srcdir)/dialogs.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) uninstall: diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in index f166966664..feed965d8b 100644 --- a/samples/dialup/Makefile.in +++ b/samples/dialup/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,59 +72,102 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +NETTEST_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) +NETTEST_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) $(CFLAGS) + ### 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_PLATFORM_MAC_1@__nettest___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_MAC_1@__nettest___mac_setfilecmd = $(SETFILE) -a C nettest$(EXEEXT) +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@COND_PLATFORM_MAC_1@__nettest___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_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) -o nettest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_PLATFORM_MAC_1@__nettest___mac_setfilecmd = $(SETFILE) -a C nettest$(EXEEXT) +@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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff -@COND_PLATFORM_WIN32_1@__nettest___win32rc = nettest_rc.o +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_PLATFORM_WIN32_1@__nettest___win32rc = nettest-nettest_rc.o @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)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o nettest$(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_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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) ### Targets: ### all: nettest$(EXEEXT) -nettest_rc.o: $(srcdir)/nettest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) - install-strip: install +nettest-nettest.o: $(srcdir)/nettest.cpp + $(CXXC) -c -o $@ $(NETTEST_CXXFLAGS) $< + clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f nettest$(EXEEXT) install: all @@ -131,13 +178,13 @@ distclean: clean uninstall: -nettest$(EXEEXT): nettest.o $(__nettest___win32rc) - $(CXX) -o $@ nettest.o $(__nettest___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) +nettest$(EXEEXT): nettest-nettest.o $(__nettest___win32rc) + $(CXX) -o $@ nettest-nettest.o $(__nettest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__nettest___mac_rezcmd) $(__nettest___mac_setfilecmd) -nettest.o: $(srcdir)/nettest.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +nettest-nettest_rc.o: $(srcdir)/nettest.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) # Include dependency info, if present: diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in index 2519acf56f..697d77b80b 100644 --- a/samples/display/Makefile.in +++ b/samples/display/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,46 +72,88 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +DISPLAY_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) +DISPLAY_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) $(CFLAGS) + ### 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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib @COND_PLATFORM_MAC_1@__display___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc -@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@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_PLATFORM_MAC_1@__display___mac_setfilecmd = $(SETFILE) -a C display$(EXEEXT) @COND_PLATFORM_WIN32_1@DLLIMPEXT = .a @COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) -@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5 -@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_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_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) -o display$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +@COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5 @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_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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o display$(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_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_OFFICIAL_BUILD_1@VENDORTAG = +@COND_OFFICIAL_BUILD_0@VENDORTAG = _$(VENDOR) ### Targets: ### @@ -115,8 +161,12 @@ all: display$(EXEEXT) install-strip: install +display-display.o: $(srcdir)/display.cpp + $(CXXC) -c -o $@ $(DISPLAY_CXXFLAGS) $< + clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f display$(EXEEXT) install: all @@ -125,11 +175,8 @@ distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -display.o: $(srcdir)/display.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - -display$(EXEEXT): display.o - $(CXX) -o $@ display.o -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) +display$(EXEEXT): display-display.o + $(CXX) -o $@ display-display.o $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__display___mac_rezcmd) $(__display___mac_setfilecmd) diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in index d656b22887..1e797b28c3 100644 --- a/samples/dnd/Makefile.in +++ b/samples/dnd/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +DND_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) $(CFLAGS) +DND_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: ### -@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_PLATFORM_WIN32_1@__dnd___win32rc = dnd_rc.o -@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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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@__dnd___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@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 +@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg +@COND_PLATFORM_MAC_1@__dnd___mac_setfilecmd = $(SETFILE) -a C dnd$(EXEEXT) +@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_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg -@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_PLATFORM_MAC_1@__dnd___mac_setfilecmd = $(SETFILE) -a C dnd$(EXEEXT) -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ -@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-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_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) -o dnd$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) +@COND_PLATFORM_WIN32_1@__dnd___win32rc = dnd-dnd_rc.o +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_MAC_1@__dnd___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib$(WXDEBUGFLAG) +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(srcdir)/src/regex +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o dnd$(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_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) ### Targets: ### @@ -116,25 +162,26 @@ all: dnd$(EXEEXT) data install-strip: install -dnd_rc.o: $(srcdir)/dnd.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +clean: + rm -rf ./.deps + rm -f -f ./*.o + rm -f dnd$(EXEEXT) + rm -f ./julian.png ./dnd.wxr install: all -dnd$(EXEEXT): dnd.o $(__dnd___win32rc) - $(CXX) -o $@ dnd.o $(__dnd___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) +dnd$(EXEEXT): dnd-dnd.o $(__dnd___win32rc) + $(CXX) -o $@ dnd-dnd.o $(__dnd___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__dnd___mac_rezcmd) $(__dnd___mac_setfilecmd) -clean: - rm -f ./*.o ./.deps/* - rm -f dnd$(EXEEXT) - rm -f ./julian.png ./dnd.wxr - distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh +dnd-dnd.o: $(srcdir)/dnd.cpp + $(CXXC) -c -o $@ $(DND_CXXFLAGS) $< + data: @mkdir -p . @for f in julian.png dnd.wxr; do \ @@ -143,8 +190,8 @@ data: fi; \ done -dnd.o: $(srcdir)/dnd.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +dnd-dnd_rc.o: $(srcdir)/dnd.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) uninstall: diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in index b82244f112..4eeec00273 100644 --- a/samples/docview/Makefile.in +++ b/samples/docview/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,75 +72,118 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +DOCVIEW_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) +DOCVIEW_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) $(CFLAGS) + ### 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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_MAC_1@__docview___mac_setfilecmd = $(SETFILE) -a C docview$(EXEEXT) -@COND_PLATFORM_WIN32_1@__docview___win32rc = docview_rc.o +@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@__docview___mac_setfilecmd = $(SETFILE) -a C docview$(EXEEXT) +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_PLATFORM_MAC_1@__docview___mac_rezcmd = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o docview$(EXEEXT) $(MACOSX_RESOURCES) chart.r doc.r docview.r mondrian.r -@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 +@COND_PLATFORM_WIN32_1@__docview___win32rc = docview-docview_rc.o +@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_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_PLATFORM_MAC_1@__docview___mac_rezcmd = $(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) -o docview$(EXEEXT) $(MACOSX_RESOURCES) chart.r doc.r docview.r mondrian.r +@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_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) ### Targets: ### all: docview$(EXEEXT) +docview-doc.o: $(srcdir)/doc.cpp + $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $< + install-strip: install install: all -docview_rc.o: $(srcdir)/docview.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +docview-docview_rc.o: $(srcdir)/docview.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) -docview$(EXEEXT): docview.o doc.o view.o $(__docview___win32rc) - $(CXX) -o $@ docview.o doc.o view.o $(__docview___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) +docview$(EXEEXT): docview-docview.o docview-doc.o docview-view.o $(__docview___win32rc) + $(CXX) -o $@ docview-docview.o docview-doc.o docview-view.o $(__docview___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__docview___mac_rezcmd) $(__docview___mac_setfilecmd) -view.o: $(srcdir)/view.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - -docview.o: $(srcdir)/docview.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f docview$(EXEEXT) -doc.o: $(srcdir)/doc.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +docview-view.o: $(srcdir)/view.cpp + $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $< + +docview-docview.o: $(srcdir)/docview.cpp + $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $< distclean: clean rm -f configure config.cache config.log config.status diff --git a/samples/docvwmdi/Makefile.in b/samples/docvwmdi/Makefile.in index 82726e24f4..7546e0ee5b 100644 --- a/samples/docvwmdi/Makefile.in +++ b/samples/docvwmdi/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,76 +72,119 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +DOCVIEW_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) +DOCVIEW_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) $(CFLAGS) + ### 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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_MAC_1@__docview___mac_setfilecmd = $(SETFILE) -a C docview$(EXEEXT) -@COND_PLATFORM_WIN32_1@__docview___win32rc = docview_rc.o +@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@__docview___mac_setfilecmd = $(SETFILE) -a C docview$(EXEEXT) +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_PLATFORM_MAC_1@__docview___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 +@COND_PLATFORM_WIN32_1@__docview___win32rc = docview-docview_rc.o +@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_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) -o docview$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_PLATFORM_MAC_1@__docview___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o docview$(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_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) ### Targets: ### all: docview$(EXEEXT) +docview-doc.o: $(srcdir)/doc.cpp + $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $< + install-strip: install install: all -docview_rc.o: $(srcdir)/docview.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +docview-docview_rc.o: $(srcdir)/docview.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) -docview$(EXEEXT): docview.o doc.o view.o $(__docview___win32rc) - $(CXX) -o $@ docview.o doc.o view.o $(__docview___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) +docview$(EXEEXT): docview-docview.o docview-doc.o docview-view.o $(__docview___win32rc) + $(CXX) -o $@ docview-docview.o docview-doc.o docview-view.o $(__docview___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__docview___mac_rezcmd) $(__docview___mac_setfilecmd) -view.o: $(srcdir)/view.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - -docview.o: $(srcdir)/docview.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f docview$(EXEEXT) -doc.o: $(srcdir)/doc.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +docview-view.o: $(srcdir)/view.cpp + $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $< + +docview-docview.o: $(srcdir)/docview.cpp + $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $< distclean: clean rm -f configure config.cache config.log config.status diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in index 7139378c1b..15c8cb71ee 100644 --- a/samples/dragimag/Makefile.in +++ b/samples/dragimag/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,76 +72,116 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +DRAGIMAG_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) $(CFLAGS) +DRAGIMAG_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: ### -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) @COND_UNICODE_1@WXUNICODEFLAG = u @COND_PLATFORM_MAC_1@__dragimag___mac_setfilecmd = $(SETFILE) -a C dragimag$(EXEEXT) @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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_WIN32_1@__dragimag___win32rc = dragimag_rc.o +@COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib +@COND_BUILD_DEBUG@OPTIMIZEFLAG = off +@COND_BUILD_RELEASE@OPTIMIZEFLAG = speed +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +@COND_PLATFORM_WIN32_1@__dragimag___win32rc = dragimag-dragimag_rc.o @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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_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_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ +@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_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) -o dragimag$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL @COND_PLATFORM_MAC_1@__dragimag___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o dragimag$(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_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@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) ### Targets: ### all: dragimag$(EXEEXT) data -dragimag$(EXEEXT): dragimag.o $(__dragimag___win32rc) - $(CXX) -o $@ dragimag.o $(__dragimag___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) +dragimag$(EXEEXT): dragimag-dragimag.o $(__dragimag___win32rc) + $(CXX) -o $@ dragimag-dragimag.o $(__dragimag___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__dragimag___mac_rezcmd) $(__dragimag___mac_setfilecmd) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f dragimag$(EXEEXT) rm -f ./backgrnd.png ./shape01.png ./shape02.png ./shape03.png install: all -dragimag.o: $(srcdir)/dragimag.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - -dragimag_rc.o: $(srcdir)/dragimag.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 +dragimag-dragimag.o: $(srcdir)/dragimag.cpp + $(CXXC) -c -o $@ $(DRAGIMAG_CXXFLAGS) $< + data: @mkdir -p . @for f in backgrnd.png shape01.png shape02.png shape03.png; do \ @@ -146,6 +190,9 @@ data: fi; \ done +dragimag-dragimag_rc.o: $(srcdir)/dragimag.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + uninstall: diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in index c7cbc4fc18..4c880f9edb 100644 --- a/samples/drawing/Makefile.in +++ b/samples/drawing/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +DRAWING_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) +DRAWING_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) $(CFLAGS) + ### 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_PLATFORM_MAC_1@__drawing___mac_setfilecmd = $(SETFILE) -a C drawing$(EXEEXT) -@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_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_MAC_1@__drawing___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_PLATFORM_WIN32_1@__drawing___win32rc = drawing_rc.o -@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_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_PLATFORM_MAC_1@__drawing___mac_setfilecmd = $(SETFILE) -a C drawing$(EXEEXT) +@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_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) -o drawing$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wx25 +@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx +@COND_PLATFORM_MAC_1@__drawing___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +@COND_OFFICIAL_BUILD_1@VENDORTAG = +@COND_OFFICIAL_BUILD_0@VENDORTAG = _$(VENDOR) +@COND_PLATFORM_WIN32_1@__drawing___win32rc = drawing-drawing_rc.o @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_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o drawing$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC) -@COND_DEPS_TRACKING_0@CCC = $(CC) -@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) ### Targets: ### @@ -116,22 +162,21 @@ all: drawing$(EXEEXT) data install-strip: install +drawing-drawing.o: $(srcdir)/drawing.cpp + $(CXXC) -c -o $@ $(DRAWING_CXXFLAGS) $< + clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f drawing$(EXEEXT) rm -f ./pat4.bmp ./pat35.bmp ./pat36.bmp ./image.bmp ./mask.bmp install: all -drawing_rc.o: $(srcdir)/drawing.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: - data: @mkdir -p . @for f in pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp; do \ @@ -140,13 +185,15 @@ data: fi; \ done -drawing$(EXEEXT): drawing.o $(__drawing___win32rc) - $(CXX) -o $@ drawing.o $(__drawing___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) +drawing$(EXEEXT): drawing-drawing.o $(__drawing___win32rc) + $(CXX) -o $@ drawing-drawing.o $(__drawing___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__drawing___mac_rezcmd) $(__drawing___mac_setfilecmd) -drawing.o: $(srcdir)/drawing.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +drawing-drawing_rc.o: $(srcdir)/drawing.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + +uninstall: # Include dependency info, if present: diff --git a/samples/dynamic/Makefile.in b/samples/dynamic/Makefile.in index 9098ceb38b..1be74d1cdc 100644 --- a/samples/dynamic/Makefile.in +++ b/samples/dynamic/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +DYNAMIC_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) $(CFLAGS) +DYNAMIC_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: ### -@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_PLATFORM_WIN32_1@WXDLLVERSIONTAG = +@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 @COND_PLATFORM_MAC_1@__dynamic___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_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_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) -o dynamic$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_PLATFORM_MAC_1@__dynamic___mac_setfilecmd = $(SETFILE) -a C dynamic$(EXEEXT) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@__dynamic___win32rc = dynamic-dynamic_rc.o +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o dynamic$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_PLATFORM_MAC_1@__dynamic___mac_setfilecmd = $(SETFILE) -a C dynamic$(EXEEXT) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex -@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex -@COND_PLATFORM_WIN32_1@__dynamic___win32rc = dynamic_rc.o +@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) ### Targets: ### @@ -117,7 +163,8 @@ all: dynamic$(EXEEXT) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f dynamic$(EXEEXT) install: all @@ -126,18 +173,18 @@ distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -dynamic.o: $(srcdir)/dynamic.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +uninstall: -dynamic$(EXEEXT): dynamic.o $(__dynamic___win32rc) - $(CXX) -o $@ dynamic.o $(__dynamic___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) +dynamic$(EXEEXT): dynamic-dynamic.o $(__dynamic___win32rc) + $(CXX) -o $@ dynamic-dynamic.o $(__dynamic___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__dynamic___mac_rezcmd) $(__dynamic___mac_setfilecmd) -dynamic_rc.o: $(srcdir)/dynamic.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +dynamic-dynamic_rc.o: $(srcdir)/dynamic.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) -uninstall: +dynamic-dynamic.o: $(srcdir)/dynamic.cpp + $(CXXC) -c -o $@ $(DYNAMIC_CXXFLAGS) $< # Include dependency info, if present: diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in index acdb0c5997..bf77767ec6 100644 --- a/samples/erase/Makefile.in +++ b/samples/erase/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +ERASE_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) $(CFLAGS) +ERASE_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: ### -@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_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ -@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_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_MAC_1@__erase___mac_rezcmd = $(__MACOSX_RESOURCES_p) @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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_PLATFORM_WIN32_1@__erase___win32rc = erase_rc.o -@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_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_PLATFORM_MAC_1@__erase___mac_setfilecmd = $(SETFILE) -a C erase$(EXEEXT) -@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@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_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) -o erase$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wx25 +@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx +@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_PLATFORM_MAC_1@__erase___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_PLATFORM_WIN32_1@__erase___win32rc = erase-erase_rc.o +@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_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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o erase$(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_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@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_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) ### Targets: ### @@ -116,26 +162,27 @@ all: erase$(EXEEXT) install-strip: install -erase$(EXEEXT): erase.o $(__erase___win32rc) - $(CXX) -o $@ erase.o $(__erase___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) +erase$(EXEEXT): erase-erase.o $(__erase___win32rc) + $(CXX) -o $@ erase-erase.o $(__erase___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__erase___mac_rezcmd) $(__erase___mac_setfilecmd) +install: all + +erase-erase_rc.o: $(srcdir)/erase.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f erase$(EXEEXT) -install: all - distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -erase_rc.o: $(srcdir)/erase.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) - -erase.o: $(srcdir)/erase.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +erase-erase.o: $(srcdir)/erase.cpp + $(CXXC) -c -o $@ $(ERASE_CXXFLAGS) $< uninstall: diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in index 9c270be395..ce0d891f7d 100644 --- a/samples/event/Makefile.in +++ b/samples/event/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +EVENT_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) +EVENT_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) $(CFLAGS) + ### 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_PLATFORM_WIN32_1@WXDLLVERSIONTAG = +@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(srcdir)/src/jpeg @COND_PLATFORM_MAC_1@__event___mac_setfilecmd = $(SETFILE) -a C event$(EXEEXT) -@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_WXUNIV_1@WXUNIVNAME = univ +@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_PLATFORM_WIN32_1@__event___win32rc = event_rc.o -@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc -@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib -@COND_PLATFORM_MAC_1@__event___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib +@COND_BUILD_DEBUG@OPTIMIZEFLAG = off +@COND_BUILD_RELEASE@OPTIMIZEFLAG = speed +@COND_PLATFORM_WIN32_1@__event___win32rc = event-event_rc.o +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_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_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) -o event$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wx25 +@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx +@COND_PLATFORM_MAC_1@__event___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o event$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC) -@COND_DEPS_TRACKING_0@CCC = $(CC) -@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) ### Targets: ### @@ -117,28 +163,29 @@ all: event$(EXEEXT) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f event$(EXEEXT) install: all -event_rc.o: $(srcdir)/event.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: +event-event.o: $(srcdir)/event.cpp + $(CXXC) -c -o $@ $(EVENT_CXXFLAGS) $< -event.o: $(srcdir)/event.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - -event$(EXEEXT): event.o $(__event___win32rc) - $(CXX) -o $@ event.o $(__event___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) +event$(EXEEXT): event-event.o $(__event___win32rc) + $(CXX) -o $@ event-event.o $(__event___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__event___mac_rezcmd) $(__event___mac_setfilecmd) +event-event_rc.o: $(srcdir)/event.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + +uninstall: + # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in index a36cdd609a..0a641013a9 100644 --- a/samples/exec/Makefile.in +++ b/samples/exec/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,65 +72,108 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +EXEC_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) +EXEC_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) $(CFLAGS) + ### 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_PLATFORM_WIN32_1@WXDLLVERSIONTAG = +@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(srcdir)/src/jpeg @COND_PLATFORM_MAC_1@__exec___mac_setfilecmd = $(SETFILE) -a C exec$(EXEEXT) -@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_WXUNIV_1@WXUNIVNAME = univ +@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_PLATFORM_WIN32_1@__exec___win32rc = exec-exec_rc.o @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__exec___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc -@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_PLATFORM_WIN32_1@__exec___win32rc = exec_rc.o -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@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_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(srcdir)/src/tiff +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_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_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) -o exec$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wx25 +@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx +@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib +@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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o exec$(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_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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) ### Targets: ### all: exec$(EXEEXT) -install-strip: install +exec-exec_rc.o: $(srcdir)/exec.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) -exec_rc.o: $(srcdir)/exec.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f exec$(EXEEXT) install: all -exec$(EXEEXT): exec.o $(__exec___win32rc) - $(CXX) -o $@ exec.o $(__exec___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) +exec$(EXEEXT): exec-exec.o $(__exec___win32rc) + $(CXX) -o $@ exec-exec.o $(__exec___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__exec___mac_rezcmd) $(__exec___mac_setfilecmd) @@ -134,11 +181,11 @@ distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -exec.o: $(srcdir)/exec.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - uninstall: +exec-exec.o: $(srcdir)/exec.cpp + $(CXXC) -c -o $@ $(EXEC_CXXFLAGS) $< + # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in index 1b48d73cc7..2c701e00f8 100644 --- a/samples/font/Makefile.in +++ b/samples/font/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,76 +72,119 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +FONT_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) $(CFLAGS) +FONT_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: ### -@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_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ -@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_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_WIN32_1@__font___win32rc = font_rc.o +@COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib +@COND_BUILD_DEBUG@OPTIMIZEFLAG = off +@COND_BUILD_RELEASE@OPTIMIZEFLAG = speed +@COND_PLATFORM_WIN32_1@__font___win32rc = font-font_rc.o @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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_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_PLATFORM_MAC_1@__font___mac_setfilecmd = $(SETFILE) -a C font$(EXEEXT) +@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_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) -o font$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG) @COND_PLATFORM_MAC_1@__font___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG) @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)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o font$(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_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) ### Targets: ### all: font$(EXEEXT) -font.o: $(srcdir)/font.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f font$(EXEEXT) install: all -uninstall: +font-font_rc.o: $(srcdir)/font.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -font$(EXEEXT): font.o $(__font___win32rc) - $(CXX) -o $@ font.o $(__font___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) +font$(EXEEXT): font-font.o $(__font___win32rc) + $(CXX) -o $@ font-font.o $(__font___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__font___mac_rezcmd) $(__font___mac_setfilecmd) -font_rc.o: $(srcdir)/font.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +font-font.o: $(srcdir)/font.cpp + $(CXXC) -c -o $@ $(FONT_CXXFLAGS) $< + +uninstall: # Include dependency info, if present: diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in index 00cc3e7017..221b9548d3 100644 --- a/samples/grid/Makefile.in +++ b/samples/grid/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +GRID_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) +GRID_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) $(CFLAGS) + ### 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_PLATFORM_WIN32_1@WXDLLVERSIONTAG = +@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 @COND_PLATFORM_MAC_1@__grid___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 @COND_PLATFORM_MAC_1@__grid___mac_setfilecmd = $(SETFILE) -a C grid$(EXEEXT) -@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_PLATFORM_WIN32_1@__grid___win32rc = grid-grid_rc.o +@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_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) -o grid$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff -@COND_PLATFORM_WIN32_1@__grid___win32rc = grid_rc.o +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o grid$(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_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@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) ### Targets: ### @@ -116,16 +162,14 @@ all: grid$(EXEEXT) install-strip: install -grid.o: $(srcdir)/grid.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - -grid$(EXEEXT): grid.o $(__grid___win32rc) - $(CXX) -o $@ grid.o $(__grid___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) +grid$(EXEEXT): grid-grid.o $(__grid___win32rc) + $(CXX) -o $@ grid-grid.o $(__grid___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__grid___mac_rezcmd) $(__grid___mac_setfilecmd) clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f grid$(EXEEXT) install: all @@ -134,8 +178,11 @@ distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -grid_rc.o: $(srcdir)/grid.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +grid-grid.o: $(srcdir)/grid.cpp + $(CXXC) -c -o $@ $(GRID_CXXFLAGS) $< + +grid-grid_rc.o: $(srcdir)/grid.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) uninstall: diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in index d1b12edcca..321c092618 100644 --- a/samples/help/Makefile.in +++ b/samples/help/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +HELP_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) +HELP_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) $(CFLAGS) + ### 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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @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 help$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_PLATFORM_WIN32_1@__help___win32rc = help_rc.o -@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_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_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) -o help$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib$(WXDEBUGFLAG) +@COND_BUILD_DEBUG@DEBUGFLAG = on +@COND_BUILD_RELEASE@DEBUGFLAG = off +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(srcdir)/src/regex +@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@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_PLATFORM_WIN32_1@__help___win32rc = help-help_rc.o +@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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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@__help___mac_setfilecmd = $(SETFILE) -a C help$(EXEEXT) @COND_PLATFORM_MAC_1@__help___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex -@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(srcdir)/src/png +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex$(WXDEBUGFLAG) ### Targets: ### @@ -117,13 +163,14 @@ all: help$(EXEEXT) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f help$(EXEEXT) install: all -help_rc.o: $(srcdir)/help.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +help-help_rc.o: $(srcdir)/help.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) distclean: clean rm -f configure config.cache config.log config.status @@ -131,11 +178,11 @@ distclean: clean uninstall: -help.o: $(srcdir)/help.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +help-help.o: $(srcdir)/help.cpp + $(CXXC) -c -o $@ $(HELP_CXXFLAGS) $< -help$(EXEEXT): help.o $(__help___win32rc) - $(CXX) -o $@ help.o $(__help___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) +help$(EXEEXT): help-help.o $(__help___win32rc) + $(CXX) -o $@ help-help.o $(__help___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__help___mac_rezcmd) $(__help___mac_setfilecmd) diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in index 3f304f70bc..0ee3a38a86 100644 --- a/samples/htlbox/Makefile.in +++ b/samples/htlbox/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +HTLBOX_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) +HTLBOX_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) $(CFLAGS) + ### 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_PLATFORM_WIN32_1@__htlbox___win32rc = htlbox_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_WXUNIV_1@WXUNIVNAME = univ +@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 +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +@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_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) @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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_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_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ +@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_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) -o htlbox$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL @COND_PLATFORM_MAC_1@__htlbox___mac_setfilecmd = $(SETFILE) -a C htlbox$(EXEEXT) +@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_PLATFORM_WIN32_1@__htlbox___win32rc = htlbox-htlbox_rc.o +@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)25 +@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) +@COND_PLATFORM_MAC_1@__htlbox___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o htlbox$(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_PLATFORM_MAC_1@__htlbox___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@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) ### Targets: ### @@ -116,29 +162,30 @@ all: htlbox$(EXEEXT) install-strip: install +htlbox-htlbox_rc.o: $(srcdir)/htlbox.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f htlbox$(EXEEXT) install: all -htlbox_rc.o: $(srcdir)/htlbox.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) - -htlbox.o: $(srcdir)/htlbox.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - -uninstall: +htlbox-htlbox.o: $(srcdir)/htlbox.cpp + $(CXXC) -c -o $@ $(HTLBOX_CXXFLAGS) $< distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -htlbox$(EXEEXT): htlbox.o $(__htlbox___win32rc) - $(CXX) -o $@ htlbox.o $(__htlbox___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) +htlbox$(EXEEXT): htlbox-htlbox.o $(__htlbox___win32rc) + $(CXX) -o $@ htlbox-htlbox.o $(__htlbox___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__htlbox___mac_rezcmd) $(__htlbox___mac_setfilecmd) +uninstall: + # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in index c158c090f2..d6f698ca13 100644 --- a/samples/image/Makefile.in +++ b/samples/image/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,46 +72,88 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +IMAGE_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) +IMAGE_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) $(CFLAGS) + ### 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_PLATFORM_WIN32_1@__image___win32rc = image_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_WXUNIV_1@WXUNIVNAME = univ +@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = +@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(srcdir)/src/jpeg +@COND_PLATFORM_WIN32_1@__image___win32rc = image-image_rc.o +@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_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 +@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_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng -@COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5 -@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__image___mac_setfilecmd = $(SETFILE) -a C image$(EXEEXT) +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-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_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) -o image$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o image$(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_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@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_PLATFORM_MAC_1@__image___mac_rezcmd = $(__MACOSX_RESOURCES_p) ### Targets: ### @@ -117,22 +163,22 @@ all: image$(EXEEXT) data install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f image$(EXEEXT) rm -f ./horse.png ./horse.jpg ./horse.bmp ./horse.gif ./horse.pcx ./horse.pnm ./horse.tif ./horse.xpm ./horse.cur ./horse.ico ./horse3.ani ./smile.xbm install: all -image.o: $(srcdir)/image.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - -image_rc.o: $(srcdir)/image.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +uninstall: distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh +image-image.o: $(srcdir)/image.cpp + $(CXXC) -c -o $@ $(IMAGE_CXXFLAGS) $< + data: @mkdir -p . @for f in horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse.tif horse.xpm horse.cur horse.ico horse3.ani smile.xbm; do \ @@ -141,13 +187,14 @@ data: fi; \ done -image$(EXEEXT): image.o $(__image___win32rc) - $(CXX) -o $@ image.o $(__image___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) +image-image_rc.o: $(srcdir)/image.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + +image$(EXEEXT): image-image.o $(__image___win32rc) + $(CXX) -o $@ image-image.o $(__image___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__image___mac_rezcmd) $(__image___mac_setfilecmd) -uninstall: - # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in index e526327d0e..e680f5d7cd 100644 --- a/samples/internat/Makefile.in +++ b/samples/internat/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,76 +72,119 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +INTERNAT_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) $(CFLAGS) +INTERNAT_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: ### -@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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_PLATFORM_WIN32_1@__internat___win32rc = internat_rc.o -@COND_PLATFORM_MAC_1@__internat___mac_setfilecmd = $(SETFILE) -a C internat$(EXEEXT) -@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_PLATFORM_WIN32_1@__internat___win32rc = internat-internat_rc.o +@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_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) -o internat$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(srcdir)/src/png +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG) @COND_PLATFORM_MAC_1@__internat___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG) @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)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o internat$(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_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_BUILD_DEBUG@DEBUGFLAG = on +@COND_BUILD_RELEASE@DEBUGFLAG = off +@COND_PLATFORM_MAC_1@__internat___mac_setfilecmd = $(SETFILE) -a C internat$(EXEEXT) +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex$(WXDEBUGFLAG) ### Targets: ### all: internat$(EXEEXT) -internat.o: $(srcdir)/internat.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +internat-internat_rc.o: $(srcdir)/internat.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f internat$(EXEEXT) install: all -internat_rc.o: $(srcdir)/internat.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +uninstall: distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -internat$(EXEEXT): internat.o $(__internat___win32rc) - $(CXX) -o $@ internat.o $(__internat___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) +internat$(EXEEXT): internat-internat.o $(__internat___win32rc) + $(CXX) -o $@ internat-internat.o $(__internat___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__internat___mac_rezcmd) $(__internat___mac_setfilecmd) -uninstall: +internat-internat.o: $(srcdir)/internat.cpp + $(CXXC) -c -o $@ $(INTERNAT_CXXFLAGS) $< # Include dependency info, if present: diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in index a21616ad61..4746a60a78 100644 --- a/samples/ipc/Makefile.in +++ b/samples/ipc/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +IPC_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) $(CFLAGS) +IPC_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: ### -@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_WXUNIV_1@WXUNIVNAME = univ -@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_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 +@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg @COND_PLATFORM_MAC_1@__ipc___mac_rezcmd = $(__MACOSX_RESOURCES_p) @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@__ipc___mac_setfilecmd = $(SETFILE) -a C ipc$(EXEEXT) -@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_PLATFORM_WIN32_1@__ipc___win32rc = ipc_rc.o -@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_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_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) -o ipc$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_MAC_1@__ipc___mac_setfilecmd = $(SETFILE) -a C ipc$(EXEEXT) +@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_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_PLATFORM_WIN32_1@__ipc___win32rc = ipc-ipc_rc.o +@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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o ipc$(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_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) ### Targets: ### @@ -117,13 +163,14 @@ all: ipc$(EXEEXT) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f ipc$(EXEEXT) install: all -ipc$(EXEEXT): ipc.o $(__ipc___win32rc) - $(CXX) -o $@ ipc.o $(__ipc___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) +ipc$(EXEEXT): ipc-ipc.o $(__ipc___win32rc) + $(CXX) -o $@ ipc-ipc.o $(__ipc___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__ipc___mac_rezcmd) $(__ipc___mac_setfilecmd) @@ -131,13 +178,13 @@ distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -uninstall: +ipc-ipc.o: $(srcdir)/ipc.cpp + $(CXXC) -c -o $@ $(IPC_CXXFLAGS) $< -ipc.o: $(srcdir)/ipc.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +ipc-ipc_rc.o: $(srcdir)/ipc.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) -ipc_rc.o: $(srcdir)/ipc.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +uninstall: # Include dependency info, if present: diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in index f828988572..1989c61100 100644 --- a/samples/joytest/Makefile.in +++ b/samples/joytest/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +JOYTEST_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) +JOYTEST_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) $(CFLAGS) + ### 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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_MAC_1@__joytest___mac_setfilecmd = $(SETFILE) -a C joytest$(EXEEXT) +@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_PLATFORM_WIN32_1@__joytest___win32rc = joytest_rc.o +@COND_PLATFORM_WIN32_1@__joytest___win32rc = joytest-joytest_rc.o @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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_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_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) -o joytest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_PLATFORM_MAC_1@__joytest___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib$(WXDEBUGFLAG) +@COND_PLATFORM_MAC_1@__joytest___mac_setfilecmd = $(SETFILE) -a C joytest$(EXEEXT) +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(srcdir)/src/regex +@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o joytest$(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_PLATFORM_MAC_1@__joytest___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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) ### Targets: ### @@ -116,14 +162,18 @@ all: joytest$(EXEEXT) install-strip: install +joytest-joytest.o: $(srcdir)/joytest.cpp + $(CXXC) -c -o $@ $(JOYTEST_CXXFLAGS) $< + clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f joytest$(EXEEXT) install: all -joytest_rc.o: $(srcdir)/joytest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +joytest-joytest_rc.o: $(srcdir)/joytest.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) distclean: clean rm -f configure config.cache config.log config.status @@ -131,11 +181,8 @@ distclean: clean uninstall: -joytest.o: $(srcdir)/joytest.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - -joytest$(EXEEXT): joytest.o $(__joytest___win32rc) - $(CXX) -o $@ joytest.o $(__joytest___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) +joytest$(EXEEXT): joytest-joytest.o $(__joytest___win32rc) + $(CXX) -o $@ joytest-joytest.o $(__joytest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__joytest___mac_rezcmd) $(__joytest___mac_setfilecmd) diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in index 8f4b4bc826..11402fe118 100644 --- a/samples/keyboard/Makefile.in +++ b/samples/keyboard/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,75 +72,118 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +KEYBOARD_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) +KEYBOARD_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) $(CFLAGS) + ### 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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_PLATFORM_WIN32_1@__keyboard___win32rc = keyboard_rc.o -@COND_PLATFORM_MAC_1@__keyboard___mac_setfilecmd = $(SETFILE) -a C keyboard$(EXEEXT) -@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_PLATFORM_WIN32_1@__keyboard___win32rc = keyboard-keyboard_rc.o +@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_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) -o keyboard$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +@COND_PLATFORM_MAC_1@__keyboard___mac_setfilecmd = $(SETFILE) -a C keyboard$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG) @COND_PLATFORM_MAC_1@__keyboard___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG) @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)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o keyboard$(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_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@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_OFFICIAL_BUILD_1@VENDORTAG = +@COND_OFFICIAL_BUILD_0@VENDORTAG = _$(VENDOR) ### Targets: ### all: keyboard$(EXEEXT) +keyboard-keyboard_rc.o: $(srcdir)/keyboard.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + install-strip: install -clean: - rm -f ./*.o ./.deps/* - rm -f keyboard$(EXEEXT) +keyboard-keyboard.o: $(srcdir)/keyboard.cpp + $(CXXC) -c -o $@ $(KEYBOARD_CXXFLAGS) $< install: all -keyboard$(EXEEXT): keyboard.o $(__keyboard___win32rc) - $(CXX) -o $@ keyboard.o $(__keyboard___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) +keyboard$(EXEEXT): keyboard-keyboard.o $(__keyboard___win32rc) + $(CXX) -o $@ keyboard-keyboard.o $(__keyboard___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__keyboard___mac_rezcmd) $(__keyboard___mac_setfilecmd) +clean: + rm -rf ./.deps + rm -f -f ./*.o + rm -f keyboard$(EXEEXT) + distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -keyboard_rc.o: $(srcdir)/keyboard.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) - -keyboard.o: $(srcdir)/keyboard.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - uninstall: diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in index 1f065fd141..a91868b13f 100644 --- a/samples/layout/Makefile.in +++ b/samples/layout/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +LAYOUT_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) $(CFLAGS) +LAYOUT_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: ### -@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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_PLATFORM_MAC_1@__layout___mac_setfilecmd = $(SETFILE) -a C layout$(EXEEXT) +@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 +@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_PLATFORM_WIN32_1@__layout___win32rc = layout_rc.o -@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc -@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_WXUNIV_1@WXUNIVNAME = univ -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib +@COND_PLATFORM_WIN32_1@__layout___win32rc = layout-layout_rc.o +@COND_BUILD_DEBUG@OPTIMIZEFLAG = off +@COND_BUILD_RELEASE@OPTIMIZEFLAG = speed +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @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@__layout___mac_rezcmd = $(__MACOSX_RESOURCES_p) @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_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_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) -o layout$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_MAC_1@__layout___mac_setfilecmd = $(SETFILE) -a C layout$(EXEEXT) +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o layout$(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_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) ### Targets: ### @@ -116,28 +162,29 @@ all: layout$(EXEEXT) install-strip: install -layout$(EXEEXT): layout.o $(__layout___win32rc) - $(CXX) -o $@ layout.o $(__layout___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) +layout$(EXEEXT): layout-layout.o $(__layout___win32rc) + $(CXX) -o $@ layout-layout.o $(__layout___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__layout___mac_rezcmd) $(__layout___mac_setfilecmd) -install: all - -layout_rc.o: $(srcdir)/layout.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) - clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f layout$(EXEEXT) +install: all + distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh uninstall: -layout.o: $(srcdir)/layout.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +layout-layout_rc.o: $(srcdir)/layout.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + +layout-layout.o: $(srcdir)/layout.cpp + $(CXXC) -c -o $@ $(LAYOUT_CXXFLAGS) $< # Include dependency info, if present: diff --git a/samples/listbox/Makefile.in b/samples/listbox/Makefile.in index 4e24f5bc42..1787b1841a 100644 --- a/samples/listbox/Makefile.in +++ b/samples/listbox/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +LISTBOX_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) $(CFLAGS) +LISTBOX_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: ### -@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_PLATFORM_MAC_1@__listbox___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_PLATFORM_MAC_1@__listbox___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_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) -o listbox$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wx25 +@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx +@COND_PLATFORM_WIN32_1@__listbox___win32rc = listbox-listbox_rc.o +@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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_PLATFORM_MAC_1@__listbox___mac_setfilecmd = $(SETFILE) -a C listbox$(EXEEXT) -@COND_PLATFORM_WIN32_1@__listbox___win32rc = listbox_rc.o @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)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o listbox$(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_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) ### Targets: ### @@ -117,7 +163,8 @@ all: listbox$(EXEEXT) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f listbox$(EXEEXT) install: all @@ -126,18 +173,18 @@ distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -listbox.o: $(srcdir)/listbox.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +uninstall: -listbox$(EXEEXT): listbox.o $(__listbox___win32rc) - $(CXX) -o $@ listbox.o $(__listbox___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) +listbox$(EXEEXT): listbox-listbox.o $(__listbox___win32rc) + $(CXX) -o $@ listbox-listbox.o $(__listbox___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__listbox___mac_rezcmd) $(__listbox___mac_setfilecmd) -listbox_rc.o: $(srcdir)/listbox.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +listbox-listbox_rc.o: $(srcdir)/listbox.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) -uninstall: +listbox-listbox.o: $(srcdir)/listbox.cpp + $(CXXC) -c -o $@ $(LISTBOX_CXXFLAGS) $< # Include dependency info, if present: diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in index f812786671..c2fd40b284 100644 --- a/samples/listctrl/Makefile.in +++ b/samples/listctrl/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,46 +72,88 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +LISTCTRL_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) $(CFLAGS) +LISTCTRL_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: ### -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) @COND_UNICODE_1@WXUNICODEFLAG = u -@COND_PLATFORM_WIN32_1@__listctrl___win32rc = listctrl_rc.o +@COND_PLATFORM_WIN32_1@__listctrl___win32rc = listctrl-listctrl_rc.o @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_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ -@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_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @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_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_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_PLATFORM_MAC_1@__listctrl___mac_setfilecmd = $(SETFILE) -a C listctrl$(EXEEXT) -@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = --include-dir $(srcdir)/src/png +@COND_WXUSE_LIBPNG_BUILTIN@INC_PNG = $(srcdir)/src/png +@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) -o listctrl$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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 +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex$(WXDEBUGFLAG) +@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_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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o listctrl$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_BUILD_DEBUG@DEBUGFLAG = on +@COND_BUILD_RELEASE@DEBUGFLAG = off +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(srcdir)/src/png @COND_PLATFORM_MAC_1@__listctrl___mac_rezcmd = $(__MACOSX_RESOURCES_p) ### Targets: ### @@ -116,28 +162,29 @@ all: listctrl$(EXEEXT) install-strip: install -listctrl$(EXEEXT): listctrl.o $(__listctrl___win32rc) - $(CXX) -o $@ listctrl.o $(__listctrl___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) +listctrl$(EXEEXT): listctrl-listctrl.o $(__listctrl___win32rc) + $(CXX) -o $@ listctrl-listctrl.o $(__listctrl___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__listctrl___mac_rezcmd) $(__listctrl___mac_setfilecmd) clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f listctrl$(EXEEXT) install: all -listctrl.o: $(srcdir)/listctrl.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +listctrl-listctrl_rc.o: $(srcdir)/listctrl.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -uninstall: +listctrl-listctrl.o: $(srcdir)/listctrl.cpp + $(CXXC) -c -o $@ $(LISTCTRL_CXXFLAGS) $< -listctrl_rc.o: $(srcdir)/listctrl.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +uninstall: # Include dependency info, if present: diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in index fb054be2ff..acf5452d1b 100644 --- a/samples/mdi/Makefile.in +++ b/samples/mdi/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,74 +72,117 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +MDI_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) +MDI_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) $(CFLAGS) + ### 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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_USE_GUI_0@PORTNAME = base -@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) -@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc -@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_PLATFORM_WIN32_1@__mdi___win32rc = mdi_rc.o -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib +@COND_PLATFORM_WIN32_1@__mdi___win32rc = mdi-mdi_rc.o +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 @COND_PLATFORM_MAC_1@__mdi___mac_setfilecmd = $(SETFILE) -a C mdi$(EXEEXT) -@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_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_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) -o mdi$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_PLATFORM_MAC_1@__mdi___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o mdi$(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_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) ### Targets: ### all: mdi$(EXEEXT) -mdi.o: $(srcdir)/mdi.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - install-strip: install -mdi$(EXEEXT): mdi.o $(__mdi___win32rc) - $(CXX) -o $@ mdi.o $(__mdi___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) +mdi$(EXEEXT): mdi-mdi.o $(__mdi___win32rc) + $(CXX) -o $@ mdi-mdi.o $(__mdi___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__mdi___mac_rezcmd) $(__mdi___mac_setfilecmd) clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f mdi$(EXEEXT) install: all +mdi-mdi.o: $(srcdir)/mdi.cpp + $(CXXC) -c -o $@ $(MDI_CXXFLAGS) $< + distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -mdi_rc.o: $(srcdir)/mdi.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +mdi-mdi_rc.o: $(srcdir)/mdi.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) uninstall: diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in index f2bc639518..6a04946f3e 100644 --- a/samples/memcheck/Makefile.in +++ b/samples/memcheck/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +MEMCHECK_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) $(CFLAGS) +MEMCHECK_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: ### -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) @COND_UNICODE_1@WXUNICODEFLAG = u -@COND_PLATFORM_MAC_1@__memcheck___mac_rezcmd = $(__MACOSX_RESOURCES_p) @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_PLATFORM_MAC_1@__memcheck___mac_setfilecmd = $(SETFILE) -a C memcheck$(EXEEXT) -@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_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_PLATFORM_WIN32_1@__memcheck___win32rc = memcheck_rc.o -@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_PLATFORM_WIN32_1@__memcheck___win32rc = memcheck-memcheck_rc.o +@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_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) -o memcheck$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +@COND_PLATFORM_MAC_1@__memcheck___mac_setfilecmd = $(SETFILE) -a C memcheck$(EXEEXT) +@COND_PLATFORM_MAC_1@__memcheck___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o memcheck$(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_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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) ### Targets: ### @@ -116,26 +162,27 @@ all: memcheck$(EXEEXT) install-strip: install -memcheck_rc.o: $(srcdir)/memcheck.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +clean: + rm -rf ./.deps + rm -f -f ./*.o + rm -f memcheck$(EXEEXT) install: all -memcheck$(EXEEXT): memcheck.o $(__memcheck___win32rc) - $(CXX) -o $@ memcheck.o $(__memcheck___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) +memcheck$(EXEEXT): memcheck-memcheck.o $(__memcheck___win32rc) + $(CXX) -o $@ memcheck-memcheck.o $(__memcheck___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__memcheck___mac_rezcmd) $(__memcheck___mac_setfilecmd) -clean: - rm -f ./*.o ./.deps/* - rm -f memcheck$(EXEEXT) +memcheck-memcheck.o: $(srcdir)/memcheck.cpp + $(CXXC) -c -o $@ $(MEMCHECK_CXXFLAGS) $< distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -memcheck.o: $(srcdir)/memcheck.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +memcheck-memcheck_rc.o: $(srcdir)/memcheck.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) uninstall: diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in index c1b43f7f8b..a8d4365898 100644 --- a/samples/menu/Makefile.in +++ b/samples/menu/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +MENU_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) $(CFLAGS) +MENU_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: ### -@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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_MAC_1@__menu___mac_setfilecmd = $(SETFILE) -a C menu$(EXEEXT) -@COND_PLATFORM_MAC_1@__menu___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_PLATFORM_WIN32_1@__menu___win32rc = menu_rc.o +@COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib +@COND_BUILD_DEBUG@OPTIMIZEFLAG = off +@COND_BUILD_RELEASE@OPTIMIZEFLAG = speed +@COND_PLATFORM_WIN32_1@__menu___win32rc = menu-menu_rc.o +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(srcdir)/src/regex @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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_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_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) -o menu$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib$(WXDEBUGFLAG) +@COND_PLATFORM_MAC_1@__menu___mac_setfilecmd = $(SETFILE) -a C menu$(EXEEXT) +@COND_PLATFORM_MAC_1@__menu___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o menu$(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_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) ### Targets: ### @@ -117,25 +163,26 @@ all: menu$(EXEEXT) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f menu$(EXEEXT) install: all -menu$(EXEEXT): menu.o $(__menu___win32rc) - $(CXX) -o $@ menu.o $(__menu___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) +menu$(EXEEXT): menu-menu.o $(__menu___win32rc) + $(CXX) -o $@ menu-menu.o $(__menu___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__menu___mac_rezcmd) $(__menu___mac_setfilecmd) +menu-menu.o: $(srcdir)/menu.cpp + $(CXXC) -c -o $@ $(MENU_CXXFLAGS) $< + distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -menu_rc.o: $(srcdir)/menu.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) - -menu.o: $(srcdir)/menu.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +menu-menu_rc.o: $(srcdir)/menu.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) uninstall: diff --git a/samples/mfc/Makefile.in b/samples/mfc/Makefile.in index 95ab2a3c40..5857eb19af 100644 --- a/samples/mfc/Makefile.in +++ b/samples/mfc/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,64 +72,104 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +MFC_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) +MFC_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) $(CFLAGS) + ### Conditionally set variables: ### -@COND_PLATFORM_WIN32_1@__mfc___win32rc = mfc_rc.o +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) @COND_UNICODE_1@WXUNICODEFLAG = u @COND_BUILD_DEBUG@WXDEBUGFLAG = d -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib -@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_PLATFORM_MAC_1@__mfc___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_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_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) -o mfc$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_PLATFORM_MAC_1@__mfc___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wx25 +@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx +@COND_PLATFORM_WIN32_1@__mfc___win32rc = mfc-mfc_rc.o +@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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_PLATFORM_MAC_1@__mfc___mac_setfilecmd = $(SETFILE) -a C mfc$(EXEEXT) @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)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o mfc$(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_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) ### Targets: ### all: mfc$(EXEEXT) -mfc.o: $(srcdir)/mfc.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - install-strip: install -mfc$(EXEEXT): mfc.o $(__mfc___win32rc) - $(CXX) -o $@ mfc.o $(__mfc___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) +mfc$(EXEEXT): mfc-mfc.o $(__mfc___win32rc) + $(CXX) -o $@ mfc-mfc.o $(__mfc___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__mfc___mac_rezcmd) $(__mfc___mac_setfilecmd) clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f mfc$(EXEEXT) install: all @@ -134,8 +178,11 @@ distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -mfc_rc.o: $(srcdir)/mfc.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +mfc-mfc.o: $(srcdir)/mfc.cpp + $(CXXC) -c -o $@ $(MFC_CXXFLAGS) $< + +mfc-mfc_rc.o: $(srcdir)/mfc.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) uninstall: diff --git a/samples/minifram/Makefile.in b/samples/minifram/Makefile.in index c079d7deee..f84b718b6b 100644 --- a/samples/minifram/Makefile.in +++ b/samples/minifram/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,75 +72,118 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +MINIFRAM_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) $(CFLAGS) +MINIFRAM_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: ### -@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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_MAC_1@__minifram___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_PLATFORM_WIN32_1@__minifram___win32rc = minifram_rc.o -@COND_PLATFORM_MAC_1@__minifram___mac_setfilecmd = $(SETFILE) -a C minifram$(EXEEXT) +@COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib +@COND_BUILD_DEBUG@OPTIMIZEFLAG = off +@COND_BUILD_RELEASE@OPTIMIZEFLAG = speed +@COND_PLATFORM_WIN32_1@__minifram___win32rc = minifram-minifram_rc.o @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@__minifram___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_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_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) -o minifram$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_PLATFORM_MAC_1@__minifram___mac_setfilecmd = $(SETFILE) -a C minifram$(EXEEXT) +@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o minifram$(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_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) ### Targets: ### all: minifram$(EXEEXT) -minifram.o: $(srcdir)/minifram.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f minifram$(EXEEXT) install: all -minifram_rc.o: $(srcdir)/minifram.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +minifram-minifram_rc.o: $(srcdir)/minifram.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -minifram$(EXEEXT): minifram.o $(__minifram___win32rc) - $(CXX) -o $@ minifram.o $(__minifram___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) +minifram$(EXEEXT): minifram-minifram.o $(__minifram___win32rc) + $(CXX) -o $@ minifram-minifram.o $(__minifram___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__minifram___mac_rezcmd) $(__minifram___mac_setfilecmd) +minifram-minifram.o: $(srcdir)/minifram.cpp + $(CXXC) -c -o $@ $(MINIFRAM_CXXFLAGS) $< + uninstall: diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in index 104958cab5..662aef2608 100644 --- a/samples/minimal/Makefile.in +++ b/samples/minimal/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: ### + +MINIMAL_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) $(CFLAGS) +MINIMAL_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: ### @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 @@ -83,14 +92,15 @@ SHARED_LD_CC = @SHARED_LD_CC@ @COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib @COND_BUILD_DEBUG@OPTIMIZEFLAG = off @COND_BUILD_RELEASE@OPTIMIZEFLAG = speed -@COND_PLATFORM_WIN32_1@__minimal___win32rc = minimal_rc.o +@COND_PLATFORM_WIN32_1@__minimal___win32rc = minimal-minimal_rc.o @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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib +@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_PLATFORM_MAC_1@__minimal___mac_setfilecmd = $(SETFILE) -a C minimal$(EXEEXT) +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 @COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5 @COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc$(WXDEBUGFLAG) @@ -110,6 +120,8 @@ 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_ODBC_BUILTIN@__INC_ODBC_p = -I$(srcdir)/src/odbc @@ -121,13 +133,16 @@ 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_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_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -@COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5 +@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_PLATFORM_MAC_1@__minimal___mac_rezcmd = $(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) -o minimal$(EXEEXT) $(MACOSX_RESOURCES) mondrian.r @@ -154,18 +169,18 @@ clean: install: all -minimal.o: $(srcdir)/minimal.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) $(CXXFLAGS) $< +minimal-minimal.o: $(srcdir)/minimal.cpp + $(CXXC) -c -o $@ $(MINIMAL_CXXFLAGS) $< distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -minimal_rc.o: $(srcdir)/minimal.rc +minimal-minimal_rc.o: $(srcdir)/minimal.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) -minimal$(EXEEXT): minimal.o $(__minimal___win32rc) - $(CXX) -o $@ minimal.o $(__minimal___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) +minimal$(EXEEXT): minimal-minimal.o $(__minimal___win32rc) + $(CXX) -o $@ minimal-minimal.o $(__minimal___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__minimal___mac_rezcmd) $(__minimal___mac_setfilecmd) diff --git a/samples/mobile/Makefile.in b/samples/mobile/Makefile.in index ff248b1e8c..c9fef2cc05 100644 --- a/samples/mobile/Makefile.in +++ b/samples/mobile/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +MOBILE_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) $(CFLAGS) +MOBILE_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: ### -@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_PLATFORM_MAC_1@__mobile___mac_setfilecmd = $(SETFILE) -a C mobile$(EXEEXT) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng -@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_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_WIN32_1@__mobile___win32rc = mobile_rc.o -@COND_PLATFORM_MAC_1@__mobile___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib +@COND_BUILD_DEBUG@OPTIMIZEFLAG = off +@COND_BUILD_RELEASE@OPTIMIZEFLAG = speed +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @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_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) -@COND_DEPS_TRACKING_0@CXXC = $(CXX) +@COND_PLATFORM_MAC_1@__mobile___mac_setfilecmd = $(SETFILE) -a C mobile$(EXEEXT) @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_PLATFORM_MAC_1@__mobile___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_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) -o mobile$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +@COND_PLATFORM_WIN32_1@__mobile___win32rc = mobile-mobile_rc.o +@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_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) +@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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o mobile$(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_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) ### Targets: ### @@ -116,26 +162,27 @@ all: mobile$(EXEEXT) install-strip: install -clean: - rm -f ./*.o ./.deps/* - rm -f mobile$(EXEEXT) - install: all -mobile$(EXEEXT): mobile.o $(__mobile___win32rc) - $(CXX) -o $@ mobile.o $(__mobile___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) +mobile-mobile_rc.o: $(srcdir)/mobile.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + +mobile$(EXEEXT): mobile-mobile.o $(__mobile___win32rc) + $(CXX) -o $@ mobile-mobile.o $(__mobile___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__mobile___mac_rezcmd) $(__mobile___mac_setfilecmd) +clean: + rm -rf ./.deps + rm -f -f ./*.o + rm -f mobile$(EXEEXT) + distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -mobile.o: $(srcdir)/mobile.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - -mobile_rc.o: $(srcdir)/mobile.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +mobile-mobile.o: $(srcdir)/mobile.cpp + $(CXXC) -c -o $@ $(MOBILE_CXXFLAGS) $< uninstall: diff --git a/samples/multimon/Makefile.in b/samples/multimon/Makefile.in index a55a73274d..122c18a1a1 100644 --- a/samples/multimon/Makefile.in +++ b/samples/multimon/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,76 +72,119 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +MULTIMON_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) $(CFLAGS) +MULTIMON_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: ### -@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_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc -@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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_WIN32_1@__multimon___win32rc = multimon_rc.o +@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_PLATFORM_MAC_1@__multimon___mac_setfilecmd = $(SETFILE) -a C multimon$(EXEEXT) +@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_PLATFORM_MAC_1@__multimon___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_PLATFORM_WIN32_1@__multimon___win32rc = multimon-multimon_rc.o +@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_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) -o multimon$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(srcdir)/src/zlib +@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_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) +@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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_PLATFORM_MAC_1@__multimon___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o multimon$(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_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) ### Targets: ### all: multimon$(EXEEXT) +multimon-multimon_rc.o: $(srcdir)/multimon.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + install-strip: install -multimon$(EXEEXT): multimon.o $(__multimon___win32rc) - $(CXX) -o $@ multimon.o $(__multimon___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) +multimon$(EXEEXT): multimon-multimon.o $(__multimon___win32rc) + $(CXX) -o $@ multimon-multimon.o $(__multimon___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__multimon___mac_rezcmd) $(__multimon___mac_setfilecmd) clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f multimon$(EXEEXT) install: all -multimon.o: $(srcdir)/multimon.cpp - $(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 uninstall: -multimon_rc.o: $(srcdir)/multimon.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +multimon-multimon.o: $(srcdir)/multimon.cpp + $(CXXC) -c -o $@ $(MULTIMON_CXXFLAGS) $< # Include dependency info, if present: diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in index f3786dd73e..aedaf9a536 100644 --- a/samples/nativdlg/Makefile.in +++ b/samples/nativdlg/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +NATIVDLG_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) $(CFLAGS) +NATIVDLG_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: ### -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) @COND_UNICODE_1@WXUNICODEFLAG = u +@COND_PLATFORM_WIN32_1@__nativdlg___win32rc = nativdlg-nativdlg_rc.o @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 +@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_PLATFORM_MAC_1@__nativdlg___mac_setfilecmd = $(SETFILE) -a C nativdlg$(EXEEXT) -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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_PLATFORM_MAC_1@__nativdlg___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @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 nativdlg$(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_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_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) -o nativdlg$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(srcdir)/src/zlib +@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_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) +@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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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@__nativdlg___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex -@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex -@COND_PLATFORM_WIN32_1@__nativdlg___win32rc = nativdlg_rc.o +@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) ### Targets: ### @@ -116,28 +162,29 @@ all: nativdlg$(EXEEXT) install-strip: install -nativdlg$(EXEEXT): nativdlg.o $(__nativdlg___win32rc) - $(CXX) -o $@ nativdlg.o $(__nativdlg___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) +nativdlg$(EXEEXT): nativdlg-nativdlg.o $(__nativdlg___win32rc) + $(CXX) -o $@ nativdlg-nativdlg.o $(__nativdlg___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__nativdlg___mac_rezcmd) $(__nativdlg___mac_setfilecmd) clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f nativdlg$(EXEEXT) install: all -nativdlg.o: $(srcdir)/nativdlg.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +nativdlg-nativdlg_rc.o: $(srcdir)/nativdlg.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -uninstall: +nativdlg-nativdlg.o: $(srcdir)/nativdlg.cpp + $(CXXC) -c -o $@ $(NATIVDLG_CXXFLAGS) $< -nativdlg_rc.o: $(srcdir)/nativdlg.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +uninstall: # Include dependency info, if present: diff --git a/samples/newgrid/Makefile.in b/samples/newgrid/Makefile.in index c1d8d237d8..5efb95c223 100644 --- a/samples/newgrid/Makefile.in +++ b/samples/newgrid/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,46 +72,88 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +NEWGRID_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) +NEWGRID_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) $(CFLAGS) + ### 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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_MAC_1@__newgrid___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @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 newgrid$(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_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_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) -o newgrid$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_MAC_1@__newgrid___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_WIN32_1@__newgrid___win32rc = newgrid_rc.o -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex -@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_PLATFORM_WIN32_1@__newgrid___win32rc = newgrid-newgrid_rc.o +@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_PLATFORM_MAC_1@__newgrid___mac_setfilecmd = $(SETFILE) -a C newgrid$(EXEEXT) ### Targets: ### @@ -117,25 +163,26 @@ all: newgrid$(EXEEXT) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f newgrid$(EXEEXT) install: all -newgrid_rc.o: $(srcdir)/newgrid.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +uninstall: distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -uninstall: +newgrid-newgrid.o: $(srcdir)/newgrid.cpp + $(CXXC) -c -o $@ $(NEWGRID_CXXFLAGS) $< -newgrid.o: $(srcdir)/newgrid.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +newgrid-newgrid_rc.o: $(srcdir)/newgrid.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) -newgrid$(EXEEXT): newgrid.o $(__newgrid___win32rc) - $(CXX) -o $@ newgrid.o $(__newgrid___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) +newgrid$(EXEEXT): newgrid-newgrid.o $(__newgrid___win32rc) + $(CXX) -o $@ newgrid-newgrid.o $(__newgrid___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__newgrid___mac_rezcmd) $(__newgrid___mac_setfilecmd) diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in index 37739bad4b..169f84d490 100644 --- a/samples/notebook/Makefile.in +++ b/samples/notebook/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +NOTEBOOK_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) $(CFLAGS) +NOTEBOOK_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: ### -@COND_PLATFORM_MAC_1@__notebook___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) @COND_UNICODE_1@WXUNICODEFLAG = u @COND_BUILD_DEBUG@WXDEBUGFLAG = d -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib -@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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg @COND_PLATFORM_MAC_1@__notebook___mac_setfilecmd = $(SETFILE) -a C notebook$(EXEEXT) -@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc -@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib -@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_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_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) -o notebook$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +@COND_PLATFORM_MAC_1@__notebook___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_PLATFORM_WIN32_1@__notebook___win32rc = notebook-notebook_rc.o +@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_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff -@COND_PLATFORM_WIN32_1@__notebook___win32rc = notebook_rc.o +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o notebook$(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_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) ### Targets: ### @@ -116,28 +162,29 @@ all: notebook$(EXEEXT) install-strip: install -notebook$(EXEEXT): notebook.o $(__notebook___win32rc) - $(CXX) -o $@ notebook.o $(__notebook___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) +notebook$(EXEEXT): notebook-notebook.o $(__notebook___win32rc) + $(CXX) -o $@ notebook-notebook.o $(__notebook___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__notebook___mac_rezcmd) $(__notebook___mac_setfilecmd) clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f notebook$(EXEEXT) install: all -notebook.o: $(srcdir)/notebook.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +notebook-notebook_rc.o: $(srcdir)/notebook.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -uninstall: +notebook-notebook.o: $(srcdir)/notebook.cpp + $(CXXC) -c -o $@ $(NOTEBOOK_CXXFLAGS) $< -notebook_rc.o: $(srcdir)/notebook.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +uninstall: # Include dependency info, if present: diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in index e9f328213b..358c1e3d23 100644 --- a/samples/oleauto/Makefile.in +++ b/samples/oleauto/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +OLEAUTO_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) +OLEAUTO_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) $(CFLAGS) + ### 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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_PLATFORM_WIN32_1@__oleauto___win32rc = oleauto_rc.o -@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc -@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib +@COND_PLATFORM_WIN32_1@__oleauto___win32rc = oleauto-oleauto_rc.o +@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_PLATFORM_MAC_1@__oleauto___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5 -@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg @COND_PLATFORM_MAC_1@__oleauto___mac_setfilecmd = $(SETFILE) -a C oleauto$(EXEEXT) -@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-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_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) -o oleauto$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wx25 +@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx +@COND_PLATFORM_MAC_1@__oleauto___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o oleauto$(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_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: ### @@ -117,13 +163,17 @@ all: oleauto$(EXEEXT) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f oleauto$(EXEEXT) install: all -oleauto$(EXEEXT): oleauto.o $(__oleauto___win32rc) - $(CXX) -o $@ oleauto.o $(__oleauto___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) +oleauto-oleauto.o: $(srcdir)/oleauto.cpp + $(CXXC) -c -o $@ $(OLEAUTO_CXXFLAGS) $< + +oleauto$(EXEEXT): oleauto-oleauto.o $(__oleauto___win32rc) + $(CXX) -o $@ oleauto-oleauto.o $(__oleauto___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__oleauto___mac_rezcmd) $(__oleauto___mac_setfilecmd) @@ -131,13 +181,10 @@ distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -uninstall: - -oleauto_rc.o: $(srcdir)/oleauto.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +oleauto-oleauto_rc.o: $(srcdir)/oleauto.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) -oleauto.o: $(srcdir)/oleauto.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +uninstall: # Include dependency info, if present: diff --git a/samples/opengl/Makefile.in b/samples/opengl/Makefile.in index a0f5f4e65e..f8aa62bb26 100644 --- a/samples/opengl/Makefile.in +++ b/samples/opengl/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,77 +72,120 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +OPENGL_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) $(CFLAGS) +OPENGL_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: ### -@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_PLATFORM_WIN32_1@__opengl___win32rc = opengl_rc.o -@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_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_MAC_1@__opengl___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_PLATFORM_WIN32_1@__opengl___win32rc = opengl-opengl_rc.o +@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_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) -o opengl$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_PLATFORM_MAC_1@__opengl___mac_setfilecmd = $(SETFILE) -a C opengl$(EXEEXT) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib$(WXDEBUGFLAG) +@COND_PLATFORM_MAC_1@__opengl___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(srcdir)/src/regex +@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o opengl$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_PLATFORM_MAC_1@__opengl___mac_setfilecmd = $(SETFILE) -a C opengl$(EXEEXT) -@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@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: ### all: opengl$(EXEEXT) -opengl.o: $(srcdir)/opengl.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - install-strip: install -opengl_rc.o: $(srcdir)/opengl.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) - clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f opengl$(EXEEXT) install: all -opengl$(EXEEXT): opengl.o $(__opengl___win32rc) - $(CXX) -o $@ opengl.o $(__opengl___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) +opengl$(EXEEXT): opengl-opengl.o $(__opengl___win32rc) + $(CXX) -o $@ opengl-opengl.o $(__opengl___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__opengl___mac_rezcmd) $(__opengl___mac_setfilecmd) +opengl-opengl_rc.o: $(srcdir)/opengl.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh uninstall: +opengl-opengl.o: $(srcdir)/opengl.cpp + $(CXXC) -c -o $@ $(OPENGL_CXXFLAGS) $< + # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in index b738a99859..1ef06b2315 100644 --- a/samples/ownerdrw/Makefile.in +++ b/samples/ownerdrw/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +OWNERDRW_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) $(CFLAGS) +OWNERDRW_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: ### -@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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg @COND_PLATFORM_MAC_1@__ownerdrw___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc -@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib -@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@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_PLATFORM_WIN32_1@__ownerdrw___win32rc = ownerdrw_rc.o -@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@__ownerdrw___win32rc = ownerdrw-ownerdrw_rc.o +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_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_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) -o ownerdrw$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@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_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_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG) @COND_PLATFORM_MAC_1@__ownerdrw___mac_setfilecmd = $(SETFILE) -a C ownerdrw$(EXEEXT) -@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG) @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)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o ownerdrw$(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_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) ### Targets: ### @@ -116,24 +162,25 @@ all: ownerdrw$(EXEEXT) install-strip: install +ownerdrw-ownerdrw.o: $(srcdir)/ownerdrw.cpp + $(CXXC) -c -o $@ $(OWNERDRW_CXXFLAGS) $< + clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f ownerdrw$(EXEEXT) install: all -ownerdrw.o: $(srcdir)/ownerdrw.cpp - $(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 -ownerdrw_rc.o: $(srcdir)/ownerdrw.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +ownerdrw-ownerdrw_rc.o: $(srcdir)/ownerdrw.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) -ownerdrw$(EXEEXT): ownerdrw.o $(__ownerdrw___win32rc) - $(CXX) -o $@ ownerdrw.o $(__ownerdrw___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) +ownerdrw$(EXEEXT): ownerdrw-ownerdrw.o $(__ownerdrw___win32rc) + $(CXX) -o $@ ownerdrw-ownerdrw.o $(__ownerdrw___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__ownerdrw___mac_rezcmd) $(__ownerdrw___mac_setfilecmd) diff --git a/samples/png/Makefile.in b/samples/png/Makefile.in index c84b33cffb..2b26353b6a 100644 --- a/samples/png/Makefile.in +++ b/samples/png/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +PNG_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) $(CFLAGS) +PNG_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: ### -@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_PLATFORM_WIN32_1@__png___win32rc = png_rc.o -@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_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 @COND_PLATFORM_MAC_1@__png___mac_setfilecmd = $(SETFILE) -a C png$(EXEEXT) -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_PLATFORM_MAC_1@__png___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_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_PLATFORM_WIN32_1@__png___win32rc = png-png_rc.o +@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_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) -o png$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +@COND_PLATFORM_MAC_1@__png___mac_rezcmd = $(__MACOSX_RESOURCES_p) @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_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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o png$(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_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_OFFICIAL_BUILD_1@VENDORTAG = +@COND_OFFICIAL_BUILD_0@VENDORTAG = _$(VENDOR) ### Targets: ### @@ -116,26 +162,27 @@ all: png$(EXEEXT) install-strip: install +png$(EXEEXT): png-png.o $(__png___win32rc) + $(CXX) -o $@ png-png.o $(__png___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(__png___mac_rezcmd) + $(__png___mac_setfilecmd) + clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f png$(EXEEXT) install: all -png.o: $(srcdir)/png.cpp - $(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 -png_rc.o: $(srcdir)/png.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +png-png.o: $(srcdir)/png.cpp + $(CXXC) -c -o $@ $(PNG_CXXFLAGS) $< -png$(EXEEXT): png.o $(__png___win32rc) - $(CXX) -o $@ png.o $(__png___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) - $(__png___mac_rezcmd) - $(__png___mac_setfilecmd) +png-png_rc.o: $(srcdir)/png.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) uninstall: diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in index 1c862a9c5b..48ab6f9f62 100644 --- a/samples/printing/Makefile.in +++ b/samples/printing/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +PRINTING_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) $(CFLAGS) +PRINTING_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: ### -@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_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc -@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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@LIB_ZLIB = wxzlib$(WXDEBUGFLAG) +@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_PLATFORM_WIN32_1@__printing___win32rc = printing_rc.o -@COND_PLATFORM_MAC_1@__printing___mac_setfilecmd = $(SETFILE) -a C printing$(EXEEXT) +@COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib +@COND_PLATFORM_WIN32_1@__printing___win32rc = printing-printing_rc.o +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 @COND_PLATFORM_MAC_1@__printing___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_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_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) -o printing$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(srcdir)/src/zlib +@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_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) +@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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_MAC_1@__printing___mac_setfilecmd = $(SETFILE) -a C printing$(EXEEXT) +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(srcdir)/src/regex +@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o printing$(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_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) ### Targets: ### @@ -116,28 +162,29 @@ all: printing$(EXEEXT) install-strip: install -printing$(EXEEXT): printing.o $(__printing___win32rc) - $(CXX) -o $@ printing.o $(__printing___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) +printing$(EXEEXT): printing-printing.o $(__printing___win32rc) + $(CXX) -o $@ printing-printing.o $(__printing___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__printing___mac_rezcmd) $(__printing___mac_setfilecmd) clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f printing$(EXEEXT) install: all -printing.o: $(srcdir)/printing.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +printing-printing_rc.o: $(srcdir)/printing.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -uninstall: +printing-printing.o: $(srcdir)/printing.cpp + $(CXXC) -c -o $@ $(PRINTING_CXXFLAGS) $< -printing_rc.o: $(srcdir)/printing.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +uninstall: # Include dependency info, if present: diff --git a/samples/propsize/Makefile.in b/samples/propsize/Makefile.in index 84ab417433..8452fe8f99 100644 --- a/samples/propsize/Makefile.in +++ b/samples/propsize/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +PROPSIZE_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) $(CFLAGS) +PROPSIZE_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: ### -@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_PLATFORM_WIN32_1@__propsize___win32rc = propsize_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_WXUNIV_1@WXUNIVNAME = univ +@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = +@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 +@COND_PLATFORM_MAC_1@__propsize___mac_setfilecmd = $(SETFILE) -a C propsize$(EXEEXT) +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @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_PLATFORM_MAC_1@__propsize___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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@__propsize___mac_setfilecmd = $(SETFILE) -a C propsize$(EXEEXT) +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(srcdir)/src/tiff +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(srcdir)/src/jpeg @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5 -@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_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_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) -o propsize$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_WIN32_1@__propsize___win32rc = propsize-propsize_rc.o +@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_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wx25 +@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx +@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_PLATFORM_MAC_1@__propsize___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o propsize$(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_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) ### Targets: ### @@ -117,13 +163,14 @@ all: propsize$(EXEEXT) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f propsize$(EXEEXT) install: all -propsize$(EXEEXT): propsize.o $(__propsize___win32rc) - $(CXX) -o $@ propsize.o $(__propsize___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) +propsize$(EXEEXT): propsize-propsize.o $(__propsize___win32rc) + $(CXX) -o $@ propsize-propsize.o $(__propsize___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__propsize___mac_rezcmd) $(__propsize___mac_setfilecmd) @@ -131,13 +178,13 @@ distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -uninstall: +propsize-propsize.o: $(srcdir)/propsize.cpp + $(CXXC) -c -o $@ $(PROPSIZE_CXXFLAGS) $< -propsize_rc.o: $(srcdir)/propsize.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +propsize-propsize_rc.o: $(srcdir)/propsize.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) -propsize.o: $(srcdir)/propsize.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +uninstall: # Include dependency info, if present: diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in index 8dcd1863d9..9aa611567e 100644 --- a/samples/regtest/Makefile.in +++ b/samples/regtest/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +REGTEST_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) $(CFLAGS) +REGTEST_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: ### -@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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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@__INC_PNG_p_1 = --include-dir $(srcdir)/src/png +@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_PLATFORM_MAC_1@__regtest___mac_setfilecmd = $(SETFILE) -a C regtest$(EXEEXT) +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_PLATFORM_MAC_1@__regtest___mac_setfilecmd = $(SETFILE) -a C regtest$(EXEEXT) +@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_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ -@COND_PLATFORM_WIN32_1@__regtest___win32rc = regtest_rc.o -@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL @COND_PLATFORM_MAC_1@__regtest___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = --include-dir $(srcdir)/src/tiff +@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) -o regtest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG) +@COND_PLATFORM_WIN32_1@__regtest___win32rc = regtest-regtest_rc.o +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG) @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)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o regtest$(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_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) ### Targets: ### @@ -117,13 +163,14 @@ all: regtest$(EXEEXT) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f regtest$(EXEEXT) install: all -regtest$(EXEEXT): regtest.o $(__regtest___win32rc) - $(CXX) -o $@ regtest.o $(__regtest___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) +regtest$(EXEEXT): regtest-regtest.o $(__regtest___win32rc) + $(CXX) -o $@ regtest-regtest.o $(__regtest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__regtest___mac_rezcmd) $(__regtest___mac_setfilecmd) @@ -133,11 +180,11 @@ distclean: clean uninstall: -regtest.o: $(srcdir)/regtest.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +regtest-regtest_rc.o: $(srcdir)/regtest.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) -regtest_rc.o: $(srcdir)/regtest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +regtest-regtest.o: $(srcdir)/regtest.cpp + $(CXXC) -c -o $@ $(REGTEST_CXXFLAGS) $< # Include dependency info, if present: diff --git a/samples/richedit/Makefile.in b/samples/richedit/Makefile.in index fb0c6305e0..52eaee036a 100644 --- a/samples/richedit/Makefile.in +++ b/samples/richedit/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,24 +72,26 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +RICHEDIT_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) $(CFLAGS) +RICHEDIT_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: ### -@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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_PLATFORM_WIN32_1@__richedit___win32rc = richedit_rc.o -@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_PLATFORM_MAC_1@__richedit___mac_setfilecmd = $(SETFILE) -a C richedit$(EXEEXT) @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC) @COND_DEPS_TRACKING_0@CCC = $(CC) @@ -93,22 +99,62 @@ 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_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_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_PLATFORM_WIN32_1@__richedit___win32rc = richedit-richedit_rc.o +@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_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) -o richedit$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_PLATFORM_MAC_1@__richedit___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)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o richedit$(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_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) ### Targets: ### @@ -116,21 +162,22 @@ all: richedit$(EXEEXT) install-strip: install -richedit_rc.o: $(srcdir)/richedit.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +richedit-richedit.o: $(srcdir)/richedit.cpp + $(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $< install: all -richedit$(EXEEXT): richedit.o $(__richedit___win32rc) - $(CXX) -o $@ richedit.o $(__richedit___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) +richedit$(EXEEXT): richedit-richedit.o $(__richedit___win32rc) + $(CXX) -o $@ richedit-richedit.o $(__richedit___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__richedit___mac_rezcmd) $(__richedit___mac_setfilecmd) -richedit.o: $(srcdir)/richedit.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +richedit-richedit_rc.o: $(srcdir)/richedit.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f richedit$(EXEEXT) distclean: clean diff --git a/samples/rotate/Makefile.in b/samples/rotate/Makefile.in index 0b948d5c07..f60c868e25 100644 --- a/samples/rotate/Makefile.in +++ b/samples/rotate/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +ROTATE_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) $(CFLAGS) +ROTATE_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: ### -@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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_MAC_1@__rotate___mac_rezcmd = $(__MACOSX_RESOURCES_p) @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_PLATFORM_MAC_1@__rotate___mac_setfilecmd = $(SETFILE) -a C rotate$(EXEEXT) -@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_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_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) -o rotate$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@COND_PLATFORM_WIN32_1@__rotate___win32rc = rotate-rotate_rc.o +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 +@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_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wx25 +@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx +@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_PLATFORM_MAC_1@__rotate___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@INC_TIFF = $(srcdir)/src/tiff +@COND_PLATFORM_MAC_1@__rotate___mac_setfilecmd = $(SETFILE) -a C rotate$(EXEEXT) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o rotate$(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_PLATFORM_WIN32_1@__rotate___win32rc = rotate_rc.o +@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) ### Targets: ### @@ -116,27 +162,28 @@ all: rotate$(EXEEXT) install-strip: install -rotate$(EXEEXT): rotate.o $(__rotate___win32rc) - $(CXX) -o $@ rotate.o $(__rotate___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) +rotate$(EXEEXT): rotate-rotate.o $(__rotate___win32rc) + $(CXX) -o $@ rotate-rotate.o $(__rotate___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__rotate___mac_rezcmd) $(__rotate___mac_setfilecmd) -rotate.o: $(srcdir)/rotate.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f rotate$(EXEEXT) install: all -rotate_rc.o: $(srcdir)/rotate.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +rotate-rotate.o: $(srcdir)/rotate.cpp + $(CXXC) -c -o $@ $(ROTATE_CXXFLAGS) $< distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh +rotate-rotate_rc.o: $(srcdir)/rotate.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + uninstall: diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in index 306c2f3b6a..cdbeffaa98 100644 --- a/samples/sashtest/Makefile.in +++ b/samples/sashtest/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +SASHTEST_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) +SASHTEST_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) $(CFLAGS) + ### 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_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_PLATFORM_MAC_1@__sashtest___mac_setfilecmd = $(SETFILE) -a C sashtest$(EXEEXT) -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_WIN32_1@__sashtest___win32rc = sashtest_rc.o +@COND_PLATFORM_WIN32_1@__sashtest___win32rc = sashtest-sashtest_rc.o @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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_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_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) -o sashtest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_ODBC_BUILTIN@__INC_ODBC_p = -I$(srcdir)/src/odbc +@COND_PLATFORM_MAC_1@__sashtest___mac_setfilecmd = $(SETFILE) -a C sashtest$(EXEEXT) +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG) +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = --include-dir $(srcdir)/src/odbc +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG) @COND_PLATFORM_MAC_1@__sashtest___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)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o sashtest$(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_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) ### Targets: ### @@ -116,24 +162,25 @@ all: sashtest$(EXEEXT) install-strip: install +sashtest-sashtest_rc.o: $(srcdir)/sashtest.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f sashtest$(EXEEXT) install: all -sashtest_rc.o: $(srcdir)/sashtest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +sashtest-sashtest.o: $(srcdir)/sashtest.cpp + $(CXXC) -c -o $@ $(SASHTEST_CXXFLAGS) $< distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -sashtest.o: $(srcdir)/sashtest.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - -sashtest$(EXEEXT): sashtest.o $(__sashtest___win32rc) - $(CXX) -o $@ sashtest.o $(__sashtest___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) +sashtest$(EXEEXT): sashtest-sashtest.o $(__sashtest___win32rc) + $(CXX) -o $@ sashtest-sashtest.o $(__sashtest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__sashtest___mac_rezcmd) $(__sashtest___mac_setfilecmd) diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in index 5c659f8e11..f7674f066c 100644 --- a/samples/scroll/Makefile.in +++ b/samples/scroll/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,46 +72,88 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +SCROLL_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) +SCROLL_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) $(CFLAGS) + ### 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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_WIN32_1@__scroll___win32rc = scroll_rc.o +@COND_PLATFORM_WIN32_1@__scroll___win32rc = scroll-scroll_rc.o @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_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg -@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_PLATFORM_MAC_1@__scroll___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_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) -o scroll$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_PLATFORM_MAC_1@__scroll___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o scroll$(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_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_PLATFORM_MAC_1@__scroll___mac_setfilecmd = $(SETFILE) -a C scroll$(EXEEXT) ### Targets: ### @@ -116,29 +162,30 @@ all: scroll$(EXEEXT) install-strip: install +scroll-scroll_rc.o: $(srcdir)/scroll.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f scroll$(EXEEXT) install: all -scroll_rc.o: $(srcdir)/scroll.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) - -scroll.o: $(srcdir)/scroll.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - -uninstall: +scroll-scroll.o: $(srcdir)/scroll.cpp + $(CXXC) -c -o $@ $(SCROLL_CXXFLAGS) $< distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -scroll$(EXEEXT): scroll.o $(__scroll___win32rc) - $(CXX) -o $@ scroll.o $(__scroll___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) +scroll$(EXEEXT): scroll-scroll.o $(__scroll___win32rc) + $(CXX) -o $@ scroll-scroll.o $(__scroll___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__scroll___mac_rezcmd) $(__scroll___mac_setfilecmd) +uninstall: + # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d diff --git a/samples/scrollsub/Makefile.in b/samples/scrollsub/Makefile.in index dee01b52b8..2d7ebc35e0 100644 --- a/samples/scrollsub/Makefile.in +++ b/samples/scrollsub/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +SCROLLSUB_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) +SCROLLSUB_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) $(CFLAGS) + ### 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_PLATFORM_WIN32_1@__scrollsub___win32rc = scrollsub_rc.o -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ -@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_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_WIN32_1@__scrollsub___win32rc = scrollsub-scrollsub_rc.o +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_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_PLATFORM_MAC_1@__scrollsub___mac_rezcmd = $(__MACOSX_RESOURCES_p) @COND_PLATFORM_MAC_1@__scrollsub___mac_setfilecmd = $(SETFILE) -a C scrollsub$(EXEEXT) -@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@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_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) -o scrollsub$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG) +@COND_PLATFORM_MAC_1@__scrollsub___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG) @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)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o scrollsub$(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_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) ### Targets: ### @@ -116,27 +162,28 @@ all: scrollsub$(EXEEXT) install-strip: install +scrollsub-scrollsub.o: $(srcdir)/scrollsub.cpp + $(CXXC) -c -o $@ $(SCROLLSUB_CXXFLAGS) $< + clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f scrollsub$(EXEEXT) install: all -scrollsub.o: $(srcdir)/scrollsub.cpp - $(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 -scrollsub_rc.o: $(srcdir)/scrollsub.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) - -scrollsub$(EXEEXT): scrollsub.o $(__scrollsub___win32rc) - $(CXX) -o $@ scrollsub.o $(__scrollsub___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) +scrollsub$(EXEEXT): scrollsub-scrollsub.o $(__scrollsub___win32rc) + $(CXX) -o $@ scrollsub-scrollsub.o $(__scrollsub___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__scrollsub___mac_rezcmd) $(__scrollsub___mac_setfilecmd) +scrollsub-scrollsub_rc.o: $(srcdir)/scrollsub.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + uninstall: diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in index 495df45348..95623a53d4 100644 --- a/samples/shaped/Makefile.in +++ b/samples/shaped/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,77 +72,120 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +SHAPED_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) $(CFLAGS) +SHAPED_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: ### -@COND_PLATFORM_MAC_1@__shaped___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) @COND_UNICODE_1@WXUNICODEFLAG = u @COND_BUILD_DEBUG@WXDEBUGFLAG = d -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib -@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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_MAC_1@__shaped___mac_setfilecmd = $(SETFILE) -a C shaped$(EXEEXT) +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_PLATFORM_WIN32_1@__shaped___win32rc = shaped_rc.o -@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_PLATFORM_WIN32_1@__shaped___win32rc = shaped-shaped_rc.o +@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_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) -o shaped$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +@COND_PLATFORM_MAC_1@__shaped___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_PLATFORM_MAC_1@__shaped___mac_setfilecmd = $(SETFILE) -a C shaped$(EXEEXT) +@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_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) +@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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o shaped$(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_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@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) ### Targets: ### all: shaped$(EXEEXT) -shaped.o: $(srcdir)/shaped.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - install-strip: install -shaped_rc.o: $(srcdir)/shaped.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) - clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f shaped$(EXEEXT) install: all -shaped$(EXEEXT): shaped.o $(__shaped___win32rc) - $(CXX) -o $@ shaped.o $(__shaped___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) +shaped$(EXEEXT): shaped-shaped.o $(__shaped___win32rc) + $(CXX) -o $@ shaped-shaped.o $(__shaped___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__shaped___mac_rezcmd) $(__shaped___mac_setfilecmd) +shaped-shaped_rc.o: $(srcdir)/shaped.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh uninstall: +shaped-shaped.o: $(srcdir)/shaped.cpp + $(CXXC) -c -o $@ $(SHAPED_CXXFLAGS) $< + # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in index 3ade40f22d..0fc12cacb6 100644 --- a/samples/sockets/Makefile.in +++ b/samples/sockets/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +SOCKETS_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) +SOCKETS_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) $(CFLAGS) + ### Conditionally set variables: ### -@COND_PLATFORM_WIN32_1@__sockets___win32rc = sockets_rc.o +@COND_PLATFORM_WIN32_1@__sockets___win32rc = sockets-sockets_rc.o @COND_UNICODE_1@WXUNICODEFLAG = u @COND_BUILD_DEBUG@WXDEBUGFLAG = d -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib -@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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @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 sockets$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r @COND_PLATFORM_MAC_1@__sockets___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_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_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) -o sockets$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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@__sockets___mac_setfilecmd = $(SETFILE) -a C sockets$(EXEEXT) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex -@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@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) ### Targets: ### @@ -116,24 +162,25 @@ all: sockets$(EXEEXT) install-strip: install -clean: - rm -f ./*.o ./.deps/* - rm -f sockets$(EXEEXT) +sockets-sockets.o: $(srcdir)/sockets.cpp + $(CXXC) -c -o $@ $(SOCKETS_CXXFLAGS) $< install: all -sockets.o: $(srcdir)/sockets.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +sockets-sockets_rc.o: $(srcdir)/sockets.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) -sockets_rc.o: $(srcdir)/sockets.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +clean: + rm -rf ./.deps + rm -f -f ./*.o + rm -f sockets$(EXEEXT) distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -sockets$(EXEEXT): sockets.o $(__sockets___win32rc) - $(CXX) -o $@ sockets.o $(__sockets___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) +sockets$(EXEEXT): sockets-sockets.o $(__sockets___win32rc) + $(CXX) -o $@ sockets-sockets.o $(__sockets___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__sockets___mac_rezcmd) $(__sockets___mac_setfilecmd) diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in index 3404f09eb1..1c1c8c2908 100644 --- a/samples/splitter/Makefile.in +++ b/samples/splitter/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +SPLITTER_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) $(CFLAGS) +SPLITTER_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: ### -@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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ -@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@__splitter___mac_setfilecmd = $(SETFILE) -a C splitter$(EXEEXT) +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_PLATFORM_WIN32_1@__splitter___win32rc = splitter_rc.o -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg @COND_PLATFORM_MAC_1@__splitter___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-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_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) -o splitter$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_PLATFORM_MAC_1@__splitter___mac_setfilecmd = $(SETFILE) -a C splitter$(EXEEXT) +@COND_PLATFORM_WIN32_1@__splitter___win32rc = splitter-splitter_rc.o +@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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o splitter$(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_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) ### Targets: ### @@ -117,25 +163,26 @@ all: splitter$(EXEEXT) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f splitter$(EXEEXT) install: all -splitter$(EXEEXT): splitter.o $(__splitter___win32rc) - $(CXX) -o $@ splitter.o $(__splitter___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) +splitter$(EXEEXT): splitter-splitter.o $(__splitter___win32rc) + $(CXX) -o $@ splitter-splitter.o $(__splitter___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__splitter___mac_rezcmd) $(__splitter___mac_setfilecmd) +splitter-splitter_rc.o: $(srcdir)/splitter.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -splitter.o: $(srcdir)/splitter.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - -splitter_rc.o: $(srcdir)/splitter.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +splitter-splitter.o: $(srcdir)/splitter.cpp + $(CXXC) -c -o $@ $(SPLITTER_CXXFLAGS) $< uninstall: diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in index 705fcdcff8..e96771091f 100644 --- a/samples/statbar/Makefile.in +++ b/samples/statbar/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +STATBAR_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) $(CFLAGS) +STATBAR_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: ### -@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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_MAC_1@__statbar___mac_setfilecmd = $(SETFILE) -a C statbar$(EXEEXT) -@COND_PLATFORM_WIN32_1@__statbar___win32rc = statbar_rc.o +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_PLATFORM_MAC_1@__statbar___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-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_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) -o statbar$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib$(WXDEBUGFLAG) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(srcdir)/src/regex +@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@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_PLATFORM_MAC_1@__statbar___mac_setfilecmd = $(SETFILE) -a C statbar$(EXEEXT) +@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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@__statbar___win32rc = statbar-statbar_rc.o +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o statbar$(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_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) ### Targets: ### @@ -116,20 +162,15 @@ all: statbar$(EXEEXT) install-strip: install -statbar_rc.o: $(srcdir)/statbar.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) - clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f statbar$(EXEEXT) install: all -statbar.o: $(srcdir)/statbar.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - -statbar$(EXEEXT): statbar.o $(__statbar___win32rc) - $(CXX) -o $@ statbar.o $(__statbar___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) +statbar$(EXEEXT): statbar-statbar.o $(__statbar___win32rc) + $(CXX) -o $@ statbar-statbar.o $(__statbar___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__statbar___mac_rezcmd) $(__statbar___mac_setfilecmd) @@ -139,6 +180,12 @@ distclean: clean uninstall: +statbar-statbar_rc.o: $(srcdir)/statbar.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + +statbar-statbar.o: $(srcdir)/statbar.cpp + $(CXXC) -c -o $@ $(STATBAR_CXXFLAGS) $< + # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d diff --git a/samples/tab/Makefile.in b/samples/tab/Makefile.in index 698c94afb7..44c026d831 100644 --- a/samples/tab/Makefile.in +++ b/samples/tab/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +TAB_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) $(CFLAGS) +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: ### -@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_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_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @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_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_PLATFORM_WIN32_1@__tab___win32rc = tab-tab_rc.o +@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_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ -@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = --include-dir $(srcdir)/src/png @COND_PLATFORM_MAC_1@__tab___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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) -o tab$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_ODBC_BUILTIN@__INC_ODBC_p = -I$(srcdir)/src/odbc +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = --include-dir $(srcdir)/src/tiff +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex$(WXDEBUGFLAG) +@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_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG) +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = --include-dir $(srcdir)/src/odbc +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG) @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)__ $(__WXUNIV_DEFINE_p_1) -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_BUILD_DEBUG@DEBUGFLAG = on +@COND_BUILD_RELEASE@DEBUGFLAG = off +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(srcdir)/src/png @COND_PLATFORM_MAC_1@__tab___mac_setfilecmd = $(SETFILE) -a C tab$(EXEEXT) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng ### Targets: ### @@ -116,27 +162,28 @@ all: tab$(EXEEXT) install-strip: install -tab_rc.o: $(srcdir)/tab.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) - clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f tab$(EXEEXT) install: all -tab.o: $(srcdir)/tab.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +tab-tab.o: $(srcdir)/tab.cpp + $(CXXC) -c -o $@ $(TAB_CXXFLAGS) $< distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -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) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__tab___mac_rezcmd) $(__tab___mac_setfilecmd) +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_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_2) + uninstall: diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in index c4cb775712..8410747489 100644 --- a/samples/taskbar/Makefile.in +++ b/samples/taskbar/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +TASKBAR_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) $(CFLAGS) +TASKBAR_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: ### -@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_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_PLATFORM_MAC_1@__taskbar___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_PLATFORM_WIN32_1@__taskbar___win32rc = taskbar-taskbar_rc.o +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc$(WXDEBUGFLAG) @COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_PLATFORM_WIN32_1@__taskbar___win32rc = taskbar_rc.o -@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_PLATFORM_MAC_1@__taskbar___mac_setfilecmd = $(SETFILE) -a C taskbar$(EXEEXT) @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_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) -o taskbar$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_ODBC_BUILTIN@__INC_ODBC_p = -I$(srcdir)/src/odbc +@COND_PLATFORM_MAC_1@__taskbar___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex +@COND_PLATFORM_MAC_1@__taskbar___mac_setfilecmd = $(SETFILE) -a C taskbar$(EXEEXT) +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG) +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = --include-dir $(srcdir)/src/odbc +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG) @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)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o taskbar$(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_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) ### Targets: ### @@ -117,13 +163,14 @@ all: taskbar$(EXEEXT) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f taskbar$(EXEEXT) install: all -taskbar$(EXEEXT): taskbar.o $(__taskbar___win32rc) - $(CXX) -o $@ taskbar.o $(__taskbar___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) +taskbar$(EXEEXT): taskbar-taskbar.o $(__taskbar___win32rc) + $(CXX) -o $@ taskbar-taskbar.o $(__taskbar___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__taskbar___mac_rezcmd) $(__taskbar___mac_setfilecmd) @@ -131,13 +178,13 @@ distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -uninstall: +taskbar-taskbar.o: $(srcdir)/taskbar.cpp + $(CXXC) -c -o $@ $(TASKBAR_CXXFLAGS) $< -taskbar.o: $(srcdir)/taskbar.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +taskbar-taskbar_rc.o: $(srcdir)/taskbar.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) -taskbar_rc.o: $(srcdir)/taskbar.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +uninstall: # Include dependency info, if present: diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in index 7b0421d7cf..67be7ed81d 100644 --- a/samples/text/Makefile.in +++ b/samples/text/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +TEXT_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) $(CFLAGS) +TEXT_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: ### -@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_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_PLATFORM_MAC_1@__text___mac_setfilecmd = $(SETFILE) -a C text$(EXEEXT) -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @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@__text___mac_rezcmd = $(__MACOSX_RESOURCES_p) @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_PLATFORM_WIN32_1@__text___win32rc = text_rc.o -@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_PLATFORM_WIN32_1@__text___win32rc = text-text_rc.o +@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_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) -o text$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_ODBC_BUILTIN@__INC_ODBC_p = -I$(srcdir)/src/odbc +@COND_PLATFORM_MAC_1@__text___mac_setfilecmd = $(SETFILE) -a C text$(EXEEXT) +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG) +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = --include-dir $(srcdir)/src/odbc +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG) @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)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o text$(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_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) ### Targets: ### @@ -117,13 +163,17 @@ all: text$(EXEEXT) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f text$(EXEEXT) install: all -text$(EXEEXT): text.o $(__text___win32rc) - $(CXX) -o $@ text.o $(__text___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) +text-text_rc.o: $(srcdir)/text.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + +text$(EXEEXT): text-text.o $(__text___win32rc) + $(CXX) -o $@ text-text.o $(__text___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__text___mac_rezcmd) $(__text___mac_setfilecmd) @@ -131,13 +181,10 @@ distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -uninstall: - -text.o: $(srcdir)/text.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +text-text.o: $(srcdir)/text.cpp + $(CXXC) -c -o $@ $(TEXT_CXXFLAGS) $< -text_rc.o: $(srcdir)/text.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +uninstall: # Include dependency info, if present: diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in index cf252fcf12..db779f0afe 100644 --- a/samples/thread/Makefile.in +++ b/samples/thread/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +THREAD_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) +THREAD_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) $(CFLAGS) + ### 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_PLATFORM_MAC_1@__thread___mac_setfilecmd = $(SETFILE) -a C thread$(EXEEXT) -@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_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_MAC_1@__thread___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_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_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) -o thread$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_PLATFORM_MAC_1@__thread___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_PLATFORM_MAC_1@__thread___mac_setfilecmd = $(SETFILE) -a C thread$(EXEEXT) +@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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG) +@COND_PLATFORM_WIN32_1@__thread___win32rc = thread-thread_rc.o +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG) @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)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o thread$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_PLATFORM_WIN32_1@__thread___win32rc = thread_rc.o -@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@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: ### @@ -117,26 +163,27 @@ all: thread$(EXEEXT) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f thread$(EXEEXT) install: all -thread_rc.o: $(srcdir)/thread.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +thread-thread_rc.o: $(srcdir)/thread.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -thread$(EXEEXT): thread.o $(__thread___win32rc) - $(CXX) -o $@ thread.o $(__thread___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) +thread-thread.o: $(srcdir)/thread.cpp + $(CXXC) -c -o $@ $(THREAD_CXXFLAGS) $< + +thread$(EXEEXT): thread-thread.o $(__thread___win32rc) + $(CXX) -o $@ thread-thread.o $(__thread___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__thread___mac_rezcmd) $(__thread___mac_setfilecmd) -thread.o: $(srcdir)/thread.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - uninstall: diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in index 53ff356526..3256009dbf 100644 --- a/samples/toolbar/Makefile.in +++ b/samples/toolbar/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,74 +72,117 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +TOOLBAR_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) $(CFLAGS) +TOOLBAR_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: ### -@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_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ -@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_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_PLATFORM_WIN32_1@__toolbar___win32rc = toolbar_rc.o +@COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib +@COND_BUILD_DEBUG@OPTIMIZEFLAG = off +@COND_BUILD_RELEASE@OPTIMIZEFLAG = speed +@COND_PLATFORM_WIN32_1@__toolbar___win32rc = toolbar-toolbar_rc.o @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_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 +@COND_PLATFORM_MAC_1@__toolbar___mac_setfilecmd = $(SETFILE) -a C toolbar$(EXEEXT) @COND_PLATFORM_WIN32_1@DLLIMPEXT = .a @COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) -@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5 -@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ -@COND_PLATFORM_MAC_1@__toolbar___mac_setfilecmd = $(SETFILE) -a C toolbar$(EXEEXT) +@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_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) -o toolbar$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +@COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5 +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG) @COND_PLATFORM_MAC_1@__toolbar___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG) @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)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o toolbar$(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_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_OFFICIAL_BUILD_1@VENDORTAG = +@COND_OFFICIAL_BUILD_0@VENDORTAG = _$(VENDOR) ### Targets: ### all: toolbar$(EXEEXT) +toolbar$(EXEEXT): toolbar-toolbar.o $(__toolbar___win32rc) + $(CXX) -o $@ toolbar-toolbar.o $(__toolbar___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(__toolbar___mac_rezcmd) + $(__toolbar___mac_setfilecmd) + install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f toolbar$(EXEEXT) install: all -toolbar.o: $(srcdir)/toolbar.cpp - $(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 -toolbar_rc.o: $(srcdir)/toolbar.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +toolbar-toolbar.o: $(srcdir)/toolbar.cpp + $(CXXC) -c -o $@ $(TOOLBAR_CXXFLAGS) $< -toolbar$(EXEEXT): toolbar.o $(__toolbar___win32rc) - $(CXX) -o $@ toolbar.o $(__toolbar___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) - $(__toolbar___mac_rezcmd) - $(__toolbar___mac_setfilecmd) +toolbar-toolbar_rc.o: $(srcdir)/toolbar.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) uninstall: diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in index 3846052e2f..c94051a1d0 100644 --- a/samples/treectrl/Makefile.in +++ b/samples/treectrl/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,76 +72,119 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +TREECTRL_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) $(CFLAGS) +TREECTRL_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: ### -@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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(srcdir)/src/odbc +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_PLATFORM_WIN32_1@__treectrl___win32rc = treectrl_rc.o -@COND_PLATFORM_MAC_1@__treectrl___mac_setfilecmd = $(SETFILE) -a C treectrl$(EXEEXT) -@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_PLATFORM_WIN32_1@__treectrl___win32rc = treectrl-treectrl_rc.o +@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_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) -o treectrl$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_PLATFORM_MAC_1@__treectrl___mac_setfilecmd = $(SETFILE) -a C treectrl$(EXEEXT) +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = --include-dir $(srcdir)/src/odbc +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG) @COND_PLATFORM_MAC_1@__treectrl___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG) @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)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o treectrl$(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_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@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) ### Targets: ### all: treectrl$(EXEEXT) +treectrl-treectrl_rc.o: $(srcdir)/treectrl.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + install-strip: install -treectrl$(EXEEXT): treectrl.o $(__treectrl___win32rc) - $(CXX) -o $@ treectrl.o $(__treectrl___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) +treectrl$(EXEEXT): treectrl-treectrl.o $(__treectrl___win32rc) + $(CXX) -o $@ treectrl-treectrl.o $(__treectrl___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__treectrl___mac_rezcmd) $(__treectrl___mac_setfilecmd) clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f treectrl$(EXEEXT) install: all -treectrl.o: $(srcdir)/treectrl.cpp - $(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 uninstall: -treectrl_rc.o: $(srcdir)/treectrl.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +treectrl-treectrl.o: $(srcdir)/treectrl.cpp + $(CXXC) -c -o $@ $(TREECTRL_CXXFLAGS) $< # Include dependency info, if present: diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in index 7cb2ad47e6..e1f6848f93 100644 --- a/samples/typetest/Makefile.in +++ b/samples/typetest/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +TYPETEST_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) +TYPETEST_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) $(CFLAGS) + ### 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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_PLATFORM_MAC_1@__typetest___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @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 typetest$(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_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_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) -o typetest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_PLATFORM_MAC_1@__typetest___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_PLATFORM_MAC_1@__typetest___mac_setfilecmd = $(SETFILE) -a C typetest$(EXEEXT) @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) -@COND_PLATFORM_WIN32_1@__typetest___win32rc = typetest_rc.o -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex -@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_PLATFORM_WIN32_1@__typetest___win32rc = typetest-typetest_rc.o +@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) ### Targets: ### @@ -116,11 +162,9 @@ all: typetest$(EXEEXT) install-strip: install -typetest.o: $(srcdir)/typetest.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f typetest$(EXEEXT) install: all @@ -129,15 +173,18 @@ distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -typetest$(EXEEXT): typetest.o $(__typetest___win32rc) - $(CXX) -o $@ typetest.o $(__typetest___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) +uninstall: + +typetest$(EXEEXT): typetest-typetest.o $(__typetest___win32rc) + $(CXX) -o $@ typetest-typetest.o $(__typetest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__typetest___mac_rezcmd) $(__typetest___mac_setfilecmd) -typetest_rc.o: $(srcdir)/typetest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +typetest-typetest_rc.o: $(srcdir)/typetest.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) -uninstall: +typetest-typetest.o: $(srcdir)/typetest.cpp + $(CXXC) -c -o $@ $(TYPETEST_CXXFLAGS) $< # Include dependency info, if present: diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in index 7230c19427..ed9f8dc8f8 100644 --- a/samples/validate/Makefile.in +++ b/samples/validate/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,76 +72,119 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +VALIDATE_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) +VALIDATE_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) $(CFLAGS) + ### 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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @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 validate$(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_PLATFORM_MAC_1@__validate___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-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_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) -o validate$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_PLATFORM_MAC_1@__validate___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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@__validate___mac_setfilecmd = $(SETFILE) -a C validate$(EXEEXT) -@COND_PLATFORM_WIN32_1@__validate___win32rc = validate_rc.o -@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@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_PLATFORM_WIN32_1@__validate___win32rc = validate-validate_rc.o ### Targets: ### all: validate$(EXEEXT) -validate_rc.o: $(srcdir)/validate.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +validate$(EXEEXT): validate-validate.o $(__validate___win32rc) + $(CXX) -o $@ validate-validate.o $(__validate___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(__validate___mac_rezcmd) + $(__validate___mac_setfilecmd) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f validate$(EXEEXT) install: all +validate-validate_rc.o: $(srcdir)/validate.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + +uninstall: + distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -validate$(EXEEXT): validate.o $(__validate___win32rc) - $(CXX) -o $@ validate.o $(__validate___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) - $(__validate___mac_rezcmd) - $(__validate___mac_setfilecmd) - -validate.o: $(srcdir)/validate.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - -uninstall: +validate-validate.o: $(srcdir)/validate.cpp + $(CXXC) -c -o $@ $(VALIDATE_CXXFLAGS) $< # Include dependency info, if present: diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in index 26e2d0f43f..513fe4e755 100644 --- a/samples/vscroll/Makefile.in +++ b/samples/vscroll/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +VSCROLL_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) $(CFLAGS) +VSCROLL_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: ### -@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_PLATFORM_WIN32_1@__vscroll___win32rc = vscroll_rc.o -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc -@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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_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_PLATFORM_MAC_1@__vscroll___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_PLATFORM_WIN32_1@__vscroll___win32rc = vscroll-vscroll_rc.o @COND_PLATFORM_MAC_1@__vscroll___mac_setfilecmd = $(SETFILE) -a C vscroll$(EXEEXT) -@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_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_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) -o vscroll$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(srcdir)/src/zlib +@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_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) +@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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o vscroll$(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_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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) ### Targets: ### @@ -117,27 +163,28 @@ all: vscroll$(EXEEXT) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f vscroll$(EXEEXT) install: all -vscroll.o: $(srcdir)/vscroll.cpp - $(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 -vscroll_rc.o: $(srcdir)/vscroll.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +uninstall: + +vscroll-vscroll_rc.o: $(srcdir)/vscroll.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) -vscroll$(EXEEXT): vscroll.o $(__vscroll___win32rc) - $(CXX) -o $@ vscroll.o $(__vscroll___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) +vscroll$(EXEEXT): vscroll-vscroll.o $(__vscroll___win32rc) + $(CXX) -o $@ vscroll-vscroll.o $(__vscroll___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__vscroll___mac_rezcmd) $(__vscroll___mac_setfilecmd) -uninstall: +vscroll-vscroll.o: $(srcdir)/vscroll.cpp + $(CXXC) -c -o $@ $(VSCROLL_CXXFLAGS) $< # Include dependency info, if present: diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in index df5554a911..a2a229e076 100644 --- a/samples/widgets/Makefile.in +++ b/samples/widgets/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +WIDGETS_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) +WIDGETS_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) $(CFLAGS) + ### 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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib @COND_PLATFORM_MAC_1@__widgets___mac_setfilecmd = $(SETFILE) -a C widgets$(EXEEXT) -@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc -@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib -@COND_PLATFORM_MAC_1@__widgets___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_WIN32_1@__widgets___win32rc = widgets_rc.o +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_PLATFORM_WIN32_1@__widgets___win32rc = widgets-widgets_rc.o +@COND_PLATFORM_MAC_1@__widgets___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_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) -o widgets$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o widgets$(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_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) ### Targets: ### @@ -117,13 +163,17 @@ all: widgets$(EXEEXT) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f widgets$(EXEEXT) install: all -widgets$(EXEEXT): widgets.o $(__widgets___win32rc) - $(CXX) -o $@ widgets.o $(__widgets___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) +widgets-widgets.o: $(srcdir)/widgets.cpp + $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $< + +widgets$(EXEEXT): widgets-widgets.o $(__widgets___win32rc) + $(CXX) -o $@ widgets-widgets.o $(__widgets___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__widgets___mac_rezcmd) $(__widgets___mac_setfilecmd) @@ -131,13 +181,10 @@ distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -uninstall: - -widgets_rc.o: $(srcdir)/widgets.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +widgets-widgets_rc.o: $(srcdir)/widgets.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) -widgets.o: $(srcdir)/widgets.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< +uninstall: # Include dependency info, if present: diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in index a90a9a12ea..82d0e66d97 100644 --- a/samples/wizard/Makefile.in +++ b/samples/wizard/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,47 +72,89 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +WIZARD_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) $(CFLAGS) +WIZARD_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: ### -@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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@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 +@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg @COND_PLATFORM_MAC_1@__wizard___mac_setfilecmd = $(SETFILE) -a C wizard$(EXEEXT) -@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc -@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib -@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@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_WIN32_1@__wizard___win32rc = wizard_rc.o +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_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_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__wizard___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@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_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) -o wizard$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@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_PLATFORM_WIN32_1@__wizard___win32rc = wizard-wizard_rc.o +@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_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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o wizard$(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_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) ### Targets: ### @@ -116,28 +162,29 @@ all: wizard$(EXEEXT) install-strip: install -clean: - rm -f ./*.o ./.deps/* - rm -f wizard$(EXEEXT) +wizard-wizard.o: $(srcdir)/wizard.cpp + $(CXXC) -c -o $@ $(WIZARD_CXXFLAGS) $< install: all -uninstall: +wizard-wizard_rc.o: $(srcdir)/wizard.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) + +clean: + rm -rf ./.deps + rm -f -f ./*.o + rm -f wizard$(EXEEXT) distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -wizard$(EXEEXT): wizard.o $(__wizard___win32rc) - $(CXX) -o $@ wizard.o $(__wizard___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) +wizard$(EXEEXT): wizard-wizard.o $(__wizard___win32rc) + $(CXX) -o $@ wizard-wizard.o $(__wizard___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__wizard___mac_rezcmd) $(__wizard___mac_setfilecmd) -wizard.o: $(srcdir)/wizard.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - -wizard_rc.o: $(srcdir)/wizard.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +uninstall: # Include dependency info, if present: diff --git a/samples/wxtest/Makefile.in b/samples/wxtest/Makefile.in index ab75536243..704ba326b4 100644 --- a/samples/wxtest/Makefile.in +++ b/samples/wxtest/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,71 +72,114 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +WXTEST_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) $(CFLAGS) +WXTEST_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: ### -@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_PLATFORM_MAC_1@__wxtest___mac_setfilecmd = $(SETFILE) -a C wxtest$(EXEEXT) -@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@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 @COND_PLATFORM_MAC_1@__wxtest___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg +@COND_PLATFORM_WIN32_1@__wxtest___win32rc = wxtest-wxtest_rc.o @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc -@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_PLATFORM_WIN32_1@__wxtest___win32rc = wxtest_rc.o -@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_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@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_PLATFORM_MAC_1@__wxtest___mac_setfilecmd = $(SETFILE) -a C wxtest$(EXEEXT) +@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_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) -o wxtest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@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_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_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_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_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_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_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o wxtest$(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_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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) ### Targets: ### all: wxtest$(EXEEXT) -wxtest.o: $(srcdir)/wxtest.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< - install-strip: install -wxtest_rc.o: $(srcdir)/wxtest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) +wxtest-wxtest_rc.o: $(srcdir)/wxtest.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(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) --include-dir $(srcdir) $(__DLLFLAG_p_2) clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f wxtest$(EXEEXT) install: all -wxtest$(EXEEXT): wxtest.o $(__wxtest___win32rc) - $(CXX) -o $@ wxtest.o $(__wxtest___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) +wxtest$(EXEEXT): wxtest-wxtest.o $(__wxtest___win32rc) + $(CXX) -o $@ wxtest-wxtest.o $(__wxtest___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__wxtest___mac_rezcmd) $(__wxtest___mac_setfilecmd) +wxtest-wxtest.o: $(srcdir)/wxtest.cpp + $(CXXC) -c -o $@ $(WXTEST_CXXFLAGS) $< + distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh diff --git a/src/xrc/Makefile.in b/src/xrc/Makefile.in index 19d1a54952..13c5eb4fb5 100644 --- a/src/xrc/Makefile.in +++ b/src/xrc/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,28 @@ 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@ +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@ CFLAGS = @CFLAGS@ @@ -68,223 +72,268 @@ USE_SOVERLINUX = @USE_SOVERLINUX@ top_builddir = @top_builddir@ SHARED_LD_CC = @SHARED_LD_CC@ +### Variables: ### + +XRCDLL_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) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) +XRCDLL_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) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $(PIC_FLAG) +XRCLIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(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) $(__DEBUGFLAG_5) $(__OPTIMIZEFLAG_7) -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) +XRCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(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) $(__DEBUGFLAG_5) $(__OPTIMIZEFLAG_7) -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) + ### 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_LIBPNG_BUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@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 +@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib +@COND_BUILD_DEBUG@OPTIMIZEFLAG = off +@COND_BUILD_RELEASE@OPTIMIZEFLAG = speed +@COND_SHARED_1@__install_xrcdll___depname = install_xrcdll @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC) @COND_DEPS_TRACKING_0@CCC = $(CC) -@COND_USE_SOVERSION_1_PLATFORM_MACOSX_0@__xrcdll___targetsuf2 = .$(SO_SUFFIX).0 -@COND_USE_SOVERSION_1_PLATFORM_MACOSX_1@__xrcdll___targetsuf2 = .0.$(SO_SUFFIX) -@COND_USE_SOVERSION_1_PLATFORM_MACOSX_0@__xrcdll___targetsuf3 = .$(SO_SUFFIX).0.0.0 -@COND_USE_SOVERSION_1_PLATFORM_MACOSX_1@__xrcdll___targetsuf3 = .0.0.0.$(SO_SUFFIX) +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__xrcdll___targetsuf2 = .$(SO_SUFFIX).0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf2 = .0.$(SO_SUFFIX) +@COND_USE_SOVERSION_0@__xrcdll___targetsuf2 = .$(SO_SUFFIX) +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc$(WXDEBUGFLAG) @COND_PLATFORM_WIN32_1@DLLIMPEXT = .a @COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) @COND_SHARED_0@__xrclib___depname = $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_cmd = rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) -@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_cmd = rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) +@COND_BUILD_DEBUG@__OPTIMIZEFLAG_2 = +@COND_BUILD_RELEASE@__OPTIMIZEFLAG_2 = +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__xrcdll___targetsuf3 = .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf3 = .0.0.0.$(SO_SUFFIX) +@COND_USE_SOVERSION_0@__xrcdll___targetsuf3 = .$(SO_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_HTML_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(srcdir)/src/png @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_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd = rm -f libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2); \ -@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2) libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) -@COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2) -@COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3) -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = -I$(srcdir)/src/regex +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = -I$(srcdir)/src/tiff +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = -I$(srcdir)/src/png +@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_BUILD_DEBUG@__DEBUGFLAG_5 = +@COND_BUILD_RELEASE@__DEBUGFLAG_5 = +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = -I$(srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) +@COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = -I$(srcdir)/src/jpeg +@COND_BUILD_DEBUG@__OPTIMIZEFLAG_7 = +@COND_BUILD_RELEASE@__OPTIMIZEFLAG_7 = +@COND_PLATFORM_MACOSX_1@__xrcdll___macver = -compatibility_version 2.5 -current_version 2.5.0 +@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_MACOSX_1@__xrcdll___macver = -compatibility_version 2.5 -current_version 2.5.0 -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@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_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) +@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)25 +@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) +@COND_WXUSE_LIBPNG_BUILTIN@INC_PNG = $(srcdir)/src/png +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(srcdir)/src/odbc +@COND_PLATFORM_WIN32_1@__xrcdll___importlib = -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__xrcdll___importlib = -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) @COND_WXUNIV_1@WXUNIVNAME = univ -@COND_PLATFORM_MACOSX_1@__xrcdll___macinstnamecmd = -install_name $(libdir)/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib -@COND_SHARED_1@__install_xrcdll___depname = install_xrcdll +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib$(WXDEBUGFLAG) +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(srcdir)/src/regex @COND_SHARED_0@__install_xrclib___depname = install_xrclib -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng -@COND_PLATFORM_WIN32_1@__xrcdll___importlib = -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) -@COND_PLATFORM_WIN32_1@__xrcdll___importlib = -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) -@COND_MONOLITHIC_0@__WXLIB_HTML_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 +@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wx25 +@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx +@COND_BUILD_DEBUG@__DEBUGFLAG_1 = +@COND_BUILD_RELEASE@__DEBUGFLAG_1 = +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@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_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = -I$(srcdir)/src/odbc +@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd = rm -f libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \ +@COND_USE_SOSYMLINKS_1@ $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5 -@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = -D__WXUNIVERSAL__ -@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ -@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = -D__WXUNIVERSAL__ +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex +@COND_BUILD_DEBUG@__DEBUGFLAG_0 = +@COND_BUILD_RELEASE@__DEBUGFLAG_0 = +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG) +@COND_PLATFORM_MACOSX_1@__xrcdll___macinstnamecmd = -install_name $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = --include-dir $(srcdir)/src/odbc +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG) +@COND_BUILD_DEBUG@__DEBUGFLAG_6 = +@COND_BUILD_RELEASE@__DEBUGFLAG_6 = @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) -@COND_SHARED_1@__xrcdll___depname = $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3) -@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_BUILD_DEBUG@DEBUGFLAG = on +@COND_BUILD_RELEASE@DEBUGFLAG = off +@COND_SHARED_1@__xrcdll___depname = $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex$(WXDEBUGFLAG) +@COND_OFFICIAL_BUILD_1@VENDORTAG = +@COND_OFFICIAL_BUILD_0@VENDORTAG = _$(VENDOR) ### Targets: ### all: $(__xrcdll___depname) $(__xrclib___depname) install-strip: install - $(STRIP) $(libdir)/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3) + $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) -xh_notbk.o: $(srcdir)/xh_notbk.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_toolb.o: $(srcdir)/xh_toolb.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xh_listb.o: $(srcdir)/xh_listb.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_tree.o: $(srcdir)/xh_tree.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrclib-xh_listc.o: $(srcdir)/xh_listc.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< +xrcdll-xh_combo.o: $(srcdir)/xh_combo.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xh_stlin.o: $(srcdir)/xh_stlin.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xmlparse.o: $(srcdir)/expat/xmlparse/xmlparse.c + $(CCC) -c -o $@ $(XRCDLL_CFLAGS) $< -xh_toolb.o: $(srcdir)/xh_toolb.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_radbt.o: $(srcdir)/xh_radbt.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xmlparse.o: $(srcdir)/expat/xmlparse/xmlparse.c - $(CCC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $(PIC_FLAG) $< +xrcdll-xh_stbmp.o: $(srcdir)/xh_stbmp.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrclib-xh_html.o: $(srcdir)/xh_html.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xh_sttxt.o: $(srcdir)/xh_sttxt.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xh_gdctl.o: $(srcdir)/xh_gdctl.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a: xrclib-xmlparse.o xrclib-xmltok.o xrclib-xmlrole.o xrclib-xml.o xrclib-xmlres.o xrclib-xh_bmp.o xrclib-xh_bmpbt.o xrclib-xh_bttn.o xrclib-xh_cald.o xrclib-xh_chckb.o xrclib-xh_chckl.o xrclib-xh_choic.o xrclib-xh_combo.o xrclib-xh_dlg.o xrclib-xh_frame.o xrclib-xh_gauge.o xrclib-xh_gdctl.o xrclib-xh_html.o xrclib-xh_listb.o xrclib-xh_listc.o xrclib-xh_menu.o xrclib-xh_notbk.o xrclib-xh_panel.o xrclib-xh_radbt.o xrclib-xh_radbx.o xrclib-xh_scrol.o xrclib-xh_scwin.o xrclib-xh_sizer.o xrclib-xh_slidr.o xrclib-xh_spin.o xrclib-xh_split.o xrclib-xh_stbmp.o xrclib-xh_stbox.o xrclib-xh_stlin.o xrclib-xh_sttxt.o xrclib-xh_text.o xrclib-xh_toolb.o xrclib-xh_tree.o xrclib-xh_unkwn.o xrclib-xh_wizrd.o xrclib-xmlrsall.o - rm -f $@ - $(AR) rcu $@ xrclib-xmlparse.o xrclib-xmltok.o xrclib-xmlrole.o xrclib-xml.o xrclib-xmlres.o xrclib-xh_bmp.o xrclib-xh_bmpbt.o xrclib-xh_bttn.o xrclib-xh_cald.o xrclib-xh_chckb.o xrclib-xh_chckl.o xrclib-xh_choic.o xrclib-xh_combo.o xrclib-xh_dlg.o xrclib-xh_frame.o xrclib-xh_gauge.o xrclib-xh_gdctl.o xrclib-xh_html.o xrclib-xh_listb.o xrclib-xh_listc.o xrclib-xh_menu.o xrclib-xh_notbk.o xrclib-xh_panel.o xrclib-xh_radbt.o xrclib-xh_radbx.o xrclib-xh_scrol.o xrclib-xh_scwin.o xrclib-xh_sizer.o xrclib-xh_slidr.o xrclib-xh_spin.o xrclib-xh_split.o xrclib-xh_stbmp.o xrclib-xh_stbox.o xrclib-xh_stlin.o xrclib-xh_sttxt.o xrclib-xh_text.o xrclib-xh_toolb.o xrclib-xh_tree.o xrclib-xh_unkwn.o xrclib-xh_wizrd.o xrclib-xmlrsall.o - $(RANLIB) $@ +@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a: xrclib-xmlparse.o xrclib-xmltok.o xrclib-xmlrole.o xrclib-xml.o xrclib-xmlres.o xrclib-xh_bmp.o xrclib-xh_bmpbt.o xrclib-xh_bttn.o xrclib-xh_cald.o xrclib-xh_chckb.o xrclib-xh_chckl.o xrclib-xh_choic.o xrclib-xh_combo.o xrclib-xh_dlg.o xrclib-xh_frame.o xrclib-xh_gauge.o xrclib-xh_gdctl.o xrclib-xh_html.o xrclib-xh_listb.o xrclib-xh_listc.o xrclib-xh_menu.o xrclib-xh_notbk.o xrclib-xh_panel.o xrclib-xh_radbt.o xrclib-xh_radbx.o xrclib-xh_scrol.o xrclib-xh_scwin.o xrclib-xh_sizer.o xrclib-xh_slidr.o xrclib-xh_spin.o xrclib-xh_split.o xrclib-xh_stbmp.o xrclib-xh_stbox.o xrclib-xh_stlin.o xrclib-xh_sttxt.o xrclib-xh_text.o xrclib-xh_toolb.o xrclib-xh_tree.o xrclib-xh_unkwn.o xrclib-xh_wizrd.o xrclib-xmlrsall.o +@COND_SHARED_0@ rm -f $@ +@COND_SHARED_0@ $(AR) rcu $@ xrclib-xmlparse.o xrclib-xmltok.o xrclib-xmlrole.o xrclib-xml.o xrclib-xmlres.o xrclib-xh_bmp.o xrclib-xh_bmpbt.o xrclib-xh_bttn.o xrclib-xh_cald.o xrclib-xh_chckb.o xrclib-xh_chckl.o xrclib-xh_choic.o xrclib-xh_combo.o xrclib-xh_dlg.o xrclib-xh_frame.o xrclib-xh_gauge.o xrclib-xh_gdctl.o xrclib-xh_html.o xrclib-xh_listb.o xrclib-xh_listc.o xrclib-xh_menu.o xrclib-xh_notbk.o xrclib-xh_panel.o xrclib-xh_radbt.o xrclib-xh_radbx.o xrclib-xh_scrol.o xrclib-xh_scwin.o xrclib-xh_sizer.o xrclib-xh_slidr.o xrclib-xh_spin.o xrclib-xh_split.o xrclib-xh_stbmp.o xrclib-xh_stbox.o xrclib-xh_stlin.o xrclib-xh_sttxt.o xrclib-xh_text.o xrclib-xh_toolb.o xrclib-xh_tree.o xrclib-xh_unkwn.o xrclib-xh_wizrd.o xrclib-xmlrsall.o +@COND_SHARED_0@ $(RANLIB) $@ -xh_sttxt.o: $(srcdir)/xh_sttxt.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrclib-xh_radbx.o: $(srcdir)/xh_radbx.cpp + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib-xh_menu.o: $(srcdir)/xh_menu.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< +xrcdll-xh_spin.o: $(srcdir)/xh_spin.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrclib-xh_text.o: $(srcdir)/xh_text.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< +xrcdll-xh_slidr.o: $(srcdir)/xh_slidr.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xh_html.o: $(srcdir)/xh_html.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrclib-xh_text.o: $(srcdir)/xh_text.cpp + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xh_unkwn.o: $(srcdir)/xh_unkwn.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_gdctl.o: $(srcdir)/xh_gdctl.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_radbx.o: $(srcdir)/xh_radbx.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrclib-xh_cald.o: $(srcdir)/xh_cald.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< - -xrclib-xh_listb.o: $(srcdir)/xh_listb.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_split.o: $(srcdir)/xh_split.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrclib-xh_notbk.o: $(srcdir)/xh_notbk.cpp + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xh_spin.o: $(srcdir)/xh_spin.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrclib-xmlparse.o: $(srcdir)/expat/xmlparse/xmlparse.c - $(CCC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $< + $(CCC) -c -o $@ $(XRCLIB_CFLAGS) $< xrclib-xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xh_split.o: $(srcdir)/xh_split.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< - -xh_bttn.o: $(srcdir)/xh_bttn.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_listc.o: $(srcdir)/xh_listc.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_bmp.o: $(srcdir)/xh_bmp.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xmlrole.o: $(srcdir)/expat/xmltok/xmlrole.c - $(CCC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $(PIC_FLAG) $< +xrcdll-xh_notbk.o: $(srcdir)/xh_notbk.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xh_scwin.o: $(srcdir)/xh_scwin.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_gdctl.o: $(srcdir)/xh_gdctl.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xh_spin.o: $(srcdir)/xh_spin.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< - -xh_stbox.o: $(srcdir)/xh_stbox.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrclib-xh_toolb.o: $(srcdir)/xh_toolb.cpp + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xh_frame.o: $(srcdir)/xh_frame.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xh_chckb.o: $(srcdir)/xh_chckb.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_choic.o: $(srcdir)/xh_choic.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_stlin.o: $(srcdir)/xh_stlin.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xmlres.o: $(srcdir)/xmlres.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< - -xh_dlg.o: $(srcdir)/xh_dlg.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< - -xmltok.o: $(srcdir)/expat/xmltok/xmltok.c - $(CCC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $(PIC_FLAG) $< +xrcdll-xh_wizrd.o: $(srcdir)/xh_wizrd.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrclib-xh_stbmp.o: $(srcdir)/xh_stbmp.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xh_wizrd.o: $(srcdir)/xh_wizrd.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< - -xh_radbx.o: $(srcdir)/xh_radbx.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xh_panel.o: $(srcdir)/xh_panel.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< - -xh_wizrd.o: $(srcdir)/xh_wizrd.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xmltok.o: $(srcdir)/expat/xmltok/xmltok.c - $(CCC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $< + $(CCC) -c -o $@ $(XRCLIB_CFLAGS) $< -xh_combo.o: $(srcdir)/xh_combo.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_scrol.o: $(srcdir)/xh_scrol.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -$(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3): xmlparse.o xmltok.o xmlrole.o xml.o xmlres.o xh_bmp.o xh_bmpbt.o xh_bttn.o xh_cald.o xh_chckb.o xh_chckl.o xh_choic.o xh_combo.o xh_dlg.o xh_frame.o xh_gauge.o xh_gdctl.o xh_html.o xh_listb.o xh_listc.o xh_menu.o xh_notbk.o xh_panel.o xh_radbt.o xh_radbx.o xh_scrol.o xh_scwin.o xh_sizer.o xh_slidr.o xh_spin.o xh_split.o xh_stbmp.o xh_stbox.o xh_stlin.o xh_sttxt.o xh_text.o xh_toolb.o xh_tree.o xh_unkwn.o xh_wizrd.o xmlrsall.o - $(SHARED_LD_CXX) $@ xmlparse.o xmltok.o xmlrole.o xml.o xmlres.o xh_bmp.o xh_bmpbt.o xh_bttn.o xh_cald.o xh_chckb.o xh_chckl.o xh_choic.o xh_combo.o xh_dlg.o xh_frame.o xh_gauge.o xh_gdctl.o xh_html.o xh_listb.o xh_listc.o xh_menu.o xh_notbk.o xh_panel.o xh_radbt.o xh_radbx.o xh_scrol.o xh_scwin.o xh_sizer.o xh_slidr.o xh_spin.o xh_split.o xh_stbmp.o xh_stbox.o xh_stlin.o xh_sttxt.o xh_text.o xh_toolb.o xh_tree.o xh_unkwn.o xh_wizrd.o xmlrsall.o $(__xrcdll___importlib) -L$(top_builddir)lib $(__xrcdll___importlib) $(__xrcdll___macinstnamecmd) $(__xrcdll___soname_flags) $(__xrcdll___macver) $(__WXLIB_MONO_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__WXLIB_CORE_p) $(__WXLIB_HTML_p) - $(__xrcdll___so_symlinks_cmd) +@COND_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): xrcdll-xmlparse.o xrcdll-xmltok.o xrcdll-xmlrole.o xrcdll-xml.o xrcdll-xmlres.o xrcdll-xh_bmp.o xrcdll-xh_bmpbt.o xrcdll-xh_bttn.o xrcdll-xh_cald.o xrcdll-xh_chckb.o xrcdll-xh_chckl.o xrcdll-xh_choic.o xrcdll-xh_combo.o xrcdll-xh_dlg.o xrcdll-xh_frame.o xrcdll-xh_gauge.o xrcdll-xh_gdctl.o xrcdll-xh_html.o xrcdll-xh_listb.o xrcdll-xh_listc.o xrcdll-xh_menu.o xrcdll-xh_notbk.o xrcdll-xh_panel.o xrcdll-xh_radbt.o xrcdll-xh_radbx.o xrcdll-xh_scrol.o xrcdll-xh_scwin.o xrcdll-xh_sizer.o xrcdll-xh_slidr.o xrcdll-xh_spin.o xrcdll-xh_split.o xrcdll-xh_stbmp.o xrcdll-xh_stbox.o xrcdll-xh_stlin.o xrcdll-xh_sttxt.o xrcdll-xh_text.o xrcdll-xh_toolb.o xrcdll-xh_tree.o xrcdll-xh_unkwn.o xrcdll-xh_wizrd.o xrcdll-xmlrsall.o +@COND_SHARED_1@ $(SHARED_LD_CXX) $@ xrcdll-xmlparse.o xrcdll-xmltok.o xrcdll-xmlrole.o xrcdll-xml.o xrcdll-xmlres.o xrcdll-xh_bmp.o xrcdll-xh_bmpbt.o xrcdll-xh_bttn.o xrcdll-xh_cald.o xrcdll-xh_chckb.o xrcdll-xh_chckl.o xrcdll-xh_choic.o xrcdll-xh_combo.o xrcdll-xh_dlg.o xrcdll-xh_frame.o xrcdll-xh_gauge.o xrcdll-xh_gdctl.o xrcdll-xh_html.o xrcdll-xh_listb.o xrcdll-xh_listc.o xrcdll-xh_menu.o xrcdll-xh_notbk.o xrcdll-xh_panel.o xrcdll-xh_radbt.o xrcdll-xh_radbx.o xrcdll-xh_scrol.o xrcdll-xh_scwin.o xrcdll-xh_sizer.o xrcdll-xh_slidr.o xrcdll-xh_spin.o xrcdll-xh_split.o xrcdll-xh_stbmp.o xrcdll-xh_stbox.o xrcdll-xh_stlin.o xrcdll-xh_sttxt.o xrcdll-xh_text.o xrcdll-xh_toolb.o xrcdll-xh_tree.o xrcdll-xh_unkwn.o xrcdll-xh_wizrd.o xrcdll-xmlrsall.o $(LDFLAGS) $(__xrcdll___importlib) -L$(top_builddir)lib $(__xrcdll___macinstnamecmd) $(__DEBUGFLAG_1) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(__xrcdll___macver) $(__WXLIB_MONO_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__WXLIB_CORE_p) $(__WXLIB_HTML_p) +@COND_SHARED_1@ $(__xrcdll___so_symlinks_cmd) xrclib-xh_slidr.o: $(srcdir)/xh_slidr.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +xrcdll-xh_listc.o: $(srcdir)/xh_listc.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrclib-xh_chckl.o: $(srcdir)/xh_chckl.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_text.o: $(srcdir)/xh_text.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xmlres.o: $(srcdir)/xmlres.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrclib-xh_combo.o: $(srcdir)/xh_combo.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_sizer.o: $(srcdir)/xh_sizer.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_stbox.o: $(srcdir)/xh_stbox.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xh_unkwn.o: $(srcdir)/xh_unkwn.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_frame.o: $(srcdir)/xh_frame.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +xrcdll-xh_dlg.o: $(srcdir)/xh_dlg.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< install: all $(__install_xrcdll___depname) $(__install_xrclib___depname) $(INSTALL_DIR) $(includedir) @@ -299,123 +348,140 @@ distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh -xh_tree.o: $(srcdir)/xh_tree.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrclib-xh_gauge.o: $(srcdir)/xh_gauge.cpp + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +xrcdll-xh_scwin.o: $(srcdir)/xh_scwin.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xh_stbmp.o: $(srcdir)/xh_stbmp.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_chckb.o: $(srcdir)/xh_chckb.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrclib-xh_bttn.o: $(srcdir)/xh_bttn.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +xrcdll-xh_bttn.o: $(srcdir)/xh_bttn.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +xrcdll-xh_choic.o: $(srcdir)/xh_choic.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +xrcdll-xh_menu.o: $(srcdir)/xh_menu.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrclib-xh_tree.o: $(srcdir)/xh_tree.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -install_xrcdll: - $(INSTALL_DIR) $(libdir) - $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(libdir) - $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3) $(libdir) - (cd $(libdir) ; $(__xrcdll___so_symlinks_inst_cmd)) +@COND_SHARED_1@install_xrcdll: +@COND_SHARED_1@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(libdir) +@COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(libdir) +@COND_SHARED_1@ (cd $(libdir) ; $(__xrcdll___so_symlinks_inst_cmd)) -xrclib-xmlrole.o: $(srcdir)/expat/xmltok/xmlrole.c - $(CCC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $< +xrcdll-xml.o: $(srcdir)/xml.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xh_slidr.o: $(srcdir)/xh_slidr.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrclib-xmlrole.o: $(srcdir)/expat/xmltok/xmlrole.c + $(CCC) -c -o $@ $(XRCLIB_CFLAGS) $< -xh_scrol.o: $(srcdir)/xh_scrol.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_cald.o: $(srcdir)/xh_cald.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xh_cald.o: $(srcdir)/xh_cald.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_text.o: $(srcdir)/xh_text.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrclib-xh_scwin.o: $(srcdir)/xh_scwin.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< - -xh_gauge.o: $(srcdir)/xh_gauge.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xh_scrol.o: $(srcdir)/xh_scrol.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_bmp.o: $(srcdir)/xh_bmp.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< - -xrclib-xh_radbx.o: $(srcdir)/xh_radbx.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< +xrclib-xh_listc.o: $(srcdir)/xh_listc.cpp + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -install_xrclib: - $(INSTALL_DIR) $(libdir) - $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a $(libdir) +xrcdll-xh_sizer.o: $(srcdir)/xh_sizer.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xh_menu.o: $(srcdir)/xh_menu.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +@COND_SHARED_0@install_xrclib: +@COND_SHARED_0@ $(INSTALL_DIR) $(libdir) +@COND_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a $(libdir) -xml.o: $(srcdir)/xml.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_html.o: $(srcdir)/xh_html.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrclib-xh_toolb.o: $(srcdir)/xh_toolb.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< +xrcdll-xmltok.o: $(srcdir)/expat/xmltok/xmltok.c + $(CCC) -c -o $@ $(XRCDLL_CFLAGS) $< -xh_frame.o: $(srcdir)/xh_frame.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +clean: + rm -rf ./.deps + rm -f -f ./*.o + rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) + rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a xrclib-xh_choic.o: $(srcdir)/xh_choic.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xml.o: $(srcdir)/xml.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +xrcdll-xh_gauge.o: $(srcdir)/xh_gauge.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrclib-xh_bmp.o: $(srcdir)/xh_bmp.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_radbt.o: $(srcdir)/xh_radbt.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_split.o: $(srcdir)/xh_split.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< xrclib-xh_stbox.o: $(srcdir)/xh_stbox.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xmlrsall.o: $(srcdir)/xmlrsall.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xmlrsall.o: $(srcdir)/xmlrsall.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< + +xrclib-xh_stlin.o: $(srcdir)/xh_stlin.cpp + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xh_sizer.o: $(srcdir)/xh_sizer.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_panel.o: $(srcdir)/xh_panel.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xh_sttxt.o: $(srcdir)/xh_sttxt.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrclib-xh_radbt.o: $(srcdir)/xh_radbt.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< +xrcdll-xh_panel.o: $(srcdir)/xh_panel.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrclib-xh_gauge.o: $(srcdir)/xh_gauge.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< +xrclib-xh_radbt.o: $(srcdir)/xh_radbt.cpp + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< xrclib-xmlrsall.o: $(srcdir)/xmlrsall.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xrclib-xh_notbk.o: $(srcdir)/xh_notbk.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< +xrcdll-xh_chckl.o: $(srcdir)/xh_chckl.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrclib-xh_dlg.o: $(srcdir)/xh_dlg.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< +xrcdll-xh_unkwn.o: $(srcdir)/xh_unkwn.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -clean: - rm -f ./*.o ./.deps/* - rm -f $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2) - rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a +xrcdll-xh_listb.o: $(srcdir)/xh_listb.cpp + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -xrclib-xh_stlin.o: $(srcdir)/xh_stlin.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< +xrclib-xh_listb.o: $(srcdir)/xh_listb.cpp + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< + +xrclib-xh_dlg.o: $(srcdir)/xh_dlg.cpp + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_chckb.o: $(srcdir)/xh_chckb.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrclib-xh_menu.o: $(srcdir)/xh_menu.cpp + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< -xh_chckl.o: $(srcdir)/xh_chckl.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $< +xrcdll-xmlrole.o: $(srcdir)/expat/xmltok/xmlrole.c + $(CCC) -c -o $@ $(XRCDLL_CFLAGS) $< xrclib-xmlres.o: $(srcdir)/xmlres.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $< uninstall: -- 2.45.2