updated

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 97362ac2d07ed71746057b0bf0c4331eb5213754..9736f194befebe9687dc964269f8af0d041af370 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -103,7 +103,7 @@ SHARED_LD_CC = @SHARED_LD_CC@
 @COND_PLATFORM_WIN321@    wx/msw/winundef.h
 @COND_TOOLKITMAC@__macos_res___depname = lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_USE_SOVERSION1_PLATFORM_MACOSX0@__monodll___targetnamesuf = .$(SO_SUFFIX).0.0.0
 @COND_PLATFORM_WIN321@    wx/msw/winundef.h
 @COND_TOOLKITMAC@__macos_res___depname = lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
 @COND_USE_SOVERSION1_PLATFORM_MACOSX0@__monodll___targetnamesuf = .$(SO_SUFFIX).0.0.0

-@COND_USE_SOVERSION1_PLATFORM_MACOSX1@__monodll___targetnamesuf = 0.0.0.$(SO_SUFFIX)
+@COND_USE_SOVERSION1_PLATFORM_MACOSX1@__monodll___targetnamesuf = .0.0.0.$(SO_SUFFIX)

 @COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_LIBR = $(top_builddir)/lib/libwxtiff.a
 @COND_WXUSE_LIBPNGBUILTIN@__LIB_PNG_LIBR = $(top_builddir)/lib/libwxpng.a
 @COND_TOOLKITMAC@__macos_res_install___depname = macos-res-install
 @COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_LIBR = $(top_builddir)/lib/libwxtiff.a
 @COND_WXUSE_LIBPNGBUILTIN@__LIB_PNG_LIBR = $(top_builddir)/lib/libwxpng.a
 @COND_TOOLKITMAC@__macos_res_install___depname = macos-res-install

diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in
index 2bb59c10614d4a18ec2a76c7d128f2b27b447d09..5107bcb3c8a3e0d7c23d4649ffd33857d28974b8 100644 (file)
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -1,26 +1,135 @@
-#
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1998
-# Updated:     
-# Copyright:   (c) 1998 Julian Smart
-#
-# "%W% %G%"
-#
-# Makefile for minimal example (UNIX).
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================

 
 

-top_srcdir = @top_srcdir@/..
-top_builddir = ../..
-program_dir = samples/minimal

 
 

-PROGRAM=minimal
+@MAKE_SET@

 
 

-OBJECTS =$(PROGRAM).o
-DEPFILES=$(PROGRAM).d
+CPPFLAGS = @CPPFLAGS@
+INSTALL_DIR = @INSTALL_DIR@
+DEREZ = @DEREZ@
+wxUSE_ZLIB = @wxUSE_ZLIB@
+MONOLITHIC = @MONOLITHIC@
+SONAME_FLAG = @SONAME_FLAG@
+CXXFLAGS = @CXXFLAGS@
+prefix = @prefix@
+INSTALL = @INSTALL@
+EXEEXT = @EXEEXT@
+RESCOMP = @RESCOMP@
+PLATFORM_MAC = @PLATFORM_MAC@
+USE_SOVERSION = @USE_SOVERSION@
+SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+wxUSE_LIBPNG = @wxUSE_LIBPNG@
+wxUSE_LIBTIFF = @wxUSE_LIBTIFF@
+exec_prefix = @exec_prefix@
+libdir = @libdir@
+TOOLKIT = @TOOLKIT@
+EXTRALIBS = @EXTRALIBS@
+CC = @CC@
+datadir = @datadir@
+PLATFORM_MSDOS = @PLATFORM_MSDOS@
+SETFILE = @SETFILE@
+UNICODE = @UNICODE@
+STRIP = @STRIP@
+USE_SOVERSOLARIS = @USE_SOVERSOLARIS@
+srcdir = @srcdir@
+wxUSE_ODBC = @wxUSE_ODBC@
+wxUSE_REGEX = @wxUSE_REGEX@
+bindir = @bindir@
+PIC_FLAG = @PIC_FLAG@
+USE_SOSYMLINKS = @USE_SOSYMLINKS@
+wxUSE_LIBJPEG = @wxUSE_LIBJPEG@
+INSTALL_DATA = @INSTALL_DATA@
+USE_GUI = @USE_GUI@
+PLATFORM_UNIX = @PLATFORM_UNIX@
+RANLIB = @RANLIB@
+SO_SUFFIX = @SO_SUFFIX@
+top_srcdir = @top_srcdir@
+AR = @AR@
+BUILD = @BUILD@
+PLATFORM_WIN32 = @PLATFORM_WIN32@
+USE_MACVERSION = @USE_MACVERSION@
+PLATFORM_MACOSX = @PLATFORM_MACOSX@
+TOOLKIT_VERSION = @TOOLKIT_VERSION@
+WXUNIV = @WXUNIV@
+TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
+DEPS_TYPE = @DEPS_TYPE@
+SHARED_LD_CXX = @SHARED_LD_CXX@
+CXX = @CXX@
+includedir = @includedir@
+LN_S = @LN_S@
+CFLAGS = @CFLAGS@
+DLLPREFIX = @DLLPREFIX@
+SHARED = @SHARED@
+USE_SOVERLINUX = @USE_SOVERLINUX@
+top_builddir = @top_builddir@
+SHARED_LD_CC = @SHARED_LD_CC@

 
 

-RESOPTIONS=-i $(top_srcdir)/$(program_dir) mondrian.r
-SETOPTIONS=-a C
+### Conditionally set variables: ###

 
 

-include ../../src/makeprog.env
+@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib
+@COND_UNICODE1@WXUNICODEFLAG = u
+@COND_BUILDDEBUG@WXDEBUGFLAG = d
+@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg
+@COND_WXUSE_LIBPNGBUILTIN@LIB_PNG = wxpng
+@COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_p = -lwxodbc
+@COND_MONOLITHIC0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
+@COND_WXUNIV1@WXUNIVNAME = univ
+@COND_WXUNIV1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+@COND_PLATFORM_WIN321@WXCOMPILER = _gcc
+@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib
+@COND_PLATFORM_MAC1@__minimal___mac_setfilecmd = $(SETFILE) -a C minimal$(EXEEXT)
+@COND_PLATFORM_WIN321@__minimal___win32rc = minimal_rc.o
+@COND_TOOLKITMAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
+@COND_WXUSE_LIBPNGBUILTIN@__LIB_PNG_p = -lwxpng
+@COND_PLATFORM_WIN321@DLLIMPEXT = .a
+@COND_PLATFORM_WIN320@DLLIMPEXT = .$(SO_SUFFIX)
+@COND_WXUNIV1@WXUNIV_DEFINE = __WXUNIVERSAL__
+@COND_MONOLITHIC1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
+@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff
+@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
+@COND_PLATFORM_MAC1@__minimal___mac_rezcmd = $(__MACOSX_RESOURCES_p)
+@COND_WXUSE_ODBCBUILTIN@LIB_ODBC = wxodbc
+@COND_MONOLITHIC1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
+@COND_WXUSE_LIBJPEGBUILTIN@LIB_JPEG = wxjpeg
+@COND_WXUSE_LIBTIFFBUILTIN@LIB_TIFF = wxtiff
+@COND_USE_GUI0@PORTNAME = base
+@COND_USE_GUI1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+@COND_TOOLKITMAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o minimal$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
+@COND_WXUSE_REGEXBUILTIN@__LIB_REGEX_p = -lwxregex
+@COND_WXUSE_REGEXBUILTIN@LIB_REGEX = wxregex
+@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d

 
 

-@IF_GNU_MAKE@-include $(DEPFILES)
+### Targets: ###
+
+all: minimal$(EXEEXT)
+
+install-strip: install
+
+clean: 
+       rm -f ./*.o ./*.d
+       rm -f minimal$(EXEEXT)
+
+install: all
+
+minimal.o: $(srcdir)/minimal.cpp
+       $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(DEPS_FLAG) $(CXXFLAGS) $<
+
+minimal_rc.o: $(srcdir)/minimal.rc
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ --define $(WXUNIV_DEFINE) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
+
+minimal$(EXEEXT): minimal.o $(__minimal___win32rc)
+       $(CXX) -o $@  minimal.o $(__minimal___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)
+       $(__minimal___mac_rezcmd)
+       $(__minimal___mac_setfilecmd)
+
+uninstall: 
+
+
+# Include dependency info, if present:
+@IF_GNU_MAKE@-include *.d
+
+.PHONY: all