Applied patch [ 892511 ] wxUniversal: fix of segfault in toolbar.cpp

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

diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in
index acdb0c5997989d4c9d9f952e783ea94d75435a48..b15f156a238b284a8a82fa50ea245d33d5e6998b 100644 (file)
--- a/samples/erase/Makefile.in
+++ b/samples/erase/Makefile.in
@@ -1,146 +1,164 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.2 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 
 @MAKE_SET@
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 
 @MAKE_SET@
 

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

 prefix = @prefix@
 prefix = @prefix@

+exec_prefix = @exec_prefix@

 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
 RESCOMP = @RESCOMP@
 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@
 SETFILE = @SETFILE@

-UNICODE = @UNICODE@
-STRIP = @STRIP@
-USE_SOVERSOLARIS = @USE_SOVERSOLARIS@
+NM = @NM@

 srcdir = @srcdir@
 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@
 top_srcdir = @top_srcdir@

-AR = @AR@
-BUILD = @BUILD@
-PLATFORM_WIN32 = @PLATFORM_WIN32@
-USE_MACVERSION = @USE_MACVERSION@
-PLATFORM_MACOSX = @PLATFORM_MACOSX@
-DEPS_TRACKING = @DEPS_TRACKING@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
-WXUNIV = @WXUNIV@
-TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
-CXX = @CXX@
-SHARED_LD_CXX = @SHARED_LD_CXX@
-includedir = @includedir@
-LN_S = @LN_S@
-CFLAGS = @CFLAGS@
-DLLPREFIX = @DLLPREFIX@
-SHARED = @SHARED@
-USE_SOVERLINUX = @USE_SOVERLINUX@

 top_builddir = @top_builddir@
 top_builddir = @top_builddir@

-SHARED_LD_CC = @SHARED_LD_CC@
+LDFLAGS_GUI = @LDFLAGS_GUI@
+CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+TOOLKIT = @TOOLKIT@
+TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
+TOOLKIT_VERSION = @TOOLKIT_VERSION@
+TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
+EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
+HOST_SUFFIX = @HOST_SUFFIX@
+SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+
+### Variables: ###
+
+DESTDIR = 
+WX_VERSION = 2.5.1
+LIBDIRNAME = $(top_builddir)lib
+ERASE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
+       $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
+ERASE_OBJECTS =  \
+       $(__erase_os2_lib_res) \
+       erase_erase.o \
+       $(__erase___win32rc)

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

-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib
-@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_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_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_USE_GUI_0@PORTNAME = base
+@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
+@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
+@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
+@COND_UNICODE_1@WXUNICODEFLAG = u

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

+@COND_PLATFORM_MAC_1@__erase___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@  $(SETFILE) -a C erase$(EXEEXT)
+@COND_PLATFORM_MAC_1@__erase___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)

 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @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_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_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_1 = -d __WXUNIVERSAL__

 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__

-@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_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_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_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
+@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
+@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
+COND_PLATFORM_OS2_1___erase___os2_emxbindcmd = $(NM) erase$(EXEEXT) | if grep -q \
+       pmwin.763 ; then emxbind -ep erase$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__erase___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___erase___os2_emxbindcmd)
+@COND_PLATFORM_OS2_1@__erase_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__erase_bundle___depname = erase_bundle
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
+@COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
+@COND_PLATFORM_WIN32_1@__erase___win32rc = erase_erase_rc.o
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
+@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  = \
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
+@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
+@COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
+@COND_WXUSE_REGEX_BUILTIN@     -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
+@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
+COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
+       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
+       $(srcdir)/../../samples -o erase$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
+@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)

 
 ### Targets: ###
 
 
 ### Targets: ###
 

-all: erase$(EXEEXT)
+all: erase$(EXEEXT) $(__erase_bundle___depname)

 
 

-install-strip: install
+install: all

 
 

-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___mac_rezcmd)
-       $(__erase___mac_setfilecmd)
+uninstall: 
+
+install-strip: install

 
 clean: 
 
 clean: 

-       rm -f ./*.o ./.deps/*
+       rm -rf ./.deps ./.pch
+       rm -f ./*.o

        rm -f erase$(EXEEXT)
        rm -f erase$(EXEEXT)

-
-install: all
+       rm -rf erase.app

 
 distclean: clean
 
 distclean: clean

-       rm -f configure config.cache config.log config.status
-       rm -f bk-deps shared-ld-sh
+       rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile

 
 

-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) $<
-
-uninstall: 
+erase$(EXEEXT): $(ERASE_OBJECTS) $(__erase___win32rc)
+       $(CXX) -o $@ $(ERASE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
+       $(__erase___mac_rezcmd)
+       $(__erase___mac_setfilecmd)
+       $(__erase___os2_emxbindcmd)
+       $(SAMPLES_RPATH_POSTLINK)
+
+erase.app/Contents/PkgInfo: erase$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+       mkdir -p erase.app/Contents
+       mkdir -p erase.app/Contents/MacOS
+       mkdir -p erase.app/Contents/Resources
+       
+       
+       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+       -e "s/EXECUTABLE/erase/" \
+       -e "s/VERSION/$(WX_VERSION)/" \
+       $(top_srcdir)/src/mac/Info.plist.in >erase.app/Contents/Info.plist
+       
+       
+       echo -n "APPL????" >erase.app/Contents/PkgInfo
+       
+       
+       ln -f erase$(EXEEXT) erase.app/Contents/MacOS/erase
+       
+       
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc erase.app/Contents/Resources/erase.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns erase.app/Contents/Resources/wxmac.icns
+
+@COND_PLATFORM_MACOSX_1@erase_bundle: erase.app/Contents/PkgInfo
+
+erase_erase.o: $(srcdir)/erase.cpp
+       $(CXXC) -c -o $@ $(ERASE_CXXFLAGS) $<
+
+erase_erase_rc.o: $(srcdir)/erase.rc
+       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples

 
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
 
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 

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