new build system

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

aclocal.m4

@@ -1,14 +1,15 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+# generated automatically by aclocal 1.7.2 -*- Autoconf -*-
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
 dnl ---------------------------------------------------------------------------
 dnl
@@ -1061,3 +1062,495 @@ AC_DEFUN(PKG_CHECK_MODULES, [
 
 
 
+dnl ---------------------------------------------------------------------------
+dnl Support macros for makefiles generated by BAKEFILE.
+dnl ---------------------------------------------------------------------------
+
+dnl Lots of compiler & linker detection code contained here was taken from
+dnl wxWindows configure.in script (see http://www.wxwindows.org)
+
+
+
+dnl ---------------------------------------------------------------------------
+dnl AC_BAKEFILE_GNUMAKE
+dnl
+dnl Detects GNU make
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN(AC_BAKEFILE_GNUMAKE,
+[
+    dnl does make support "-include" (only GNU make does AFAIK)?
+    AC_CACHE_CHECK([if make is GNU make], wx_cv_prog_makeisgnu,
+    [
+        if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
+                egrep -s GNU > /dev/null); then
+            bakefile_cv_prog_makeisgnu="yes"
+        else
+            bakefile_cv_prog_makeisgnu="no"
+        fi
+    ])
+
+    if test "x$bakefile_cv_prog_makeisgnu" = "xyes"; then
+        IF_GNU_MAKE=""
+    else
+        IF_GNU_MAKE="#"
+    fi
+    AC_SUBST(IF_GNU_MAKE)
+])
+
+dnl ---------------------------------------------------------------------------
+dnl AC_BAKEFILE_PLATFORM
+dnl
+dnl Detects platform and sets PLATFORM_XXX variables accordingly
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN(AC_BAKEFILE_PLATFORM,
+[
+    PLATFORM_UNIX=0
+    PLATFORM_WIN32=0
+    PLATFORM_MSDOS=0
+    PLATFORM_MAC=0
+    PLATFORM_MACOSX=0
+    
+    case "${host}" in
+        *-*-cygwin* | *-*-mingw32* )
+            PLATFORM_WIN32=1
+        ;;
+        *-pc-msdosdjgpp | *-pc-os2_emx | *-pc-os2-emx )
+            PLATFORM_MSDOS=1
+        ;;
+        powerpc-*-darwin* )
+            PLATFORM_MAC=1
+            PLATFORM_MACOSX=1
+        ;;
+        * )
+            PLATFORM_UNIX=1
+        ;;
+    esac
+
+    AC_SUBST(PLATFORM_UNIX)
+    AC_SUBST(PLATFORM_WIN32)
+    AC_SUBST(PLATFORM_MSDOS)
+    AC_SUBST(PLATFORM_MAC)
+    AC_SUBST(PLATFORM_MACOSX)
+])
+
+
+
+dnl ---------------------------------------------------------------------------
+dnl AC_BAKEFILE_SUFFIXES
+dnl
+dnl Detects shared various suffixes for shared libraries, libraries, programs,
+dnl plugins etc.
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN(AC_BAKEFILE_SUFFIXES,
+[
+    SO_SUFFIX="so"
+    EXEEXT=""
+    DLLPREFIX=lib
+    
+    case "${host}" in
+        *-hp-hpux* )
+            SO_SUFFIX="sl"
+        ;;
+        *-*-aix* )
+            dnl quoting from
+            dnl http://www-1.ibm.com/servers/esdd/articles/gnu.html:
+            dnl     Both archive libraries and shared libraries on AIX have an
+            dnl     .a extension. This will explain why you can't link with an
+            dnl     .so and why it works with the name changed to .a.
+            SO_SUFFIX="a"
+        ;;
+        *-*-cygwin* | *-*-mingw32* )
+            SO_SUFFIX="dll"
+            EXEEXT=".exe"
+            DLLPREFIX=""
+        ;;
+        *-pc-msdosdjgpp | *-pc-os2_emx | *-pc-os2-emx )
+            EXEEXT=".exe"
+            DLLPREFIX=""
+        ;;
+        powerpc-*-darwin* )
+            SO_SUFFIX="dylib"
+        ;;
+    esac
+
+    AC_SUBST(SO_SUFFIX)
+    AC_SUBST(EXEEXT)
+    AC_SUBST(DLLPREFIX)
+])
+
+
+dnl ---------------------------------------------------------------------------
+dnl AC_BAKEFILE_SHARED_LD
+dnl
+dnl Detects command for making shared libraries, substitutes SHARED_LD_CC
+dnl and SHARED_LD_CXX.
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN(AC_BAKEFILE_SHARED_LD,
+[
+    dnl Defaults for GCC and ELF .so shared libs:
+    SHARED_LD_CC="\$(CC) -shared -o"
+    SHARED_LD_CXX="\$(CXX) -shared -o"
+
+    dnl the extra compiler flags needed for compilation of shared library
+    if test "x$GCC" = "xyes"; then
+        dnl the switch for gcc is the same under all platforms
+        PIC_FLAG="-fPIC"
+    fi
+
+    case "${host}" in
+      *-hp-hpux* )
+        dnl default settings are good for gcc but not for the native HP-UX
+        if test "x$GCC" = "xyes"; then
+            dnl -o flag must be after PIC flag
+            SHARED_LD_CC="${CC} -shared ${PIC_FLAG} -o"
+            SHARED_LD_CXX="${CXX} -shared ${PIC_FLAG} -o"
+        else
+            dnl no idea why it wants it, but it does
+            LDFLAGS="$LDFLAGS -L/usr/lib"
+
+            SHARED_LD_CC="${CC} -b -o"
+            SHARED_LD_CXX="${CXX} -b -o"
+            PIC_FLAG="+Z"
+        fi
+      ;;
+
+      *-*-linux* )
+        if test "x$GCC" != "xyes"; then
+            AC_CACHE_CHECK([for Intel compiler], bakefile_cv_prog_icc,
+            [
+                AC_TRY_COMPILE([],
+                    [
+                        #ifndef __INTEL_COMPILER
+                        #error Not icc
+                        #endif
+                    ],
+                    bakefile_cv_prog_icc=yes,
+                    bakefile_cv_prog_icc=no
+                )
+            ])
+            if test "$bakefile_cv_prog_icc" = "yes"; then
+                PIC_FLAG="-KPIC"
+            fi
+        fi
+      ;;
+
+      *-*-solaris2* )
+        if test "x$GCC" != xyes ; then
+            SHARED_LD_CC="${CC} -G -o"
+            SHARED_LD_CXX="${CXX} -G -o"
+            PIC_FLAG="-KPIC"
+        fi
+      ;;
+
+      *-*-darwin* )
+        dnl For Unix to MacOS X porting instructions, see:
+        dnl http://fink.sourceforge.net/doc/porting/porting.html
+        CFLAGS="$CFLAGS -fno-common"
+        CXXFLAGS="$CXXFLAGS -fno-common"
+        
+        dnl Most apps benefit from being fully binded (its faster and static
+        dnl variables initialized at startup work).
+        dnl This can be done either with the exe linker flag -Wl,-bind_at_load
+        dnl or with a double stage link in order to create a single module
+        dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
+
+        cat <<EOF >shared-ld-sh
+#!/bin/sh
+#-----------------------------------------------------------------------------
+#-- Name:        distrib/mac/shared-ld-sh
+#-- Purpose:     Link a mach-o dynamic shared library for Darwin / Mac OS X
+#-- Author:      Gilles Depeyrot
+#-- Copyright:   (c) 2002 Gilles Depeyrot
+#-- Licence:     any use permitted
+#-----------------------------------------------------------------------------
+
+verbose=0
+args=""
+objects=""
+
+while test \${#} -gt 0; do
+    case \${1} in
+
+       -v)
+        verbose=1
+        ;;
+
+       -o|-compatibility_version|-current_version|-framework|-undefined|-install_name)
+        # collect these options and values
+        args="\${args} \${1} \${2}"
+        shift
+        ;;
+
+       -l*|-L*|-flat_namespace)
+        # collect these options
+        args="\${args} \${1}"
+        ;;
+
+       -dynamiclib)
+        # skip these options
+        ;;
+
+       -*)
+        echo "shared-ld: unhandled option '\${1}'"
+        exit 1
+        ;;
+
+        *.o | *.a)
+        # collect object files
+        objects="\${objects} \${1}"
+        ;;
+
+        *)
+        echo "shared-ld: unhandled argument '\${1}'"
+        exit 1
+        ;;
+
+    esac
+    shift
+done
+
+#
+# Link one module containing all the others
+#
+if test \${verbose} = 1; then
+    echo "c++ -r -keep_private_externs -nostdlib \${objects} -o master.\$\$.o"
+fi
+c++ -r -keep_private_externs -nostdlib \${objects} -o master.\$\$.o
+status=\$?
+if test \${status} != 0; then
+    exit \${status}
+fi
+
+#
+# Link the shared library from the single module created
+#
+if test \${verbose} = 1; then
+    echo "cc -dynamiclib master.\$\$.o \${args}"
+fi
+c++ -dynamiclib master.\$\$.o \${args}
+status=\$?
+if test \${status} != 0; then
+    exit \${status}
+fi
+
+#
+# Remove intermediate module
+#
+rm -f master.\$\$.o
+
+exit 0
+EOF
+        chmod +x shared-ld-sh
+
+        SHARED_LD_CC="`pwd`/shared-ld-sh -undefined suppress -flat_namespace -o"
+        SHARED_LD_CXX="$SHARED_LD_CC"
+        PIC_FLAG="-dynamic -fPIC"
+        dnl FIXME - what about C libs? Gilles says to use c++ because it doesn't
+        dnl         matter for C projects and matters for C++ ones
+        dnl FIXME - newer devel tools have linker flag to do this, the script
+        dnl         is not necessary - detect!
+      ;;
+
+      *-*-aix* )
+        dnl default settings are ok for gcc
+        if test "x$GCC" != "xyes"; then
+            dnl the abs path below used to be hardcoded here so I guess it must
+            dnl be some sort of standard location under AIX?
+            AC_CHECK_PROG(AIX_CXX_LD, makeC++SharedLib,
+                          makeC++SharedLib, /usr/lpp/xlC/bin/makeC++SharedLib)
+            dnl FIXME - what about makeCSharedLib?            
+            SHARED_LD_CC="$AIX_CC_LD -p 0 -o"
+            SHARED_LD_CXX="$AIX_CXX_LD -p 0 -o"
+        fi
+      ;;
+
+      *-*-beos* )
+        dnl can't use gcc under BeOS for shared library creation because it
+        dnl complains about missing 'main'
+        SHARED_LD_CC="${LD} -shared -o"
+        SHARED_LD_CXX="${LD} -shared -o"
+      ;;
+
+      *-*-irix* )
+        dnl default settings are ok for gcc
+        if test "x$GCC" != "xyes"; then
+            PIC_FLAG="-KPIC"
+        fi
+      ;;
+      
+      *-*-cygwin* | *-*-mingw32* )
+        PIC_FLAG=""
+      ;;
+      
+      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
+      *-*-sunos4* | \
+      *-*-osf* | \
+      *-*-dgux5* | \
+      *-*-sysv5* )
+        dnl defaults are ok
+      ;;
+
+      *)
+        AC_MSG_ERROR(unknown system type $host.)
+    esac
+
+    AC_SUBST(SHARED_LD_CC)
+    AC_SUBST(SHARED_LD_CXX)
+    AC_SUBST(PIC_FLAG)
+])
+
+
+dnl ---------------------------------------------------------------------------
+dnl AC_BAKEFILE_SHARED_VERSIONS
+dnl
+dnl Detects linker options for attaching versions (sonames) to shared  libs.
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN(AC_BAKEFILE_SHARED_VERSIONS,
+[
+    USE_SOVERSION=0
+    USE_SOVERLINUX=0
+    USE_SOVERSOLARIS=0
+    USE_SOSYMLINKS=0
+    USE_MACVERSION=0
+    SONAME_FLAG=
+
+    case "${host}" in
+      *-*-linux* )
+        SONAME_FLAG="-Wl,-soname,"
+        USE_SOVERSION=1
+        USE_SOVERLINUX=1
+        USE_SOSYMLINKS=1
+      ;;
+
+      *-*-solaris2* )
+        SONAME_FLAG="-h "
+        USE_SOVERSION=1
+        USE_SOVERSOLARIS=1
+        USE_SOSYMLINKS=1
+      ;;
+
+      *-*-darwin* )
+        USE_MACVERSION=1
+        USE_SOVERSION=1
+        USE_SOSYMLINKS=1
+      ;;      
+    esac
+
+    AC_SUBST(USE_SOVERSION)
+    AC_SUBST(USE_SOVERLINUX)
+    AC_SUBST(USE_SOVERSOLARIS)
+    AC_SUBST(USE_MACVERSION)
+    AC_SUBST(USE_SOSYMLINKS)
+    AC_SUBST(SONAME_FLAG)
+])
+
+
+dnl ---------------------------------------------------------------------------
+dnl AC_BAKEFILE_DEPS
+dnl
+dnl Detects available C/C++ dependency tracking options
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN(AC_BAKEFILE_DEPS,
+[
+    DEPS_TYPE=no
+    if test "x$GCC" = "xyes"; then
+        DEPS_TYPE=gcc
+    fi
+    
+    AC_SUBST(DEPS_TYPE)
+])
+
+dnl ---------------------------------------------------------------------------
+dnl AC_BAKEFILE_CHECK_BASIC_STUFF
+dnl
+dnl Checks for presence of basic programs, such as C and C++ compiler, "ranlib"
+dnl or "install"
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN(AC_BAKEFILE_CHECK_BASIC_STUFF,
+[
+    AC_PROG_RANLIB
+    AC_PROG_INSTALL
+    AC_PROG_LN_S
+
+    AC_PROG_MAKE_SET
+    AC_SUBST(MAKE_SET)
+    
+    if test "$build" != "$host" ; then
+        AR=$host_alias-ar
+        STRIP=$host_alias-strip
+    else
+        AC_CHECK_PROG(AR, ar, ar, ar)
+        AC_CHECK_PROG(STRIP, strip, strip, true)
+    fi
+
+    case ${host} in
+        *-hp-hpux* )
+            INSTALL_DIR="mkdir"
+            ;;
+        *)  INSTALL_DIR="$INSTALL -d"
+            ;;
+    esac
+    AC_SUBST(INSTALL_DIR)
+])
+
+
+dnl ---------------------------------------------------------------------------
+dnl AC_BAKEFILE_RES_COMPILERS
+dnl
+dnl Checks for presence of resource compilers for win32 or mac
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN(AC_BAKEFILE_RES_COMPILERS,
+[
+    RESCOMP=
+    SETFILE=
+
+    case ${host} in 
+        *-*-cygwin* | *-*-mingw32* )
+            dnl Check for win32 resources compiler:
+            if test "$build" != "$host" ; then
+                RESCOMP=$host_alias-windres
+            else
+                AC_CHECK_PROG(RESCOMP, windres, windres, windres)
+            fi
+         ;;
+ 
+      *-*-darwin* )
+            AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
+            AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile)
+        ;;
+    esac
+
+    AC_SUBST(RESCOMP)
+    AC_SUBST(SETFILE)
+])
+
+dnl ---------------------------------------------------------------------------
+dnl AC_BAKEFILE
+dnl
+dnl To be used in configure.in of any project using Bakefile-generated mks
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN(AC_BAKEFILE,
+[
+    if test "x$BAKEFILE_CHECK_BASICS" != "xno"; then
+        AC_BAKEFILE_CHECK_BASIC_STUFF
+    fi
+    AC_BAKEFILE_GNUMAKE
+    AC_BAKEFILE_PLATFORM
+    AC_BAKEFILE_SUFFIXES
+    AC_BAKEFILE_SHARED_LD
+    AC_BAKEFILE_SHARED_VERSIONS
+    AC_BAKEFILE_DEPS
+    AC_BAKEFILE_RES_COMPILERS
+
+    builtin(include, autoconf_inc.m4)
+])
+

autoconf_inc.m4

@@ -0,0 +1,222 @@
+dnl This macro was generated by
+dnl Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+dnl Do not modify, all changes will be overwritten!
+
+    dnl Conditions:
+
+dnl ### begin block COND_WXUSE_ZLIBBUILTIN ###
+    COND_WXUSE_ZLIBBUILTIN="#"
+    if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
+        COND_WXUSE_ZLIBBUILTIN=
+    fi
+    AC_SUBST(COND_WXUSE_ZLIBBUILTIN)
+dnl ### begin block COND_UNICODE1 ###
+    COND_UNICODE1="#"
+    if test "x$UNICODE" = "x1" ; then
+        COND_UNICODE1=
+    fi
+    AC_SUBST(COND_UNICODE1)
+dnl ### begin block COND_BUILDDEBUG ###
+    COND_BUILDDEBUG="#"
+    if test "x$BUILD" = "xdebug" ; then
+        COND_BUILDDEBUG=
+    fi
+    AC_SUBST(COND_BUILDDEBUG)
+dnl ### begin block COND_WXUSE_REGEXBUILTIN ###
+    COND_WXUSE_REGEXBUILTIN="#"
+    if test "x$wxUSE_REGEX" = "xbuiltin" ; then
+        COND_WXUSE_REGEXBUILTIN=
+    fi
+    AC_SUBST(COND_WXUSE_REGEXBUILTIN)
+dnl ### begin block COND_USE_SOSYMLINKS1 ###
+    COND_USE_SOSYMLINKS1="#"
+    if test "x$USE_SOSYMLINKS" = "x1" ; then
+        COND_USE_SOSYMLINKS1=
+    fi
+    AC_SUBST(COND_USE_SOSYMLINKS1)
+dnl ### begin block COND_WXUSE_LIBJPEGBUILTIN ###
+    COND_WXUSE_LIBJPEGBUILTIN="#"
+    if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+        COND_WXUSE_LIBJPEGBUILTIN=
+    fi
+    AC_SUBST(COND_WXUSE_LIBJPEGBUILTIN)
+dnl ### begin block COND_WXUSE_LIBPNGBUILTIN ###
+    COND_WXUSE_LIBPNGBUILTIN="#"
+    if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+        COND_WXUSE_LIBPNGBUILTIN=
+    fi
+    AC_SUBST(COND_WXUSE_LIBPNGBUILTIN)
+dnl ### begin block COND_WXUSE_ODBCBUILTIN ###
+    COND_WXUSE_ODBCBUILTIN="#"
+    if test "x$wxUSE_ODBC" = "xbuiltin" ; then
+        COND_WXUSE_ODBCBUILTIN=
+    fi
+    AC_SUBST(COND_WXUSE_ODBCBUILTIN)
+dnl ### begin block COND_TOOLKITGTK ###
+    COND_TOOLKITGTK="#"
+    if test "x$TOOLKIT" = "xGTK" ; then
+        COND_TOOLKITGTK=
+    fi
+    AC_SUBST(COND_TOOLKITGTK)
+dnl ### begin block COND_TOOLKITMOTIF ###
+    COND_TOOLKITMOTIF="#"
+    if test "x$TOOLKIT" = "xMOTIF" ; then
+        COND_TOOLKITMOTIF=
+    fi
+    AC_SUBST(COND_TOOLKITMOTIF)
+dnl ### begin block COND_TOOLKITMSW ###
+    COND_TOOLKITMSW="#"
+    if test "x$TOOLKIT" = "xMSW" ; then
+        COND_TOOLKITMSW=
+    fi
+    AC_SUBST(COND_TOOLKITMSW)
+dnl ### begin block COND_TOOLKITMAC ###
+    COND_TOOLKITMAC="#"
+    if test "x$TOOLKIT" = "xMAC" ; then
+        COND_TOOLKITMAC=
+    fi
+    AC_SUBST(COND_TOOLKITMAC)
+dnl ### begin block COND_TOOLKITCOCOA ###
+    COND_TOOLKITCOCOA="#"
+    if test "x$TOOLKIT" = "xCOCOA" ; then
+        COND_TOOLKITCOCOA=
+    fi
+    AC_SUBST(COND_TOOLKITCOCOA)
+dnl ### begin block COND_TOOLKITOS2 ###
+    COND_TOOLKITOS2="#"
+    if test "x$TOOLKIT" = "xOS2" ; then
+        COND_TOOLKITOS2=
+    fi
+    AC_SUBST(COND_TOOLKITOS2)
+dnl ### begin block COND_TOOLKITX11 ###
+    COND_TOOLKITX11="#"
+    if test "x$TOOLKIT" = "xX11" ; then
+        COND_TOOLKITX11=
+    fi
+    AC_SUBST(COND_TOOLKITX11)
+dnl ### begin block COND_TOOLKITMGL ###
+    COND_TOOLKITMGL="#"
+    if test "x$TOOLKIT" = "xMGL" ; then
+        COND_TOOLKITMGL=
+    fi
+    AC_SUBST(COND_TOOLKITMGL)
+dnl ### begin block COND_WXUNIV1 ###
+    COND_WXUNIV1="#"
+    if test "x$WXUNIV" = "x1" ; then
+        COND_WXUNIV1=
+    fi
+    AC_SUBST(COND_WXUNIV1)
+dnl ### begin block COND_SHARED0_MONOLITHIC1 ###
+    COND_SHARED0_MONOLITHIC1="#"
+    if test "x$SHARED" = "x0" -a \
+            "x$MONOLITHIC" = "x1" ; then
+        COND_SHARED0_MONOLITHIC1=
+    fi
+    AC_SUBST(COND_SHARED0_MONOLITHIC1)
+dnl ### begin block COND_SHARED1_MONOLITHIC1 ###
+    COND_SHARED1_MONOLITHIC1="#"
+    if test "x$SHARED" = "x1" -a \
+            "x$MONOLITHIC" = "x1" ; then
+        COND_SHARED1_MONOLITHIC1=
+    fi
+    AC_SUBST(COND_SHARED1_MONOLITHIC1)
+dnl ### begin block COND_PLATFORM_UNIX1 ###
+    COND_PLATFORM_UNIX1="#"
+    if test "x$PLATFORM_UNIX" = "x1" ; then
+        COND_PLATFORM_UNIX1=
+    fi
+    AC_SUBST(COND_PLATFORM_UNIX1)
+dnl ### begin block COND_PLATFORM_MACOSX1 ###
+    COND_PLATFORM_MACOSX1="#"
+    if test "x$PLATFORM_MACOSX" = "x1" ; then
+        COND_PLATFORM_MACOSX1=
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX1)
+dnl ### begin block COND_PLATFORM_WIN321 ###
+    COND_PLATFORM_WIN321="#"
+    if test "x$PLATFORM_WIN32" = "x1" ; then
+        COND_PLATFORM_WIN321=
+    fi
+    AC_SUBST(COND_PLATFORM_WIN321)
+dnl ### begin block COND_USE_SOVERSION1_PLATFORM_MACOSX0 ###
+    COND_USE_SOVERSION1_PLATFORM_MACOSX0="#"
+    if test "x$USE_SOVERSION" = "x1" -a \
+            "x$PLATFORM_MACOSX" = "x0" ; then
+        COND_USE_SOVERSION1_PLATFORM_MACOSX0=
+    fi
+    AC_SUBST(COND_USE_SOVERSION1_PLATFORM_MACOSX0)
+dnl ### begin block COND_USE_SOVERSION1_PLATFORM_MACOSX1 ###
+    COND_USE_SOVERSION1_PLATFORM_MACOSX1="#"
+    if test "x$USE_SOVERSION" = "x1" -a \
+            "x$PLATFORM_MACOSX" = "x1" ; then
+        COND_USE_SOVERSION1_PLATFORM_MACOSX1=
+    fi
+    AC_SUBST(COND_USE_SOVERSION1_PLATFORM_MACOSX1)
+dnl ### begin block COND_WXUSE_LIBTIFFBUILTIN ###
+    COND_WXUSE_LIBTIFFBUILTIN="#"
+    if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+        COND_WXUSE_LIBTIFFBUILTIN=
+    fi
+    AC_SUBST(COND_WXUSE_LIBTIFFBUILTIN)
+dnl ### begin block COND_PLATFORM_WIN320 ###
+    COND_PLATFORM_WIN320="#"
+    if test "x$PLATFORM_WIN32" = "x0" ; then
+        COND_PLATFORM_WIN320=
+    fi
+    AC_SUBST(COND_PLATFORM_WIN320)
+dnl ### begin block COND_MONOLITHIC1 ###
+    COND_MONOLITHIC1="#"
+    if test "x$MONOLITHIC" = "x1" ; then
+        COND_MONOLITHIC1=
+    fi
+    AC_SUBST(COND_MONOLITHIC1)
+dnl ### begin block COND_MONOLITHIC0 ###
+    COND_MONOLITHIC0="#"
+    if test "x$MONOLITHIC" = "x0" ; then
+        COND_MONOLITHIC0=
+    fi
+    AC_SUBST(COND_MONOLITHIC0)
+dnl ### begin block COND_USE_GUI1 ###
+    COND_USE_GUI1="#"
+    if test "x$USE_GUI" = "x1" ; then
+        COND_USE_GUI1=
+    fi
+    AC_SUBST(COND_USE_GUI1)
+dnl ### begin block COND_DEPS_TYPEGCC ###
+    COND_DEPS_TYPEGCC="#"
+    if test "x$DEPS_TYPE" = "xgcc" ; then
+        COND_DEPS_TYPEGCC=
+    fi
+    AC_SUBST(COND_DEPS_TYPEGCC)
+dnl ### begin block COND_USE_GUI0 ###
+    COND_USE_GUI0="#"
+    if test "x$USE_GUI" = "x0" ; then
+        COND_USE_GUI0=
+    fi
+    AC_SUBST(COND_USE_GUI0)
+dnl ### begin block COND_USE_GUI1_WXUNIV0 ###
+    COND_USE_GUI1_WXUNIV0="#"
+    if test "x$USE_GUI" = "x1" -a \
+            "x$WXUNIV" = "x0" ; then
+        COND_USE_GUI1_WXUNIV0=
+    fi
+    AC_SUBST(COND_USE_GUI1_WXUNIV0)
+dnl ### begin block COND_USE_GUI1_WXUNIV1 ###
+    COND_USE_GUI1_WXUNIV1="#"
+    if test "x$USE_GUI" = "x1" -a \
+            "x$WXUNIV" = "x1" ; then
+        COND_USE_GUI1_WXUNIV1=
+    fi
+    AC_SUBST(COND_USE_GUI1_WXUNIV1)
+dnl ### begin block COND_USE_SOVERLINUX1 ###
+    COND_USE_SOVERLINUX1="#"
+    if test "x$USE_SOVERLINUX" = "x1" ; then
+        COND_USE_SOVERLINUX1=
+    fi
+    AC_SUBST(COND_USE_SOVERLINUX1)
+dnl ### begin block COND_USE_SOVERSOLARIS1 ###
+    COND_USE_SOVERSOLARIS1="#"
+    if test "x$USE_SOVERSOLARIS" = "x1" ; then
+        COND_USE_SOVERSOLARIS1=
+    fi
+    AC_SUBST(COND_USE_SOVERSOLARIS1)

configure.in

@@ -132,6 +132,7 @@ DEFAULT_DEFAULT_wxUSE_X11=0
 
 PROGRAM_EXT=
 SO_SUFFIX=so
+SAMPLES_RPATH_FLAG=
 
 dnl to support a new system, you need to add its canonical name (as determined
 dnl by config.sub or specified by the configure command line) to this "case"
@@ -2886,14 +2887,18 @@ if test -n "$TOOLKIT" ; then
     TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WX${TOOLKIT}__"
 fi
 
+UNICODE=0
 lib_unicode_suffix=
 if test "$wxUSE_UNICODE" = "yes"; then
     lib_unicode_suffix=u
+    UNICODE=1
 fi
 
 lib_debug_suffix=
+BUILD=release
 if test "$wxUSE_DEBUG_FLAG" = "yes"; then
     lib_debug_suffix=d
+    BUILD=debug
 fi
 
 WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[[a-z]]" "[[A-Z]]"`
@@ -2991,7 +2996,9 @@ if test "$wxUSE_SHARED" = "yes"; then
     esac
 fi
 
+SHARED=0
 if test "$wxUSE_SHARED" = "yes"; then
+    SHARED=1
 
     dnl install targets
     if test "$wxUSE_OPENGL" = "yes"; then
@@ -3063,6 +3070,7 @@ if test "$wxUSE_SHARED" = "yes"; then
             dnl substitute this in makelib.env for the contrib libs
             WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)"
         fi
+        SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)/lib"
       ;;
 
       *-*-solaris2* )
@@ -3070,11 +3078,38 @@ if test "$wxUSE_SHARED" = "yes"; then
             dnl newer versions of gcc need -isystem to compile X headers on
             dnl Solaris (which use old style C syntax)
             CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include"
+
+            dnl gcc may use Sun's ld, in which case -rpath gives a confusing
+            dnl error message. We have to try both -Wl,-rpath and -Wl,-R:
+            saveLdflags="$LDFLAGS"
+            LDFLAGS="$saveLdflags -Wl,-rpath,/"
+            AC_MSG_CHECKING([if the linker accepts -rpath])
+            AC_TRY_LINK(
+                [],[],
+                [
+                    AC_MSG_RESULT([yes])
+                    SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)/lib"
+                ],
+                [
+                    AC_MSG_RESULT([no])
+                    AC_MSG_CHECKING([if the linker accepts -R])
+                    LDFLAGS="$saveLdflags -Wl,-R,/"
+                    AC_TRY_LINK(
+                        [],[],
+                        [
+                             AC_MSG_RESULT([yes])
+                             SAMPLES_RPATH_FLAG="-Wl,-R,\$(top_builddir)/lib"],
+                        [
+                            AC_MSG_RESULT([no])
+                        ])                    
+                ])
+            LDFLAGS="$saveLdflags"
         else
             SHARED_LD="${CXX} -G -o"
             PIC_FLAG="-KPIC"
             SONAME_FLAGS="-h ${WX_LIBRARY_NAME_SHARED}"
             SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED_GL}"
+            SAMPLES_RPATH_FLAG="-R\$(top_builddir)/lib"
         fi
       ;;
 
@@ -5489,19 +5524,43 @@ else
     WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
 fi
 
+if test "x$wxUSE_UNIVERSAL" = "xyes" ; then
+    WXUNIV=1
+else
+    WXUNIV=0
+fi
+
+AC_SUBST(wxUSE_ZLIB)
+AC_SUBST(wxUSE_REGEX)
+AC_SUBST(wxUSE_ODBC)
+AC_SUBST(wxUSE_LIBJPEG)
+AC_SUBST(wxUSE_LIBPNG)
+AC_SUBST(wxUSE_LIBTIFF)
+
+EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
+
+dnl FIXME -- must use configure option!
+MONOLITHIC=1
+
+AC_SUBST(WXUNIV)
+AC_SUBST(MONOLITHIC)
+AC_SUBST(EXTRALIBS)
+AC_SUBST(UNICODE)
+AC_SUBST(BUILD)
+AC_SUBST(SHARED)
+TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr [[A-Z]] [[a-z]]`
+AC_SUBST(TOOLKIT_LOWERCASE)
+AC_SUBST(TOOLKIT_VERSION)
+AC_SUBST(SAMPLES_RPATH_FLAG)
+
+AC_BAKEFILE
+
 dnl C/C++ compiler options used to compile wxWindows
 if test "$GXX" = yes ; then
     dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
     CXXWARNINGS="-Wall"
     dnl should enable this one day...
     dnl CXXWARNINGS="-Wall -Werror"
-
-    dnl Add this *after* all compile tests, we don't need or want generated
-    dnl depfiles until actually building the lib
-    if test "$wxUSE_NO_DEPS" = "no" ; then
-        CFLAGS="-MMD $CFLAGS"
-        CXXFLAGS="-MMD $CXXFLAGS"
-    fi
 fi
 
 EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"
@@ -5610,7 +5669,6 @@ AC_SUBST(LDFLAGS_VERSIONING)
 AC_SUBST(LDFLAGS_EXE)
 AC_SUBST(OPENGL_LIBS)
 AC_SUBST(DMALLOC_LIBS)
-AC_SUBST(EXTRADEFS)
 AC_SUBST(WX_VERSION_TAG)
 
 dnl additional resurces settings
@@ -5671,8 +5729,14 @@ wx_cv_use_resources=${wxUSE_RESOURCES}
 export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
        wx_cv_path_ifs wx_cv_program_ext \
        wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype \
-       wx_cv_library_basename wx_cv_release wx_cv_current wx_cv_revision wx_cv_age \
-       wx_cv_use_gui wx_cv_use_resources
+       wx_cv_library_basename \
+       wx_cv_release wx_cv_current wx_cv_revision wx_cv_age \
+       wx_cv_use_gui wx_cv_use_resources \
+       CFLAGS LDFLAGS CXXFLAGS CPPFLAGS \
+       top_builddir USE_GUI MONOLITHIC \
+       wxUSE_ZLIB wxUSE_REGEX wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG \
+       wxUSE_LIBTIFF EXTRALIBS UNICODE BUILD SHARED TOOLKIT TOOLKIT_LOWERCASE \
+       TOOLKIT_VERSION SAMPLES_RPATH_FLAG WXUNIV
 
 AC_CONFIG_SUBDIRS(demos samples utils contrib)
 
@@ -5682,9 +5746,6 @@ dnl colon)
 AC_OUTPUT([
             wx-config
             version-script
-            src/make.env
-            src/makeprog.env
-            src/makelib.env
             Makefile
           ],
           [

samples/Makefile.in

@@ -1,11 +1,100 @@
-#
-# Makefile : Builds wxWindows samples for Unix.
-#
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
 
-SAMPLES_SUBDIRS=@SAMPLES_SUBDIRS@
 
-all:
-	@for d in $(SAMPLES_SUBDIRS); do (cd $$d && $(MAKE)); done
+@MAKE_SET@
+
+CPPFLAGS = @CPPFLAGS@
+INSTALL_DIR = @INSTALL_DIR@
+USE_SOSYMLINKS = @USE_SOSYMLINKS@
+srcdir = @srcdir@
+INSTALL_DATA = @INSTALL_DATA@
+STRIP = @STRIP@
+PLATFORM_MSDOS = @PLATFORM_MSDOS@
+RANLIB = @RANLIB@
+SO_SUFFIX = @SO_SUFFIX@
+CXXFLAGS = @CXXFLAGS@
+top_srcdir = @top_srcdir@
+prefix = @prefix@
+AR = @AR@
+BUILD = @BUILD@
+INSTALL = @INSTALL@
+EXEEXT = @EXEEXT@
+RESCOMP = @RESCOMP@
+PLATFORM_MAC = @PLATFORM_MAC@
+USE_SOVERSION = @USE_SOVERSION@
+SONAME_FLAG = @SONAME_FLAG@
+USE_MACVERSION = @USE_MACVERSION@
+PLATFORM_MACOSX = @PLATFORM_MACOSX@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+SETFILE = @SETFILE@
+DEPS_TYPE = @DEPS_TYPE@
+exec_prefix = @exec_prefix@
+DLLPREFIX = @DLLPREFIX@
+libdir = @libdir@
+SHARED_LD_CXX = @SHARED_LD_CXX@
+CXX = @CXX@
+CC = @CC@
+datadir = @datadir@
+includedir = @includedir@
+LN_S = @LN_S@
+PIC_FLAG = @PIC_FLAG@
+CFLAGS = @CFLAGS@
+PLATFORM_UNIX = @PLATFORM_UNIX@
+USE_SOVERSOLARIS = @USE_SOVERSOLARIS@
+PLATFORM_WIN32 = @PLATFORM_WIN32@
+USE_SOVERLINUX = @USE_SOVERLINUX@
+bindir = @bindir@
+SHARED_LD_CC = @SHARED_LD_CC@
+
+### Conditionally set variables: ###
+
+@COND_PLATFORM_WIN321@DLLIMPEXT = .a
+@COND_PLATFORM_WIN320@DLLIMPEXT = .$(SO_SUFFIX)
+@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d
+
+### Targets: ###
+
+all: artprov dialogs image minimal
+
+install-strip: install
+	(cd artprov && $(MAKE) install-strip)
+	(cd dialogs && $(MAKE) install-strip)
+	(cd image && $(MAKE) install-strip)
+	(cd minimal && $(MAKE) install-strip)
+
+dialogs: 
+	(cd dialogs && $(MAKE) all)
 
 clean: 
-	@for d in $(SAMPLES_SUBDIRS); do (cd $$d && $(MAKE) clean); done
+	rm -f ./*.o ./*.d
+	(cd artprov && $(MAKE) clean)
+	(cd dialogs && $(MAKE) clean)
+	(cd image && $(MAKE) clean)
+	(cd minimal && $(MAKE) clean)
+
+install: all
+	(cd artprov && $(MAKE) install)
+	(cd dialogs && $(MAKE) install)
+	(cd image && $(MAKE) install)
+	(cd minimal && $(MAKE) install)
+
+artprov: 
+	(cd artprov && $(MAKE) all)
+
+image: 
+	(cd image && $(MAKE) all)
+
+minimal: 
+	(cd minimal && $(MAKE) all)
+
+uninstall: 
+
+
+# Include dependency info, if present:
+@IF_GNU_MAKE@-include *.d
+
+.PHONY: all dialogs artprov image minimal

samples/access/access.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="accesstest" template="wx_sample" template_append="wx_append">
+        <sources>accesstest.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>accesstest.rc</win32-res>
+    </exe>
+
+</makefile>

samples/aclocal.m4

@@ -0,0 +1,505 @@
+# generated automatically by aclocal 1.7.2 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+dnl ---------------------------------------------------------------------------
+dnl Support macros for makefiles generated by BAKEFILE.
+dnl ---------------------------------------------------------------------------
+
+dnl Lots of compiler & linker detection code contained here was taken from
+dnl wxWindows configure.in script (see http://www.wxwindows.org)
+
+
+
+dnl ---------------------------------------------------------------------------
+dnl AC_BAKEFILE_GNUMAKE
+dnl
+dnl Detects GNU make
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN(AC_BAKEFILE_GNUMAKE,
+[
+    dnl does make support "-include" (only GNU make does AFAIK)?
+    AC_CACHE_CHECK([if make is GNU make], wx_cv_prog_makeisgnu,
+    [
+        if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
+                egrep -s GNU > /dev/null); then
+            bakefile_cv_prog_makeisgnu="yes"
+        else
+            bakefile_cv_prog_makeisgnu="no"
+        fi
+    ])
+
+    if test "x$bakefile_cv_prog_makeisgnu" = "xyes"; then
+        IF_GNU_MAKE=""
+    else
+        IF_GNU_MAKE="#"
+    fi
+    AC_SUBST(IF_GNU_MAKE)
+])
+
+dnl ---------------------------------------------------------------------------
+dnl AC_BAKEFILE_PLATFORM
+dnl
+dnl Detects platform and sets PLATFORM_XXX variables accordingly
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN(AC_BAKEFILE_PLATFORM,
+[
+    PLATFORM_UNIX=0
+    PLATFORM_WIN32=0
+    PLATFORM_MSDOS=0
+    PLATFORM_MAC=0
+    PLATFORM_MACOSX=0
+    
+    case "${host}" in
+        *-*-cygwin* | *-*-mingw32* )
+            PLATFORM_WIN32=1
+        ;;
+        *-pc-msdosdjgpp | *-pc-os2_emx | *-pc-os2-emx )
+            PLATFORM_MSDOS=1
+        ;;
+        powerpc-*-darwin* )
+            PLATFORM_MAC=1
+            PLATFORM_MACOSX=1
+        ;;
+        * )
+            PLATFORM_UNIX=1
+        ;;
+    esac
+
+    AC_SUBST(PLATFORM_UNIX)
+    AC_SUBST(PLATFORM_WIN32)
+    AC_SUBST(PLATFORM_MSDOS)
+    AC_SUBST(PLATFORM_MAC)
+    AC_SUBST(PLATFORM_MACOSX)
+])
+
+
+
+dnl ---------------------------------------------------------------------------
+dnl AC_BAKEFILE_SUFFIXES
+dnl
+dnl Detects shared various suffixes for shared libraries, libraries, programs,
+dnl plugins etc.
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN(AC_BAKEFILE_SUFFIXES,
+[
+    SO_SUFFIX="so"
+    EXEEXT=""
+    DLLPREFIX=lib
+    
+    case "${host}" in
+        *-hp-hpux* )
+            SO_SUFFIX="sl"
+        ;;
+        *-*-aix* )
+            dnl quoting from
+            dnl http://www-1.ibm.com/servers/esdd/articles/gnu.html:
+            dnl     Both archive libraries and shared libraries on AIX have an
+            dnl     .a extension. This will explain why you can't link with an
+            dnl     .so and why it works with the name changed to .a.
+            SO_SUFFIX="a"
+        ;;
+        *-*-cygwin* | *-*-mingw32* )
+            SO_SUFFIX="dll"
+            EXEEXT=".exe"
+            DLLPREFIX=""
+        ;;
+        *-pc-msdosdjgpp | *-pc-os2_emx | *-pc-os2-emx )
+            EXEEXT=".exe"
+            DLLPREFIX=""
+        ;;
+        powerpc-*-darwin* )
+            SO_SUFFIX="dylib"
+        ;;
+    esac
+
+    AC_SUBST(SO_SUFFIX)
+    AC_SUBST(EXEEXT)
+    AC_SUBST(DLLPREFIX)
+])
+
+
+dnl ---------------------------------------------------------------------------
+dnl AC_BAKEFILE_SHARED_LD
+dnl
+dnl Detects command for making shared libraries, substitutes SHARED_LD_CC
+dnl and SHARED_LD_CXX.
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN(AC_BAKEFILE_SHARED_LD,
+[
+    dnl Defaults for GCC and ELF .so shared libs:
+    SHARED_LD_CC="\$(CC) -shared -o"
+    SHARED_LD_CXX="\$(CXX) -shared -o"
+
+    dnl the extra compiler flags needed for compilation of shared library
+    if test "x$GCC" = "xyes"; then
+        dnl the switch for gcc is the same under all platforms
+        PIC_FLAG="-fPIC"
+    fi
+
+    case "${host}" in
+      *-hp-hpux* )
+        dnl default settings are good for gcc but not for the native HP-UX
+        if test "x$GCC" = "xyes"; then
+            dnl -o flag must be after PIC flag
+            SHARED_LD_CC="${CC} -shared ${PIC_FLAG} -o"
+            SHARED_LD_CXX="${CXX} -shared ${PIC_FLAG} -o"
+        else
+            dnl no idea why it wants it, but it does
+            LDFLAGS="$LDFLAGS -L/usr/lib"
+
+            SHARED_LD_CC="${CC} -b -o"
+            SHARED_LD_CXX="${CXX} -b -o"
+            PIC_FLAG="+Z"
+        fi
+      ;;
+
+      *-*-linux* )
+        if test "x$GCC" != "xyes"; then
+            AC_CACHE_CHECK([for Intel compiler], bakefile_cv_prog_icc,
+            [
+                AC_TRY_COMPILE([],
+                    [
+                        #ifndef __INTEL_COMPILER
+                        #error Not icc
+                        #endif
+                    ],
+                    bakefile_cv_prog_icc=yes,
+                    bakefile_cv_prog_icc=no
+                )
+            ])
+            if test "$bakefile_cv_prog_icc" = "yes"; then
+                PIC_FLAG="-KPIC"
+            fi
+        fi
+      ;;
+
+      *-*-solaris2* )
+        if test "x$GCC" != xyes ; then
+            SHARED_LD_CC="${CC} -G -o"
+            SHARED_LD_CXX="${CXX} -G -o"
+            PIC_FLAG="-KPIC"
+        fi
+      ;;
+
+      *-*-darwin* )
+        dnl For Unix to MacOS X porting instructions, see:
+        dnl http://fink.sourceforge.net/doc/porting/porting.html
+        CFLAGS="$CFLAGS -fno-common"
+        CXXFLAGS="$CXXFLAGS -fno-common"
+        
+        dnl Most apps benefit from being fully binded (its faster and static
+        dnl variables initialized at startup work).
+        dnl This can be done either with the exe linker flag -Wl,-bind_at_load
+        dnl or with a double stage link in order to create a single module
+        dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
+
+        cat <<EOF >shared-ld-sh
+#!/bin/sh
+#-----------------------------------------------------------------------------
+#-- Name:        distrib/mac/shared-ld-sh
+#-- Purpose:     Link a mach-o dynamic shared library for Darwin / Mac OS X
+#-- Author:      Gilles Depeyrot
+#-- Copyright:   (c) 2002 Gilles Depeyrot
+#-- Licence:     any use permitted
+#-----------------------------------------------------------------------------
+
+verbose=0
+args=""
+objects=""
+
+while test \${#} -gt 0; do
+    case \${1} in
+
+       -v)
+        verbose=1
+        ;;
+
+       -o|-compatibility_version|-current_version|-framework|-undefined|-install_name)
+        # collect these options and values
+        args="\${args} \${1} \${2}"
+        shift
+        ;;
+
+       -l*|-L*|-flat_namespace)
+        # collect these options
+        args="\${args} \${1}"
+        ;;
+
+       -dynamiclib)
+        # skip these options
+        ;;
+
+       -*)
+        echo "shared-ld: unhandled option '\${1}'"
+        exit 1
+        ;;
+
+        *.o | *.a)
+        # collect object files
+        objects="\${objects} \${1}"
+        ;;
+
+        *)
+        echo "shared-ld: unhandled argument '\${1}'"
+        exit 1
+        ;;
+
+    esac
+    shift
+done
+
+#
+# Link one module containing all the others
+#
+if test \${verbose} = 1; then
+    echo "c++ -r -keep_private_externs -nostdlib \${objects} -o master.\$\$.o"
+fi
+c++ -r -keep_private_externs -nostdlib \${objects} -o master.\$\$.o
+status=\$?
+if test \${status} != 0; then
+    exit \${status}
+fi
+
+#
+# Link the shared library from the single module created
+#
+if test \${verbose} = 1; then
+    echo "cc -dynamiclib master.\$\$.o \${args}"
+fi
+c++ -dynamiclib master.\$\$.o \${args}
+status=\$?
+if test \${status} != 0; then
+    exit \${status}
+fi
+
+#
+# Remove intermediate module
+#
+rm -f master.\$\$.o
+
+exit 0
+EOF
+        chmod +x shared-ld-sh
+
+        SHARED_LD_CC="`pwd`/shared-ld-sh -undefined suppress -flat_namespace -o"
+        SHARED_LD_CXX="$SHARED_LD_CC"
+        PIC_FLAG="-dynamic -fPIC"
+        dnl FIXME - what about C libs? Gilles says to use c++ because it doesn't
+        dnl         matter for C projects and matters for C++ ones
+        dnl FIXME - newer devel tools have linker flag to do this, the script
+        dnl         is not necessary - detect!
+      ;;
+
+      *-*-aix* )
+        dnl default settings are ok for gcc
+        if test "x$GCC" != "xyes"; then
+            dnl the abs path below used to be hardcoded here so I guess it must
+            dnl be some sort of standard location under AIX?
+            AC_CHECK_PROG(AIX_CXX_LD, makeC++SharedLib,
+                          makeC++SharedLib, /usr/lpp/xlC/bin/makeC++SharedLib)
+            dnl FIXME - what about makeCSharedLib?            
+            SHARED_LD_CC="$AIX_CC_LD -p 0 -o"
+            SHARED_LD_CXX="$AIX_CXX_LD -p 0 -o"
+        fi
+      ;;
+
+      *-*-beos* )
+        dnl can't use gcc under BeOS for shared library creation because it
+        dnl complains about missing 'main'
+        SHARED_LD_CC="${LD} -shared -o"
+        SHARED_LD_CXX="${LD} -shared -o"
+      ;;
+
+      *-*-irix* )
+        dnl default settings are ok for gcc
+        if test "x$GCC" != "xyes"; then
+            PIC_FLAG="-KPIC"
+        fi
+      ;;
+      
+      *-*-cygwin* | *-*-mingw32* )
+        PIC_FLAG=""
+      ;;
+      
+      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
+      *-*-sunos4* | \
+      *-*-osf* | \
+      *-*-dgux5* | \
+      *-*-sysv5* )
+        dnl defaults are ok
+      ;;
+
+      *)
+        AC_MSG_ERROR(unknown system type $host.)
+    esac
+
+    AC_SUBST(SHARED_LD_CC)
+    AC_SUBST(SHARED_LD_CXX)
+    AC_SUBST(PIC_FLAG)
+])
+
+
+dnl ---------------------------------------------------------------------------
+dnl AC_BAKEFILE_SHARED_VERSIONS
+dnl
+dnl Detects linker options for attaching versions (sonames) to shared  libs.
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN(AC_BAKEFILE_SHARED_VERSIONS,
+[
+    USE_SOVERSION=0
+    USE_SOVERLINUX=0
+    USE_SOVERSOLARIS=0
+    USE_SOSYMLINKS=0
+    USE_MACVERSION=0
+    SONAME_FLAG=
+
+    case "${host}" in
+      *-*-linux* )
+        SONAME_FLAG="-Wl,-soname,"
+        USE_SOVERSION=1
+        USE_SOVERLINUX=1
+        USE_SOSYMLINKS=1
+      ;;
+
+      *-*-solaris2* )
+        SONAME_FLAG="-h "
+        USE_SOVERSION=1
+        USE_SOVERSOLARIS=1
+        USE_SOSYMLINKS=1
+      ;;
+
+      *-*-darwin* )
+        USE_MACVERSION=1
+        USE_SOVERSION=1
+        USE_SOSYMLINKS=1
+      ;;      
+    esac
+
+    AC_SUBST(USE_SOVERSION)
+    AC_SUBST(USE_SOVERLINUX)
+    AC_SUBST(USE_SOVERSOLARIS)
+    AC_SUBST(USE_MACVERSION)
+    AC_SUBST(USE_SOSYMLINKS)
+    AC_SUBST(SONAME_FLAG)
+])
+
+
+dnl ---------------------------------------------------------------------------
+dnl AC_BAKEFILE_DEPS
+dnl
+dnl Detects available C/C++ dependency tracking options
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN(AC_BAKEFILE_DEPS,
+[
+    DEPS_TYPE=no
+    if test "x$GCC" = "xyes"; then
+        DEPS_TYPE=gcc
+    fi
+    
+    AC_SUBST(DEPS_TYPE)
+])
+
+dnl ---------------------------------------------------------------------------
+dnl AC_BAKEFILE_CHECK_BASIC_STUFF
+dnl
+dnl Checks for presence of basic programs, such as C and C++ compiler, "ranlib"
+dnl or "install"
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN(AC_BAKEFILE_CHECK_BASIC_STUFF,
+[
+    AC_PROG_RANLIB
+    AC_PROG_INSTALL
+    AC_PROG_LN_S
+
+    AC_PROG_MAKE_SET
+    AC_SUBST(MAKE_SET)
+    
+    if test "$build" != "$host" ; then
+        AR=$host_alias-ar
+        STRIP=$host_alias-strip
+    else
+        AC_CHECK_PROG(AR, ar, ar, ar)
+        AC_CHECK_PROG(STRIP, strip, strip, true)
+    fi
+
+    case ${host} in
+        *-hp-hpux* )
+            INSTALL_DIR="mkdir"
+            ;;
+        *)  INSTALL_DIR="$INSTALL -d"
+            ;;
+    esac
+    AC_SUBST(INSTALL_DIR)
+])
+
+
+dnl ---------------------------------------------------------------------------
+dnl AC_BAKEFILE_RES_COMPILERS
+dnl
+dnl Checks for presence of resource compilers for win32 or mac
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN(AC_BAKEFILE_RES_COMPILERS,
+[
+    RESCOMP=
+    SETFILE=
+
+    case ${host} in 
+        *-*-cygwin* | *-*-mingw32* )
+            dnl Check for win32 resources compiler:
+            if test "$build" != "$host" ; then
+                RESCOMP=$host_alias-windres
+            else
+                AC_CHECK_PROG(RESCOMP, windres, windres, windres)
+            fi
+         ;;
+ 
+      *-*-darwin* )
+            AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
+            AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile)
+        ;;
+    esac
+
+    AC_SUBST(RESCOMP)
+    AC_SUBST(SETFILE)
+])
+
+dnl ---------------------------------------------------------------------------
+dnl AC_BAKEFILE
+dnl
+dnl To be used in configure.in of any project using Bakefile-generated mks
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN(AC_BAKEFILE,
+[
+    if test "x$BAKEFILE_CHECK_BASICS" != "xno"; then
+        AC_BAKEFILE_CHECK_BASIC_STUFF
+    fi
+    AC_BAKEFILE_GNUMAKE
+    AC_BAKEFILE_PLATFORM
+    AC_BAKEFILE_SUFFIXES
+    AC_BAKEFILE_SHARED_LD
+    AC_BAKEFILE_SHARED_VERSIONS
+    AC_BAKEFILE_DEPS
+    AC_BAKEFILE_RES_COMPILERS
+
+    builtin(include, autoconf_inc.m4)
+])
+

samples/artprov/artprov.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="arttest" template="wx_sample" template_append="wx_append">
+        <sources>arttest.cpp artbrows.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>arttest.rc</win32-res>
+    </exe>
+
+</makefile>

samples/autoconf_inc.m4

@@ -0,0 +1,114 @@
+dnl This macro was generated by
+dnl Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+dnl Do not modify, all changes will be overwritten!
+
+    dnl Conditions:
+
+dnl ### begin block COND_PLATFORM_WIN321 ###
+    COND_PLATFORM_WIN321="#"
+    if test "x$PLATFORM_WIN32" = "x1" ; then
+        COND_PLATFORM_WIN321=
+    fi
+    AC_SUBST(COND_PLATFORM_WIN321)
+dnl ### begin block COND_PLATFORM_WIN320 ###
+    COND_PLATFORM_WIN320="#"
+    if test "x$PLATFORM_WIN32" = "x0" ; then
+        COND_PLATFORM_WIN320=
+    fi
+    AC_SUBST(COND_PLATFORM_WIN320)
+dnl ### begin block COND_DEPS_TYPEGCC ###
+    COND_DEPS_TYPEGCC="#"
+    if test "x$DEPS_TYPE" = "xgcc" ; then
+        COND_DEPS_TYPEGCC=
+    fi
+    AC_SUBST(COND_DEPS_TYPEGCC)
+dnl ### begin block COND_WXUSE_ZLIBBUILTIN ###
+    COND_WXUSE_ZLIBBUILTIN="#"
+    if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
+        COND_WXUSE_ZLIBBUILTIN=
+    fi
+    AC_SUBST(COND_WXUSE_ZLIBBUILTIN)
+dnl ### begin block COND_UNICODE1 ###
+    COND_UNICODE1="#"
+    if test "x$UNICODE" = "x1" ; then
+        COND_UNICODE1=
+    fi
+    AC_SUBST(COND_UNICODE1)
+dnl ### begin block COND_BUILDDEBUG ###
+    COND_BUILDDEBUG="#"
+    if test "x$BUILD" = "xdebug" ; then
+        COND_BUILDDEBUG=
+    fi
+    AC_SUBST(COND_BUILDDEBUG)
+dnl ### begin block COND_WXUSE_LIBJPEGBUILTIN ###
+    COND_WXUSE_LIBJPEGBUILTIN="#"
+    if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+        COND_WXUSE_LIBJPEGBUILTIN=
+    fi
+    AC_SUBST(COND_WXUSE_LIBJPEGBUILTIN)
+dnl ### begin block COND_WXUSE_ODBCBUILTIN ###
+    COND_WXUSE_ODBCBUILTIN="#"
+    if test "x$wxUSE_ODBC" = "xbuiltin" ; then
+        COND_WXUSE_ODBCBUILTIN=
+    fi
+    AC_SUBST(COND_WXUSE_ODBCBUILTIN)
+dnl ### begin block COND_WXUSE_LIBPNGBUILTIN ###
+    COND_WXUSE_LIBPNGBUILTIN="#"
+    if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+        COND_WXUSE_LIBPNGBUILTIN=
+    fi
+    AC_SUBST(COND_WXUSE_LIBPNGBUILTIN)
+dnl ### begin block COND_MONOLITHIC0 ###
+    COND_MONOLITHIC0="#"
+    if test "x$MONOLITHIC" = "x0" ; then
+        COND_MONOLITHIC0=
+    fi
+    AC_SUBST(COND_MONOLITHIC0)
+dnl ### begin block COND_WXUNIV1 ###
+    COND_WXUNIV1="#"
+    if test "x$WXUNIV" = "x1" ; then
+        COND_WXUNIV1=
+    fi
+    AC_SUBST(COND_WXUNIV1)
+dnl ### begin block COND_PLATFORM_MAC1 ###
+    COND_PLATFORM_MAC1="#"
+    if test "x$PLATFORM_MAC" = "x1" ; then
+        COND_PLATFORM_MAC1=
+    fi
+    AC_SUBST(COND_PLATFORM_MAC1)
+dnl ### begin block COND_TOOLKITMAC ###
+    COND_TOOLKITMAC="#"
+    if test "x$TOOLKIT" = "xMAC" ; then
+        COND_TOOLKITMAC=
+    fi
+    AC_SUBST(COND_TOOLKITMAC)
+dnl ### begin block COND_MONOLITHIC1 ###
+    COND_MONOLITHIC1="#"
+    if test "x$MONOLITHIC" = "x1" ; then
+        COND_MONOLITHIC1=
+    fi
+    AC_SUBST(COND_MONOLITHIC1)
+dnl ### begin block COND_WXUSE_LIBTIFFBUILTIN ###
+    COND_WXUSE_LIBTIFFBUILTIN="#"
+    if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+        COND_WXUSE_LIBTIFFBUILTIN=
+    fi
+    AC_SUBST(COND_WXUSE_LIBTIFFBUILTIN)
+dnl ### begin block COND_USE_GUI0 ###
+    COND_USE_GUI0="#"
+    if test "x$USE_GUI" = "x0" ; then
+        COND_USE_GUI0=
+    fi
+    AC_SUBST(COND_USE_GUI0)
+dnl ### begin block COND_USE_GUI1 ###
+    COND_USE_GUI1="#"
+    if test "x$USE_GUI" = "x1" ; then
+        COND_USE_GUI1=
+    fi
+    AC_SUBST(COND_USE_GUI1)
+dnl ### begin block COND_WXUSE_REGEXBUILTIN ###
+    COND_WXUSE_REGEXBUILTIN="#"
+    if test "x$wxUSE_REGEX" = "xbuiltin" ; then
+        COND_WXUSE_REGEXBUILTIN=
+    fi
+    AC_SUBST(COND_WXUSE_REGEXBUILTIN)

samples/calendar/calendar.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="calendar" template="wx_sample" template_append="wx_append">
+        <sources>calendar.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>calendar.rc</win32-res>
+    </exe>
+
+</makefile>

samples/caret/caret.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="caret" template="wx_sample" template_append="wx_append">
+        <sources>caret.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>caret.rc</win32-res>
+    </exe>
+
+</makefile>

samples/checklst/checklst.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="checklst" template="wx_sample" template_append="wx_append">
+        <sources>checklst.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>checklst.rc</win32-res>
+    </exe>
+
+</makefile>

samples/config/config.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="conftest" template="wx_sample" template_append="wx_append">
+        <sources>conftest.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>conftest.rc</win32-res>
+    </exe>
+
+</makefile>

samples/console/console.bkl

@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="console" template="wx_sample" template_append="wx_append">
+        <sources>console.cpp</sources>
+    </exe>
+
+    <wx-data id="data">
+        <files>testdata.fc</files>
+    </wx-data>
+
+</makefile>

samples/controls/controls.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="controls" template="wx_sample" template_append="wx_append">
+        <sources>controls.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>controls.rc</win32-res>
+    </exe>
+
+</makefile>

samples/db/db.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="dbtest" template="wx_sample" template_append="wx_append">
+        <sources>dbtest.cpp listdb.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>dbtest.rc</win32-res>
+    </exe>
+
+</makefile>

samples/dialogs/dialogs.bkl

@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="dialogs" template="wx_sample" template_append="wx_append">
+        <sources>dialogs.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>dialogs.rc</win32-res>
+    </exe>
+
+    <wx-data id="data">
+        <files>tips.txt</files>
+    </wx-data>
+
+</makefile>

samples/dialup/dialup.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="nettest" template="wx_sample" template_append="wx_append">
+        <sources>nettest.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>nettest.rc</win32-res>
+    </exe>
+
+</makefile>

samples/display/display.bkl

@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="display" template="wx_sample" template_append="wx_append">
+        <sources>display.cpp</sources>
+        <wx-lib>core</wx-lib>
+    </exe>
+
+</makefile>

samples/dnd/dnd.bkl

@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="dnd" template="wx_sample" template_append="wx_append">
+        <sources>dnd.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>dnd.rc</win32-res>
+    </exe>
+
+    <wx-data id="data">
+        <files>julian.png dnd.wxr</files>
+    </wx-data>
+
+</makefile>

samples/docview/docview.bkl

@@ -0,0 +1,18 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="docview" template="wx_sample" template_append="wx_append">
+        <sources>docview.cpp doc.cpp view.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>docview.rc</win32-res>
+    </exe>
+
+    <!-- FIXME FIXME
+RESOPTIONS=-i $(top_srcdir)/$(program_dir) chart.r doc.r docview.r mondrian.r -c WXMA
+SETOPTIONS=-a C
+    -->
+
+    
+</makefile>

samples/docvwmdi/docvwmdi.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="docview" template="wx_sample" template_append="wx_append">
+        <sources>docview.cpp doc.cpp view.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>docview.rc</win32-res>
+    </exe>
+
+</makefile>

samples/dragimag/dragimag.bkl

@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="dragimag" template="wx_sample" template_append="wx_append">
+        <sources>dragimag.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>dragimag.rc</win32-res>
+    </exe>
+
+    <wx-data id="data">
+        <files>backgrnd.png shape01.png shape02.png shape03.png</files>
+    </wx-data>
+
+</makefile>

samples/drawing/drawing.bkl

@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="drawing" template="wx_sample" template_append="wx_append">
+        <sources>drawing.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>drawing.rc</win32-res>
+    </exe>
+
+    <wx-data id="data">
+        <files>pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp</files>
+    </wx-data>
+
+</makefile>

samples/dynamic/dynamic.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="dynamic" template="wx_sample" template_append="wx_append">
+        <sources>dynamic.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>dynamic.rc</win32-res>
+    </exe>
+
+</makefile>

samples/erase/erase.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="erase" template="wx_sample" template_append="wx_append">
+        <sources>erase.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>erase.rc</win32-res>
+    </exe>
+
+</makefile>

samples/event/event.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="event" template="wx_sample" template_append="wx_append">
+        <sources>event.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>event.rc</win32-res>
+    </exe>
+
+</makefile>

samples/exec/exec.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="exec" template="wx_sample" template_append="wx_append">
+        <sources>exec.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>exec.rc</win32-res>
+    </exe>
+
+</makefile>

samples/font/font.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="font" template="wx_sample" template_append="wx_append">
+        <sources>font.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>font.rc</win32-res>
+    </exe>
+
+</makefile>

samples/grid/grid.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="grid" template="wx_sample" template_append="wx_append">
+        <sources>grid.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>grid.rc</win32-res>
+    </exe>
+
+</makefile>

samples/help/help.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="help" template="wx_sample" template_append="wx_append">
+        <sources>help.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>help.rc</win32-res>
+    </exe>
+
+</makefile>

samples/htlbox/htlbox.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="htlbox" template="wx_sample" template_append="wx_append">
+        <sources>htlbox.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>htlbox.rc</win32-res>
+    </exe>
+
+</makefile>

samples/image/image.bkl

@@ -0,0 +1,22 @@
+<?xml version="1.0" ?>
+<!-- $Id$ -->
+
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="image" template="wx_sample" template_append="wx_append">
+        <sources>image.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>image.rc</win32-res>
+    </exe>
+
+    <wx-data id="data">
+        <files>
+            horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm
+            horse.tif horse.xpm horse.cur horse.ico horse3.ani
+            smile.xbm
+        </files>
+    </wx-data>
+
+</makefile>

samples/internat/internat.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="internat" template="wx_sample" template_append="wx_append">
+        <sources>internat.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>internat.rc</win32-res>
+    </exe>
+
+</makefile>

samples/ipc/ipc.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="ipc" template="wx_sample" template_append="wx_append">
+        <sources>ipc.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>ipc.rc</win32-res>
+    </exe>
+
+</makefile>

samples/joytest/joytest.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="joytest" template="wx_sample" template_append="wx_append">
+        <sources>joytest.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>joytest.rc</win32-res>
+    </exe>
+
+</makefile>

samples/keyboard/keyboard.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="keyboard" template="wx_sample" template_append="wx_append">
+        <sources>keyboard.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>keyboard.rc</win32-res>
+    </exe>
+
+</makefile>

samples/layout/layout.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="layout" template="wx_sample" template_append="wx_append">
+        <sources>layout.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>layout.rc</win32-res>
+    </exe>
+
+</makefile>

samples/listbox/listbox.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="listbox" template="wx_sample" template_append="wx_append">
+        <sources>listbox.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>listbox.rc</win32-res>
+    </exe>
+
+</makefile>

samples/listctrl/listctrl.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="listctrl" template="wx_sample" template_append="wx_append">
+        <sources>listctrl.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>listctrl.rc</win32-res>
+    </exe>
+
+</makefile>

samples/mdi/mdi.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="mdi" template="wx_sample" template_append="wx_append">
+        <sources>mdi.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>mdi.rc</win32-res>
+    </exe>
+
+</makefile>

samples/memcheck/memcheck.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="memcheck" template="wx_sample" template_append="wx_append">
+        <sources>memcheck.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>memcheck.rc</win32-res>
+    </exe>
+
+</makefile>

samples/menu/menu.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="menu" template="wx_sample" template_append="wx_append">
+        <sources>menu.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>menu.rc</win32-res>
+    </exe>
+
+</makefile>

samples/mfc/mfc.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="mfc" template="wx_sample" template_append="wx_append">
+        <sources>mfc.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>mfc.rc</win32-res>
+    </exe>
+
+</makefile>

samples/minifram/minifram.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="minifram" template="wx_sample" template_append="wx_append">
+        <sources>minifram.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>minifram.rc</win32-res>
+    </exe>
+
+</makefile>

samples/minimal/minimal.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="minimal" template="wx_sample" template_append="wx_append">
+        <sources>minimal.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>minimal.rc</win32-res>
+    </exe>
+
+</makefile>

samples/mobile/mobile.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="mobile" template="wx_sample" template_append="wx_append">
+        <sources>mobile.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>mobile.rc</win32-res>
+    </exe>
+
+</makefile>

samples/multimon/multimon.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="multimon" template="wx_sample" template_append="wx_append">
+        <sources>multimon.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>multimon.rc</win32-res>
+    </exe>
+
+</makefile>

samples/nativdlg/nativdlg.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="nativdlg" template="wx_sample" template_append="wx_append">
+        <sources>nativdlg.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>nativdlg.rc</win32-res>
+    </exe>
+
+</makefile>

samples/newgrid/newgrid.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="newgrid" template="wx_sample" template_append="wx_append">
+        <sources>newgrid.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>newgrid.rc</win32-res>
+    </exe>
+
+</makefile>

samples/notebook/notebook.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="notebook" template="wx_sample" template_append="wx_append">
+        <sources>notebook.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>notebook.rc</win32-res>
+    </exe>
+
+</makefile>

samples/oleauto/oleauto.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="oleauto" template="wx_sample" template_append="wx_append">
+        <sources>oleauto.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>oleauto.rc</win32-res>
+    </exe>
+
+</makefile>

samples/opengl/opengl.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="opengl" template="wx_sample" template_append="wx_append">
+        <sources>opengl.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>opengl.rc</win32-res>
+    </exe>
+
+</makefile>

samples/ownerdrw/ownerdrw.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="ownerdrw" template="wx_sample" template_append="wx_append">
+        <sources>ownerdrw.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>ownerdrw.rc</win32-res>
+    </exe>
+
+</makefile>

samples/png/png.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="png" template="wx_sample" template_append="wx_append">
+        <sources>png.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>png.rc</win32-res>
+    </exe>
+
+</makefile>

samples/printing/printing.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="printing" template="wx_sample" template_append="wx_append">
+        <sources>printing.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>printing.rc</win32-res>
+    </exe>
+
+</makefile>

samples/propsize/propsize.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="propsize" template="wx_sample" template_append="wx_append">
+        <sources>propsize.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>propsize.rc</win32-res>
+    </exe>
+
+</makefile>

samples/regtest/regtest.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="regtest" template="wx_sample" template_append="wx_append">
+        <sources>regtest.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>regtest.rc</win32-res>
+    </exe>
+
+</makefile>

samples/richedit/richedit.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="richedit" template="wx_sample" template_append="wx_append">
+        <sources>richedit.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>richedit.rc</win32-res>
+    </exe>
+
+</makefile>

samples/rotate/rotate.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="rotate" template="wx_sample" template_append="wx_append">
+        <sources>rotate.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>rotate.rc</win32-res>
+    </exe>
+
+</makefile>

samples/samples.bkl

@@ -0,0 +1,15 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <template id="sub">
+        <dir>$(id)</dir>
+        <dependency-of>all</dependency-of>
+    </template>
+
+    <!-- all samples are enumerated here: -->
+    <subproject id="artprov" template="sub"/>
+    <subproject id="dialogs" template="sub"/>
+    <subproject id="image" template="sub"/>
+    <subproject id="minimal" template="sub"/>
+
+</makefile>

samples/sashtest/sashtest.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="sashtest" template="wx_sample" template_append="wx_append">
+        <sources>sashtest.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>sashtest.rc</win32-res>
+    </exe>
+
+</makefile>

samples/scroll/scroll.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="scroll" template="wx_sample" template_append="wx_append">
+        <sources>scroll.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>scroll.rc</win32-res>
+    </exe>
+
+</makefile>

samples/scrollsub/scrollsub.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="scrollsub" template="wx_sample" template_append="wx_append">
+        <sources>scrollsub.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>scrollsub.rc</win32-res>
+    </exe>
+
+</makefile>

samples/shaped/shaped.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="shaped" template="wx_sample" template_append="wx_append">
+        <sources>shaped.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>shaped.rc</win32-res>
+    </exe>
+
+</makefile>

samples/sockets/sockets.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="sockets" template="wx_sample" template_append="wx_append">
+        <sources>sockets.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>sockets.rc</win32-res>
+    </exe>
+
+</makefile>

samples/splitter/splitter.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="splitter" template="wx_sample" template_append="wx_append">
+        <sources>splitter.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>splitter.rc</win32-res>
+    </exe>
+
+</makefile>

samples/statbar/statbar.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="statbar" template="wx_sample" template_append="wx_append">
+        <sources>statbar.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>statbar.rc</win32-res>
+    </exe>
+
+</makefile>

samples/tab/tab.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="tab" template="wx_sample" template_append="wx_append">
+        <sources>tab.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>tab.rc</win32-res>
+    </exe>
+
+</makefile>

samples/taskbar/taskbar.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="taskbar" template="wx_sample" template_append="wx_append">
+        <sources>taskbar.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>taskbar.rc</win32-res>
+    </exe>
+
+</makefile>

samples/text/text.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="text" template="wx_sample" template_append="wx_append">
+        <sources>text.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>text.rc</win32-res>
+    </exe>
+
+</makefile>

samples/thread/thread.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="thread" template="wx_sample" template_append="wx_append">
+        <sources>thread.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>thread.rc</win32-res>
+    </exe>
+
+</makefile>

samples/toolbar/toolbar.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="toolbar" template="wx_sample" template_append="wx_append">
+        <sources>toolbar.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>toolbar.rc</win32-res>
+    </exe>
+
+</makefile>

samples/treectrl/treectrl.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="treectrl" template="wx_sample" template_append="wx_append">
+        <sources>treectrl.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>treectrl.rc</win32-res>
+    </exe>
+
+</makefile>

samples/typetest/typetest.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="typetest" template="wx_sample" template_append="wx_append">
+        <sources>typetest.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>typetest.rc</win32-res>
+    </exe>
+
+</makefile>

samples/validate/validate.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="validate" template="wx_sample" template_append="wx_append">
+        <sources>validate.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>validate.rc</win32-res>
+    </exe>
+
+</makefile>

samples/vscroll/vscroll.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="vscroll" template="wx_sample" template_append="wx_append">
+        <sources>vscroll.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>vscroll.rc</win32-res>
+    </exe>
+
+</makefile>

samples/widgets/widgets.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="widgets" template="wx_sample" template_append="wx_append">
+        <sources>widgets.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>widgets.rc</win32-res>
+    </exe>
+
+</makefile>

samples/wizard/wizard.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="wizard" template="wx_sample" template_append="wx_append">
+        <sources>wizard.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>wizard.rc</win32-res>
+    </exe>
+
+</makefile>

samples/wxtest/wxtest.bkl

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="wxtest" template="wx_sample" template_append="wx_append">
+        <sources>wxtest.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <win32-res>wxtest.rc</win32-res>
+    </exe>
+
+</makefile>