From 481290e226d32e5b79597ad59e69f23a31a239dc Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 24 Jun 2003 22:05:29 +0000 Subject: [PATCH] moved to autoconf-2.5x git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/bakefiles/Makefile | 152 ++--- build/bakefiles/common.bkl | 4 +- build/bakefiles/regenMakefile.py | 9 +- contrib/configure | 1063 ------------------------------ contrib/configure.in | 99 --- demos/configure | 799 ---------------------- demos/configure.in | 27 - samples/Makefile.in | 8 +- samples/access/Makefile.in | 66 +- samples/artprov/Makefile.in | 66 +- samples/calendar/Makefile.in | 66 +- samples/caret/Makefile.in | 66 +- samples/checklst/Makefile.in | 66 +- samples/config/Makefile.in | 66 +- samples/console/Makefile.in | 62 +- samples/controls/Makefile.in | 66 +- samples/db/Makefile.in | 66 +- samples/dialogs/Makefile.in | 66 +- samples/dialup/Makefile.in | 66 +- samples/display/Makefile.in | 64 +- samples/dnd/Makefile.in | 66 +- samples/docview/Makefile.in | 66 +- samples/docvwmdi/Makefile.in | 66 +- samples/dragimag/Makefile.in | 66 +- samples/drawing/Makefile.in | 66 +- samples/dynamic/Makefile.in | 66 +- samples/erase/Makefile.in | 66 +- samples/event/Makefile.in | 66 +- samples/exec/Makefile.in | 66 +- samples/font/Makefile.in | 66 +- samples/grid/Makefile.in | 66 +- samples/help/Makefile.in | 66 +- samples/htlbox/Makefile.in | 66 +- samples/image/Makefile.in | 66 +- samples/internat/Makefile.in | 66 +- samples/ipc/Makefile.in | 66 +- samples/joytest/Makefile.in | 66 +- samples/keyboard/Makefile.in | 66 +- samples/layout/Makefile.in | 66 +- samples/listbox/Makefile.in | 66 +- samples/listctrl/Makefile.in | 66 +- samples/mdi/Makefile.in | 66 +- samples/memcheck/Makefile.in | 66 +- samples/menu/Makefile.in | 66 +- samples/mfc/Makefile.in | 66 +- samples/minifram/Makefile.in | 66 +- samples/minimal/Makefile.in | 64 +- samples/mobile/Makefile.in | 66 +- samples/multimon/Makefile.in | 66 +- samples/nativdlg/Makefile.in | 66 +- samples/newgrid/Makefile.in | 66 +- samples/notebook/Makefile.in | 66 +- samples/oleauto/Makefile.in | 66 +- samples/opengl/Makefile.in | 66 +- samples/ownerdrw/Makefile.in | 66 +- samples/png/Makefile.in | 66 +- samples/printing/Makefile.in | 66 +- samples/propsize/Makefile.in | 66 +- samples/regtest/Makefile.in | 66 +- samples/richedit/Makefile.in | 66 +- samples/rotate/Makefile.in | 66 +- samples/sashtest/Makefile.in | 66 +- samples/scroll/Makefile.in | 66 +- samples/scrollsub/Makefile.in | 66 +- samples/shaped/Makefile.in | 66 +- samples/sockets/Makefile.in | 66 +- samples/splitter/Makefile.in | 66 +- samples/statbar/Makefile.in | 66 +- samples/tab/Makefile.in | 66 +- samples/taskbar/Makefile.in | 66 +- samples/text/Makefile.in | 66 +- samples/thread/Makefile.in | 66 +- samples/toolbar/Makefile.in | 66 +- samples/treectrl/Makefile.in | 66 +- samples/typetest/Makefile.in | 66 +- samples/validate/Makefile.in | 66 +- samples/vscroll/Makefile.in | 66 +- samples/widgets/Makefile.in | 66 +- samples/wizard/Makefile.in | 66 +- samples/wxtest/Makefile.in | 66 +- utils/configure | 821 ----------------------- utils/configure.in | 35 - 82 files changed, 2454 insertions(+), 5307 deletions(-) delete mode 100755 contrib/configure delete mode 100644 contrib/configure.in delete mode 100755 demos/configure delete mode 100644 demos/configure.in delete mode 100755 utils/configure delete mode 100644 utils/configure.in diff --git a/build/bakefiles/Makefile b/build/bakefiles/Makefile index 76a6fc87ad..a42301adb5 100644 --- a/build/bakefiles/Makefile +++ b/build/bakefiles/Makefile @@ -5,16 +5,14 @@ BAKEFILE = bakefile BAKEARGS = -v -AUTOCONF_ALL = ../../configure ../../samples/configure ../../Makefile.in ../../samples/Makefile.in ../../samples/db/Makefile.in ../../samples/dnd/Makefile.in ../../samples/ipc/Makefile.in ../../samples/mdi/Makefile.in ../../samples/mfc/Makefile.in ../../samples/png/Makefile.in ../../samples/tab/Makefile.in ../../samples/exec/Makefile.in ../../samples/font/Makefile.in ../../samples/help/Makefile.in ../../samples/grid/Makefile.in ../../samples/menu/Makefile.in ../../samples/text/Makefile.in ../../samples/console/Makefile.in ../../samples/treectrl/Makefile.in ../../samples/listctrl/Makefile.in ../../samples/joytest/Makefile.in ../../samples/regtest/Makefile.in ../../samples/dialogs/Makefile.in ../../samples/nativdlg/Makefile.in ../../samples/display/Makefile.in ../../samples/notebook/Makefile.in ../../samples/caret/Makefile.in ../../samples/erase/Makefile.in ../../samples/event/Makefile.in ../../samples/image/Makefile.in ../../samples/sashtest/Makefile.in ../../samples/docview/Makefile.in ../../samples/typetest/Makefile.in ../../samples/drawing/Makefile.in ../../samples/splitter/Makefile.in ../../samples/listbox/Makefile.in ../../samples/multimon/Makefile.in ../../samples/dynamic/Makefile.in ../../samples/checklst/Makefile.in ../../samples/taskbar/Makefile.in ../../samples/dragimag/Makefile.in ../../samples/sockets/Makefile.in ../../samples/calendar/Makefile.in ../../samples/minimal/Makefile.in ../../samples/access/Makefile.in ../../samples/statbar/Makefile.in ../../samples/config/Makefile.in ../../samples/dialup/Makefile.in ../../samples/controls/Makefile.in ../../samples/richedit/Makefile.in ../../samples/newgrid/Makefile.in ../../samples/toolbar/Makefile.in ../../samples/htlbox/Makefile.in ../../samples/layout/Makefile.in ../../samples/minifram/Makefile.in ../../samples/mobile/Makefile.in ../../samples/opengl/Makefile.in ../../samples/scroll/Makefile.in ../../samples/rotate/Makefile.in ../../samples/shaped/Makefile.in ../../samples/thread/Makefile.in ../../samples/wizard/Makefile.in ../../samples/printing/Makefile.in ../../samples/oleauto/Makefile.in ../../samples/wxtest/Makefile.in ../../samples/artprov/Makefile.in ../../samples/propsize/Makefile.in ../../samples/ownerdrw/Makefile.in ../../samples/vscroll/Makefile.in ../../samples/validate/Makefile.in ../../samples/widgets/Makefile.in ../../samples/keyboard/Makefile.in ../../samples/docvwmdi/Makefile.in ../../samples/scrollsub/Makefile.in ../../samples/memcheck/Makefile.in ../../samples/internat/Makefile.in +AUTOCONF_ALL = ../../configure ../../Makefile.in ../../samples/Makefile.in ../../samples/db/Makefile.in ../../samples/dnd/Makefile.in ../../samples/ipc/Makefile.in ../../samples/mdi/Makefile.in ../../samples/mfc/Makefile.in ../../samples/png/Makefile.in ../../samples/tab/Makefile.in ../../samples/exec/Makefile.in ../../samples/font/Makefile.in ../../samples/help/Makefile.in ../../samples/grid/Makefile.in ../../samples/menu/Makefile.in ../../samples/text/Makefile.in ../../samples/console/Makefile.in ../../samples/treectrl/Makefile.in ../../samples/listctrl/Makefile.in ../../samples/joytest/Makefile.in ../../samples/regtest/Makefile.in ../../samples/dialogs/Makefile.in ../../samples/nativdlg/Makefile.in ../../samples/display/Makefile.in ../../samples/notebook/Makefile.in ../../samples/caret/Makefile.in ../../samples/erase/Makefile.in ../../samples/event/Makefile.in ../../samples/image/Makefile.in ../../samples/sashtest/Makefile.in ../../samples/docview/Makefile.in ../../samples/typetest/Makefile.in ../../samples/drawing/Makefile.in ../../samples/splitter/Makefile.in ../../samples/listbox/Makefile.in ../../samples/multimon/Makefile.in ../../samples/dynamic/Makefile.in ../../samples/checklst/Makefile.in ../../samples/taskbar/Makefile.in ../../samples/dragimag/Makefile.in ../../samples/sockets/Makefile.in ../../samples/calendar/Makefile.in ../../samples/minimal/Makefile.in ../../samples/access/Makefile.in ../../samples/statbar/Makefile.in ../../samples/config/Makefile.in ../../samples/dialup/Makefile.in ../../samples/controls/Makefile.in ../../samples/richedit/Makefile.in ../../samples/newgrid/Makefile.in ../../samples/toolbar/Makefile.in ../../samples/htlbox/Makefile.in ../../samples/layout/Makefile.in ../../samples/minifram/Makefile.in ../../samples/mobile/Makefile.in ../../samples/opengl/Makefile.in ../../samples/scroll/Makefile.in ../../samples/rotate/Makefile.in ../../samples/shaped/Makefile.in ../../samples/thread/Makefile.in ../../samples/wizard/Makefile.in ../../samples/printing/Makefile.in ../../samples/oleauto/Makefile.in ../../samples/wxtest/Makefile.in ../../samples/artprov/Makefile.in ../../samples/propsize/Makefile.in ../../samples/ownerdrw/Makefile.in ../../samples/vscroll/Makefile.in ../../samples/validate/Makefile.in ../../samples/widgets/Makefile.in ../../samples/keyboard/Makefile.in ../../samples/docvwmdi/Makefile.in ../../samples/scrollsub/Makefile.in ../../samples/memcheck/Makefile.in ../../samples/internat/Makefile.in all: autoconf autoconf: $(AUTOCONF_ALL) clean: rm -f ../../autoconf_inc.m4 - rm -f ../../samples/autoconf_inc.m4 rm -f ../../configure - rm -f ../../samples/configure rm -f ../../Makefile.in rm -f ../../samples/Makefile.in rm -f ../../samples/db/Makefile.in @@ -95,10 +93,6 @@ clean: ../../configure: ../../autoconf_inc.m4 (cd ../.. ; aclocal && autoconf) -../../samples/autoconf_inc.m4: ../../samples/Makefile.in -../../samples/configure: ../../samples/autoconf_inc.m4 - (cd ../../samples ; aclocal && autoconf) - Makefile: regenMakefile.py ./regenMakefile.py @echo @@ -120,360 +114,360 @@ Makefile: regenMakefile.py # from ../../samples/db/db.bkl ../../samples/db/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/db/db.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/db/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/db/db.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/db/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/db/db.bkl touch ../../samples/db/Makefile.in # from ../../samples/dnd/dnd.bkl ../../samples/dnd/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/dnd/dnd.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/dnd/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/dnd/dnd.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/dnd/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dnd/dnd.bkl touch ../../samples/dnd/Makefile.in # from ../../samples/ipc/ipc.bkl ../../samples/ipc/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/ipc/ipc.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/ipc/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/ipc/ipc.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/ipc/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/ipc/ipc.bkl touch ../../samples/ipc/Makefile.in # from ../../samples/mdi/mdi.bkl ../../samples/mdi/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/mdi/mdi.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/mdi/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/mdi/mdi.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/mdi/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mdi/mdi.bkl touch ../../samples/mdi/Makefile.in # from ../../samples/mfc/mfc.bkl ../../samples/mfc/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/mfc/mfc.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/mfc/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/mfc/mfc.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/mfc/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mfc/mfc.bkl touch ../../samples/mfc/Makefile.in # from ../../samples/png/png.bkl ../../samples/png/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/png/png.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/png/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/png/png.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/png/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/png/png.bkl touch ../../samples/png/Makefile.in # from ../../samples/tab/tab.bkl ../../samples/tab/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/tab/tab.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/tab/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/tab/tab.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/tab/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/tab/tab.bkl touch ../../samples/tab/Makefile.in # from ../../samples/exec/exec.bkl ../../samples/exec/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/exec/exec.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/exec/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/exec/exec.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/exec/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/exec/exec.bkl touch ../../samples/exec/Makefile.in # from ../../samples/font/font.bkl ../../samples/font/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/font/font.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/font/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/font/font.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/font/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/font/font.bkl touch ../../samples/font/Makefile.in # from ../../samples/help/help.bkl ../../samples/help/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/help/help.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/help/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/help/help.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/help/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/help/help.bkl touch ../../samples/help/Makefile.in # from ../../samples/grid/grid.bkl ../../samples/grid/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/grid/grid.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/grid/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/grid/grid.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/grid/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/grid/grid.bkl touch ../../samples/grid/Makefile.in # from ../../samples/menu/menu.bkl ../../samples/menu/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/menu/menu.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/menu/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/menu/menu.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/menu/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/menu/menu.bkl touch ../../samples/menu/Makefile.in # from ../../samples/text/text.bkl ../../samples/text/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/text/text.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/text/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/text/text.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/text/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/text/text.bkl touch ../../samples/text/Makefile.in # from ../../samples/console/console.bkl ../../samples/console/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/console/console.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/console/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/console/console.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/console/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/console/console.bkl touch ../../samples/console/Makefile.in # from ../../samples/treectrl/treectrl.bkl ../../samples/treectrl/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/treectrl/treectrl.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/treectrl/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/treectrl/treectrl.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/treectrl/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/treectrl/treectrl.bkl touch ../../samples/treectrl/Makefile.in # from ../../samples/listctrl/listctrl.bkl ../../samples/listctrl/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/listctrl/listctrl.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/listctrl/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/listctrl/listctrl.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/listctrl/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/listctrl/listctrl.bkl touch ../../samples/listctrl/Makefile.in # from ../../samples/joytest/joytest.bkl ../../samples/joytest/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/joytest/joytest.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/joytest/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/joytest/joytest.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/joytest/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/joytest/joytest.bkl touch ../../samples/joytest/Makefile.in # from ../../samples/regtest/regtest.bkl ../../samples/regtest/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/regtest/regtest.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/regtest/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/regtest/regtest.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/regtest/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/regtest/regtest.bkl touch ../../samples/regtest/Makefile.in # from ../../samples/dialogs/dialogs.bkl ../../samples/dialogs/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/dialogs/dialogs.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/dialogs/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/dialogs/dialogs.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/dialogs/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dialogs/dialogs.bkl touch ../../samples/dialogs/Makefile.in # from ../../samples/nativdlg/nativdlg.bkl ../../samples/nativdlg/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/nativdlg/nativdlg.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/nativdlg/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/nativdlg/nativdlg.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/nativdlg/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/nativdlg/nativdlg.bkl touch ../../samples/nativdlg/Makefile.in # from ../../samples/display/display.bkl ../../samples/display/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/display/display.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/display/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/display/display.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/display/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/display/display.bkl touch ../../samples/display/Makefile.in # from ../../samples/notebook/notebook.bkl ../../samples/notebook/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/notebook/notebook.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/notebook/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/notebook/notebook.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/notebook/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/notebook/notebook.bkl touch ../../samples/notebook/Makefile.in # from ../../samples/caret/caret.bkl ../../samples/caret/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/caret/caret.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/caret/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/caret/caret.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/caret/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/caret/caret.bkl touch ../../samples/caret/Makefile.in # from ../../samples/erase/erase.bkl ../../samples/erase/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/erase/erase.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/erase/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/erase/erase.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/erase/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/erase/erase.bkl touch ../../samples/erase/Makefile.in # from ../../samples/event/event.bkl ../../samples/event/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/event/event.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/event/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/event/event.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/event/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/event/event.bkl touch ../../samples/event/Makefile.in # from ../../samples/image/image.bkl ../../samples/image/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/image/image.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/image/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/image/image.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/image/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/image/image.bkl touch ../../samples/image/Makefile.in # from ../../samples/sashtest/sashtest.bkl ../../samples/sashtest/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/sashtest/sashtest.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/sashtest/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/sashtest/sashtest.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/sashtest/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/sashtest/sashtest.bkl touch ../../samples/sashtest/Makefile.in # from ../../samples/docview/docview.bkl ../../samples/docview/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/docview/docview.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/docview/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/docview/docview.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/docview/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/docview/docview.bkl touch ../../samples/docview/Makefile.in # from ../../samples/typetest/typetest.bkl ../../samples/typetest/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/typetest/typetest.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/typetest/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/typetest/typetest.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/typetest/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/typetest/typetest.bkl touch ../../samples/typetest/Makefile.in # from ../../samples/drawing/drawing.bkl ../../samples/drawing/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/drawing/drawing.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/drawing/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/drawing/drawing.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/drawing/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/drawing/drawing.bkl touch ../../samples/drawing/Makefile.in # from ../../samples/splitter/splitter.bkl ../../samples/splitter/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/splitter/splitter.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/splitter/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/splitter/splitter.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/splitter/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/splitter/splitter.bkl touch ../../samples/splitter/Makefile.in # from ../../samples/listbox/listbox.bkl ../../samples/listbox/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/listbox/listbox.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/listbox/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/listbox/listbox.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/listbox/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/listbox/listbox.bkl touch ../../samples/listbox/Makefile.in # from ../../samples/multimon/multimon.bkl ../../samples/multimon/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/multimon/multimon.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/multimon/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/multimon/multimon.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/multimon/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/multimon/multimon.bkl touch ../../samples/multimon/Makefile.in # from ../../samples/dynamic/dynamic.bkl ../../samples/dynamic/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/dynamic/dynamic.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/dynamic/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/dynamic/dynamic.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/dynamic/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dynamic/dynamic.bkl touch ../../samples/dynamic/Makefile.in # from ../../samples/checklst/checklst.bkl ../../samples/checklst/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/checklst/checklst.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/checklst/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/checklst/checklst.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/checklst/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/checklst/checklst.bkl touch ../../samples/checklst/Makefile.in # from ../../samples/taskbar/taskbar.bkl ../../samples/taskbar/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/taskbar/taskbar.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/taskbar/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/taskbar/taskbar.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/taskbar/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/taskbar/taskbar.bkl touch ../../samples/taskbar/Makefile.in # from ../../samples/dragimag/dragimag.bkl ../../samples/dragimag/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/dragimag/dragimag.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/dragimag/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/dragimag/dragimag.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/dragimag/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dragimag/dragimag.bkl touch ../../samples/dragimag/Makefile.in # from ../../samples/sockets/sockets.bkl ../../samples/sockets/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/sockets/sockets.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/sockets/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/sockets/sockets.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/sockets/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/sockets/sockets.bkl touch ../../samples/sockets/Makefile.in # from ../../samples/calendar/calendar.bkl ../../samples/calendar/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/calendar/calendar.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/calendar/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/calendar/calendar.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/calendar/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/calendar/calendar.bkl touch ../../samples/calendar/Makefile.in # from ../../samples/minimal/minimal.bkl ../../samples/minimal/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/minimal/minimal.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/minimal/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/minimal/minimal.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/minimal/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/minimal/minimal.bkl touch ../../samples/minimal/Makefile.in # from ../../samples/access/access.bkl ../../samples/access/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/access/access.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/access/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/access/access.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/access/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/access/access.bkl touch ../../samples/access/Makefile.in # from ../../samples/statbar/statbar.bkl ../../samples/statbar/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/statbar/statbar.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/statbar/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/statbar/statbar.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/statbar/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/statbar/statbar.bkl touch ../../samples/statbar/Makefile.in # from ../../samples/config/config.bkl ../../samples/config/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/config/config.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/config/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/config/config.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/config/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/config/config.bkl touch ../../samples/config/Makefile.in # from ../../samples/dialup/dialup.bkl ../../samples/dialup/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/dialup/dialup.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/dialup/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/dialup/dialup.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/dialup/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/dialup/dialup.bkl touch ../../samples/dialup/Makefile.in # from ../../samples/controls/controls.bkl ../../samples/controls/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/controls/controls.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/controls/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/controls/controls.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/controls/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/controls/controls.bkl touch ../../samples/controls/Makefile.in # from ../../samples/richedit/richedit.bkl ../../samples/richedit/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/richedit/richedit.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/richedit/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/richedit/richedit.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/richedit/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/richedit/richedit.bkl touch ../../samples/richedit/Makefile.in # from ../../samples/newgrid/newgrid.bkl ../../samples/newgrid/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/newgrid/newgrid.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/newgrid/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/newgrid/newgrid.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/newgrid/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/newgrid/newgrid.bkl touch ../../samples/newgrid/Makefile.in # from ../../samples/toolbar/toolbar.bkl ../../samples/toolbar/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/toolbar/toolbar.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/toolbar/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/toolbar/toolbar.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/toolbar/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/toolbar/toolbar.bkl touch ../../samples/toolbar/Makefile.in # from ../../samples/htlbox/htlbox.bkl ../../samples/htlbox/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/htlbox/htlbox.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/htlbox/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/htlbox/htlbox.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/htlbox/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/htlbox/htlbox.bkl touch ../../samples/htlbox/Makefile.in # from ../../samples/layout/layout.bkl ../../samples/layout/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/layout/layout.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/layout/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/layout/layout.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/layout/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/layout/layout.bkl touch ../../samples/layout/Makefile.in # from ../../samples/minifram/minifram.bkl ../../samples/minifram/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/minifram/minifram.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/minifram/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/minifram/minifram.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/minifram/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/minifram/minifram.bkl touch ../../samples/minifram/Makefile.in # from ../../samples/mobile/mobile.bkl ../../samples/mobile/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/mobile/mobile.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/mobile/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/mobile/mobile.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/mobile/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mobile/mobile.bkl touch ../../samples/mobile/Makefile.in # from ../../samples/opengl/opengl.bkl ../../samples/opengl/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/opengl/opengl.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/opengl/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/opengl/opengl.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/opengl/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/opengl/opengl.bkl touch ../../samples/opengl/Makefile.in # from ../../samples/scroll/scroll.bkl ../../samples/scroll/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/scroll/scroll.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/scroll/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/scroll/scroll.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/scroll/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/scroll/scroll.bkl touch ../../samples/scroll/Makefile.in # from ../../samples/rotate/rotate.bkl ../../samples/rotate/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/rotate/rotate.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/rotate/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/rotate/rotate.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/rotate/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/rotate/rotate.bkl touch ../../samples/rotate/Makefile.in # from ../../samples/shaped/shaped.bkl ../../samples/shaped/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/shaped/shaped.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/shaped/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/shaped/shaped.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/shaped/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/shaped/shaped.bkl touch ../../samples/shaped/Makefile.in # from ../../samples/thread/thread.bkl ../../samples/thread/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/thread/thread.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/thread/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/thread/thread.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/thread/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/thread/thread.bkl touch ../../samples/thread/Makefile.in # from ../../samples/wizard/wizard.bkl ../../samples/wizard/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/wizard/wizard.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/wizard/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/wizard/wizard.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/wizard/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/wizard/wizard.bkl touch ../../samples/wizard/Makefile.in # from ../../samples/printing/printing.bkl ../../samples/printing/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/printing/printing.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/printing/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/printing/printing.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/printing/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/printing/printing.bkl touch ../../samples/printing/Makefile.in # from ../../samples/oleauto/oleauto.bkl ../../samples/oleauto/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/oleauto/oleauto.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/oleauto/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/oleauto/oleauto.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/oleauto/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/oleauto/oleauto.bkl touch ../../samples/oleauto/Makefile.in # from ../../samples/wxtest/wxtest.bkl ../../samples/wxtest/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/wxtest/wxtest.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/wxtest/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/wxtest/wxtest.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/wxtest/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/wxtest/wxtest.bkl touch ../../samples/wxtest/Makefile.in # from ../../samples/artprov/artprov.bkl ../../samples/artprov/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/artprov/artprov.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/artprov/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/artprov/artprov.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/artprov/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/artprov/artprov.bkl touch ../../samples/artprov/Makefile.in # from ../../samples/propsize/propsize.bkl ../../samples/propsize/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/propsize/propsize.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/propsize/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/propsize/propsize.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/propsize/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/propsize/propsize.bkl touch ../../samples/propsize/Makefile.in # from ../../samples/ownerdrw/ownerdrw.bkl ../../samples/ownerdrw/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/ownerdrw/ownerdrw.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/ownerdrw/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/ownerdrw/ownerdrw.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/ownerdrw/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/ownerdrw/ownerdrw.bkl touch ../../samples/ownerdrw/Makefile.in # from ../../samples/vscroll/vscroll.bkl ../../samples/vscroll/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/vscroll/vscroll.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/vscroll/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/vscroll/vscroll.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/vscroll/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/vscroll/vscroll.bkl touch ../../samples/vscroll/Makefile.in # from ../../samples/validate/validate.bkl ../../samples/validate/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/validate/validate.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/validate/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/validate/validate.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/validate/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/validate/validate.bkl touch ../../samples/validate/Makefile.in # from ../../samples/widgets/widgets.bkl ../../samples/widgets/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/widgets/widgets.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/widgets/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/widgets/widgets.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/widgets/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/widgets/widgets.bkl touch ../../samples/widgets/Makefile.in # from ../../samples/keyboard/keyboard.bkl ../../samples/keyboard/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/keyboard/keyboard.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/keyboard/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/keyboard/keyboard.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/keyboard/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/keyboard/keyboard.bkl touch ../../samples/keyboard/Makefile.in # from ../../samples/docvwmdi/docvwmdi.bkl ../../samples/docvwmdi/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/docvwmdi/docvwmdi.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/docvwmdi/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/docvwmdi/docvwmdi.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/docvwmdi/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/docvwmdi/docvwmdi.bkl touch ../../samples/docvwmdi/Makefile.in # from ../../samples/scrollsub/scrollsub.bkl ../../samples/scrollsub/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/scrollsub/scrollsub.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/scrollsub/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/scrollsub/scrollsub.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/scrollsub/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/scrollsub/scrollsub.bkl touch ../../samples/scrollsub/Makefile.in # from ../../samples/memcheck/memcheck.bkl ../../samples/memcheck/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/memcheck/memcheck.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/memcheck/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/memcheck/memcheck.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/memcheck/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/memcheck/memcheck.bkl touch ../../samples/memcheck/Makefile.in # from ../../samples/internat/internat.bkl ../../samples/internat/Makefile.in: common.bkl common_samples.bkl config.bkl ../../samples/internat/internat.bkl - $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/internat/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4 ../../samples/internat/internat.bkl + $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/internat/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/internat/internat.bkl touch ../../samples/internat/Makefile.in diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 902a270088..3ad5d6049b 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -1,4 +1,6 @@ + + @@ -84,7 +86,7 @@ - $(top_builddir)/lib + $(top_builddir)lib diff --git a/build/bakefiles/regenMakefile.py b/build/bakefiles/regenMakefile.py index 3a0379eefd..f21e95717d 100755 --- a/build/bakefiles/regenMakefile.py +++ b/build/bakefiles/regenMakefile.py @@ -21,7 +21,7 @@ BAKEARGS = -v lines = [] all = {} -all['autoconf'] = ['../../configure', '../../samples/configure'] +all['autoconf'] = ['../../configure'] def addMakefile(bake, makedirs, deps=[], args={}): """Adds rules to regenerate native makefile in directory 'makedir' from @@ -75,7 +75,7 @@ def onSample(arg, dirname, names): args = { 'all':'-DWXTOPDIR=/%s..' % prefix, - 'autoconf':'-DAUTOCONF_MACROS_FILE=../../samples/autoconf_inc.m4', + 'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4', } for bake in bakes: @@ -105,17 +105,12 @@ for f in all: file.write(""" clean: \trm -f ../../autoconf_inc.m4 -\trm -f ../../samples/autoconf_inc.m4 %s ../../autoconf_inc.m4: ../../Makefile.in ../../configure: ../../autoconf_inc.m4 \t(cd ../.. ; aclocal && autoconf) -../../samples/autoconf_inc.m4: ../../samples/Makefile.in -../../samples/configure: ../../samples/autoconf_inc.m4 -\t(cd ../../samples ; aclocal && autoconf) - Makefile: regenMakefile.py \t./regenMakefile.py \t@echo diff --git a/contrib/configure b/contrib/configure deleted file mode 100755 index a3631abeb1..0000000000 --- a/contrib/configure +++ /dev/null @@ -1,1063 +0,0 @@ -#! /bin/sh - -# From configure.in Id: configure.in -# Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. -# -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. - -# Defaults: -ac_help= -ac_default_prefix=/usr/local -# Any additions from configure.in: - -# Initialize some variables set by options. -# The variables have the same names as the options, with -# dashes changed to underlines. -build=NONE -cache_file=./config.cache -exec_prefix=NONE -host=NONE -no_create= -nonopt=NONE -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -target=NONE -verbose= -x_includes=NONE -x_libraries=NONE -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' -includedir='${prefix}/include' -oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' - -# Initialize some other variables. -subdirs= -MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -ac_max_here_lines=12 - -ac_prev= -for ac_option -do - - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" - ac_prev= - continue - fi - - case "$ac_option" in - -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) ac_optarg= ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case "$ac_option" in - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir="$ac_optarg" ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build="$ac_optarg" ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file="$ac_optarg" ;; - - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) - datadir="$ac_optarg" ;; - - -disable-* | --disable-*) - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - eval "enable_${ac_feature}=no" ;; - - -enable-* | --enable-*) - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "enable_${ac_feature}='$ac_optarg'" ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix="$ac_optarg" ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he) - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat << EOF -Usage: configure [options] [host] -Options: [defaults in brackets after descriptions] -Configuration: - --cache-file=FILE cache test results in FILE - --help print this message - --no-create do not create output files - --quiet, --silent do not print \`checking...' messages - --version print the version of autoconf that created configure -Directory and file names: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [same as prefix] - --bindir=DIR user executables in DIR [EPREFIX/bin] - --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] - --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR - [PREFIX/share] - --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR - [PREFIX/com] - --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] - --libdir=DIR object code libraries in DIR [EPREFIX/lib] - --includedir=DIR C header files in DIR [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] - --infodir=DIR info documentation in DIR [PREFIX/info] - --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR find the sources in DIR [configure dir or ..] - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM - run sed PROGRAM on installed program names -EOF - cat << EOF -Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] - --target=TARGET configure for TARGET [TARGET=HOST] -Features and packages: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF - if test -n "$ac_help"; then - echo "--enable and --with options recognized:$ac_help" - fi - exit 0 ;; - - -host | --host | --hos | --ho) - ac_prev=host ;; - -host=* | --host=* | --hos=* | --ho=*) - host="$ac_optarg" ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir="$ac_optarg" ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir="$ac_optarg" ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir="$ac_optarg" ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir="$ac_optarg" ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir="$ac_optarg" ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir="$ac_optarg" ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir="$ac_optarg" ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix="$ac_optarg" ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix="$ac_optarg" ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix="$ac_optarg" ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name="$ac_optarg" ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir="$ac_optarg" ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir="$ac_optarg" ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site="$ac_optarg" ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir="$ac_optarg" ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir="$ac_optarg" ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target="$ac_optarg" ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13" - exit 0 ;; - - -with-* | --with-*) - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "with_${ac_package}='$ac_optarg'" ;; - - -without-* | --without-*) - ac_package=`echo $ac_option|sed -e 's/-*without-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - eval "with_${ac_package}=no" ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes="$ac_optarg" ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries="$ac_optarg" ;; - - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } - ;; - - *) - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi - if test "x$nonopt" != xNONE; then - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } - fi - nonopt="$ac_option" - ;; - - esac -done - -if test -n "$ac_prev"; then - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } -fi - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -# File descriptor usage: -# 0 standard input -# 1 file creation -# 2 errors and warnings -# 3 some systems may open it to /dev/tty -# 4 used on the Kubota Titan -# 6 checking for... messages and results -# 5 compiler messages saved in config.log -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 -fi -exec 5>./config.log - -echo "\ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -" 1>&5 - -# Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell metacharacters. -ac_configure_args= -for ac_arg -do - case "$ac_arg" in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) - ac_configure_args="$ac_configure_args '$ac_arg'" ;; - *) ac_configure_args="$ac_configure_args $ac_arg" ;; - esac -done - -# NLS nuisances. -# Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -# Non-C LC_CTYPE values break the ctype check. -if test "${LANG+set}" = set; then LANG=C; export LANG; fi -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo > confdefs.h - -# A filename unique to this package, relative to the directory that -# configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=Makefile.in - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } - else - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } - fi -fi -srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` - -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi -fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - echo "loading site script $ac_site_file" - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - echo "loading cache $cache_file" - . $cache_file -else - echo "creating cache $cache_file" - > $cache_file -fi - -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -ac_exeext= -ac_objext=o -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi -else - ac_n= ac_c='\c' ac_t= -fi - - - -if test "x$wx_cv_path_ifs" = "x"; then - { echo "configure: error: Please run configure from the top level directory." 1>&2; exit 1; } -fi - - - -ESD_LINK= -echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:535: checking how to run the C preprocessor" >&5 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:573: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp -fi -rm -f conftest* -fi -rm -f conftest* -fi -rm -f conftest* - ac_cv_prog_CPP="$CPP" -fi - CPP="$ac_cv_prog_CPP" -else - ac_cv_prog_CPP="$CPP" -fi -echo "$ac_t""$CPP" 1>&6 - -ac_safe=`echo "esd.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for esd.h""... $ac_c" 1>&6 -echo "configure:616: checking for esd.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - echo $ac_n "checking for esd_close in -lesd""... $ac_c" 1>&6 -echo "configure:644: checking for esd_close in -lesd" >&5 -ac_lib_var=`echo esd'_'esd_close | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lesd $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - ESD_LINK="-lesd" - -else - echo "$ac_t""no" 1>&6 -fi - - -else - echo "$ac_t""no" 1>&6 -fi - - -if test "$ESD_LINK" != "" ; then - echo "ESound detected" -fi - - -PATH_IFS=$wx_cv_path_ifs -WX_TARGET_LIBRARY=$wx_cv_target_library -WX_TARGET_LIBRARY_TYPE=$wx_cv_target_libtype -WX_LIBRARY_BASENAME=$wx_cv_library_basename -WX_RELEASE=$wx_cv_release -WX_CURRENT=$wx_cv_current -WX_REVISION=$wx_cv_revision -WX_AGE=$wx_cv_age - - - - - - - - - - - - - -trap '' 1 2 15 -cat > confcache <<\EOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. -# -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. -# -EOF -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else - if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# Any assignment to VPATH causes Sun make to only execute -# the first set of double-colon rules, so remove it if not needed. -# If there is a colon in the path, we need to keep it. -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' -fi - -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 - -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs - - -# Without the "./", some shells look in PATH for config.status. -: ${CONFIG_STATUS=./config.status} - -echo creating $CONFIG_STATUS -rm -f $CONFIG_STATUS -cat > $CONFIG_STATUS </dev/null | sed 1q`: -# -# $0 $ac_configure_args -# -# Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. - -ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" -for ac_option -do - case "\$ac_option" in - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.13" - exit 0 ;; - -help | --help | --hel | --he | --h) - echo "\$ac_cs_usage"; exit 0 ;; - *) echo "\$ac_cs_usage"; exit 1 ;; - esac -done - -ac_given_srcdir=$srcdir - -trap 'rm -fr `echo " - src/Makefile - src/deprecated/Makefile - src/ogl/Makefile - src/mmedia/Makefile - src/stc/Makefile - src/svg/Makefile - src/xrc/Makefile - src/gizmos/Makefile - src/plot/Makefile - src/applet/Makefile - src/fl/Makefile - src/net/Makefile - samples/Makefile - samples/deprecated/Makefile - samples/deprecated/proplist/Makefile - samples/deprecated/resource/Makefile - samples/deprecated/treelay/Makefile - samples/mmedia/Makefile - samples/ogl/Makefile - samples/ogl/ogledit/Makefile - samples/ogl/studio/Makefile - samples/stc/Makefile - samples/svg/Makefile - samples/gizmos/Makefile - samples/gizmos/editlbox/Makefile - samples/gizmos/dynsash/Makefile - samples/gizmos/dynsash_switch/Makefile - samples/gizmos/multicell/Makefile - samples/gizmos/splittree/Makefile - samples/gizmos/led/Makefile - samples/xrc/Makefile - samples/plot/Makefile - samples/applet/Makefile - samples/fl/Makefile - samples/fl/fl_demo1/Makefile - samples/fl/fl_demo2/Makefile - samples/fl/fl_sample1/Makefile - samples/fl/fl_sample2/Makefile - samples/fl/fl_sample3/Makefile - utils/Makefile - utils/wxrc/Makefile - utils/wxrcedit/Makefile - utils/convertrc/Makefile - " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -EOF -cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF -$ac_vpsub -$extrasub -s%@SHELL@%$SHELL%g -s%@CFLAGS@%$CFLAGS%g -s%@CPPFLAGS@%$CPPFLAGS%g -s%@CXXFLAGS@%$CXXFLAGS%g -s%@FFLAGS@%$FFLAGS%g -s%@DEFS@%$DEFS%g -s%@LDFLAGS@%$LDFLAGS%g -s%@LIBS@%$LIBS%g -s%@exec_prefix@%$exec_prefix%g -s%@prefix@%$prefix%g -s%@program_transform_name@%$program_transform_name%g -s%@bindir@%$bindir%g -s%@sbindir@%$sbindir%g -s%@libexecdir@%$libexecdir%g -s%@datadir@%$datadir%g -s%@sysconfdir@%$sysconfdir%g -s%@sharedstatedir@%$sharedstatedir%g -s%@localstatedir@%$localstatedir%g -s%@libdir@%$libdir%g -s%@includedir@%$includedir%g -s%@oldincludedir@%$oldincludedir%g -s%@infodir@%$infodir%g -s%@mandir@%$mandir%g -s%@CPP@%$CPP%g -s%@PATH_IFS@%$PATH_IFS%g -s%@ESD_LINK@%$ESD_LINK%g -s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g -s%@WX_TARGET_LIBRARY_TYPE@%$WX_TARGET_LIBRARY_TYPE%g -s%@WX_LIBRARY_BASENAME@%$WX_LIBRARY_BASENAME%g -s%@WX_RELEASE@%$WX_RELEASE%g -s%@WX_CURRENT@%$WX_CURRENT%g -s%@WX_REVISION@%$WX_REVISION%g -s%@WX_AGE@%$WX_AGE%g - -CEOF -EOF - -cat >> $CONFIG_STATUS <<\EOF - -# Split the substitutions into bite-sized pieces for seds with -# small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -ac_file=1 # Number of current file. -ac_beg=1 # First line for current file. -ac_end=$ac_max_sed_cmds # Line after last line for current file. -ac_more_lines=: -ac_sed_cmds="" -while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file - else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file - else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" - else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" - fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` - fi -done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat -fi -EOF - -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` - else - ac_dir_suffix= ac_dots= - fi - - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; - *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - - - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; - esac - - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* - -EOF -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF - -exit 0 -EOF -chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - diff --git a/contrib/configure.in b/contrib/configure.in deleted file mode 100644 index 6f4a0d0b82..0000000000 --- a/contrib/configure.in +++ /dev/null @@ -1,99 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_REVISION($Id$)dnl - -AC_INIT(Makefile.in) - -dnl we need the values the main configure determined for us, so refuse -dnl to run if we don't have them -if test "x$wx_cv_path_ifs" = "x"; then - AC_MSG_ERROR([Please run configure from the top level directory.]) -fi - -dnl --------------- -dnl MMedia specific -dnl --------------- - -dnl Check for ESD - -ESD_LINK= -AC_CHECK_HEADER(esd.h, [ - AC_CHECK_LIB(esd, esd_close, [ - ESD_LINK="-lesd" - ]) -]) - -if test "$ESD_LINK" != "" ; then - echo "ESound detected" -fi - -dnl ----------- -dnl Final subst - -PATH_IFS=$wx_cv_path_ifs -WX_TARGET_LIBRARY=$wx_cv_target_library -WX_TARGET_LIBRARY_TYPE=$wx_cv_target_libtype -WX_LIBRARY_BASENAME=$wx_cv_library_basename -WX_RELEASE=$wx_cv_release -WX_CURRENT=$wx_cv_current -WX_REVISION=$wx_cv_revision -WX_AGE=$wx_cv_age - -AC_SUBST(PATH_IFS) -AC_SUBST(ESD_LINK) -AC_SUBST(WX_TARGET_LIBRARY) -AC_SUBST(WX_TARGET_LIBRARY_TYPE) -AC_SUBST(WX_LIBRARY_BASENAME) -AC_SUBST(WX_RELEASE) -AC_SUBST(WX_CURRENT) -AC_SUBST(WX_REVISION) -AC_SUBST(WX_AGE) - -dnl ----------- -dnl File output - - -AC_OUTPUT([ - src/Makefile - src/deprecated/Makefile - src/ogl/Makefile - src/mmedia/Makefile - src/stc/Makefile - src/svg/Makefile - src/xrc/Makefile - src/gizmos/Makefile - src/plot/Makefile - src/applet/Makefile - src/fl/Makefile - src/net/Makefile - samples/Makefile - samples/deprecated/Makefile - samples/deprecated/proplist/Makefile - samples/deprecated/resource/Makefile - samples/deprecated/treelay/Makefile - samples/mmedia/Makefile - samples/ogl/Makefile - samples/ogl/ogledit/Makefile - samples/ogl/studio/Makefile - samples/stc/Makefile - samples/svg/Makefile - samples/gizmos/Makefile - samples/gizmos/editlbox/Makefile - samples/gizmos/dynsash/Makefile - samples/gizmos/dynsash_switch/Makefile - samples/gizmos/multicell/Makefile - samples/gizmos/splittree/Makefile - samples/gizmos/led/Makefile - samples/xrc/Makefile - samples/plot/Makefile - samples/applet/Makefile - samples/fl/Makefile - samples/fl/fl_demo1/Makefile - samples/fl/fl_demo2/Makefile - samples/fl/fl_sample1/Makefile - samples/fl/fl_sample2/Makefile - samples/fl/fl_sample3/Makefile - utils/Makefile - utils/wxrc/Makefile - utils/wxrcedit/Makefile - utils/convertrc/Makefile - ]) diff --git a/demos/configure b/demos/configure deleted file mode 100755 index 6e3d88b1a5..0000000000 --- a/demos/configure +++ /dev/null @@ -1,799 +0,0 @@ -#! /bin/sh - -# From configure.in Id: configure.in -# Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. -# -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. - -# Defaults: -ac_help= -ac_default_prefix=/usr/local -# Any additions from configure.in: - -# Initialize some variables set by options. -# The variables have the same names as the options, with -# dashes changed to underlines. -build=NONE -cache_file=./config.cache -exec_prefix=NONE -host=NONE -no_create= -nonopt=NONE -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -target=NONE -verbose= -x_includes=NONE -x_libraries=NONE -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' -includedir='${prefix}/include' -oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' - -# Initialize some other variables. -subdirs= -MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -ac_max_here_lines=12 - -ac_prev= -for ac_option -do - - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" - ac_prev= - continue - fi - - case "$ac_option" in - -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) ac_optarg= ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case "$ac_option" in - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir="$ac_optarg" ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build="$ac_optarg" ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file="$ac_optarg" ;; - - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) - datadir="$ac_optarg" ;; - - -disable-* | --disable-*) - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - eval "enable_${ac_feature}=no" ;; - - -enable-* | --enable-*) - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "enable_${ac_feature}='$ac_optarg'" ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix="$ac_optarg" ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he) - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat << EOF -Usage: configure [options] [host] -Options: [defaults in brackets after descriptions] -Configuration: - --cache-file=FILE cache test results in FILE - --help print this message - --no-create do not create output files - --quiet, --silent do not print \`checking...' messages - --version print the version of autoconf that created configure -Directory and file names: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [same as prefix] - --bindir=DIR user executables in DIR [EPREFIX/bin] - --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] - --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR - [PREFIX/share] - --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR - [PREFIX/com] - --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] - --libdir=DIR object code libraries in DIR [EPREFIX/lib] - --includedir=DIR C header files in DIR [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] - --infodir=DIR info documentation in DIR [PREFIX/info] - --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR find the sources in DIR [configure dir or ..] - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM - run sed PROGRAM on installed program names -EOF - cat << EOF -Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] - --target=TARGET configure for TARGET [TARGET=HOST] -Features and packages: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF - if test -n "$ac_help"; then - echo "--enable and --with options recognized:$ac_help" - fi - exit 0 ;; - - -host | --host | --hos | --ho) - ac_prev=host ;; - -host=* | --host=* | --hos=* | --ho=*) - host="$ac_optarg" ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir="$ac_optarg" ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir="$ac_optarg" ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir="$ac_optarg" ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir="$ac_optarg" ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir="$ac_optarg" ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir="$ac_optarg" ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir="$ac_optarg" ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix="$ac_optarg" ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix="$ac_optarg" ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix="$ac_optarg" ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name="$ac_optarg" ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir="$ac_optarg" ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir="$ac_optarg" ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site="$ac_optarg" ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir="$ac_optarg" ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir="$ac_optarg" ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target="$ac_optarg" ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13" - exit 0 ;; - - -with-* | --with-*) - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "with_${ac_package}='$ac_optarg'" ;; - - -without-* | --without-*) - ac_package=`echo $ac_option|sed -e 's/-*without-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - eval "with_${ac_package}=no" ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes="$ac_optarg" ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries="$ac_optarg" ;; - - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } - ;; - - *) - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi - if test "x$nonopt" != xNONE; then - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } - fi - nonopt="$ac_option" - ;; - - esac -done - -if test -n "$ac_prev"; then - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } -fi - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -# File descriptor usage: -# 0 standard input -# 1 file creation -# 2 errors and warnings -# 3 some systems may open it to /dev/tty -# 4 used on the Kubota Titan -# 6 checking for... messages and results -# 5 compiler messages saved in config.log -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 -fi -exec 5>./config.log - -echo "\ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -" 1>&5 - -# Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell metacharacters. -ac_configure_args= -for ac_arg -do - case "$ac_arg" in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) - ac_configure_args="$ac_configure_args '$ac_arg'" ;; - *) ac_configure_args="$ac_configure_args $ac_arg" ;; - esac -done - -# NLS nuisances. -# Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -# Non-C LC_CTYPE values break the ctype check. -if test "${LANG+set}" = set; then LANG=C; export LANG; fi -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo > confdefs.h - -# A filename unique to this package, relative to the directory that -# configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=Makefile.in - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } - else - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } - fi -fi -srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` - -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi -fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - echo "loading site script $ac_site_file" - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - echo "loading cache $cache_file" - . $cache_file -else - echo "creating cache $cache_file" - > $cache_file -fi - -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -ac_exeext= -ac_objext=o -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi -else - ac_n= ac_c='\c' ac_t= -fi - - - -if test "x$wx_cv_path_ifs" = "x"; then - { echo "configure: error: Please run configure from the top level directory." 1>&2; exit 1; } -fi - -IF_GNU_MAKE=$wx_cv_if_gnu_make - - -trap '' 1 2 15 -cat > confcache <<\EOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. -# -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. -# -EOF -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else - if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# Any assignment to VPATH causes Sun make to only execute -# the first set of double-colon rules, so remove it if not needed. -# If there is a colon in the path, we need to keep it. -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' -fi - -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 - -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs - - -# Without the "./", some shells look in PATH for config.status. -: ${CONFIG_STATUS=./config.status} - -echo creating $CONFIG_STATUS -rm -f $CONFIG_STATUS -cat > $CONFIG_STATUS </dev/null | sed 1q`: -# -# $0 $ac_configure_args -# -# Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. - -ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" -for ac_option -do - case "\$ac_option" in - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.13" - exit 0 ;; - -help | --help | --hel | --he | --h) - echo "\$ac_cs_usage"; exit 0 ;; - *) echo "\$ac_cs_usage"; exit 1 ;; - esac -done - -ac_given_srcdir=$srcdir - -trap 'rm -fr `echo " - Makefile - bombs/Makefile - dbbrowse/Makefile - forty/Makefile - fractal/Makefile - life/Makefile - poem/Makefile - " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -EOF -cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF -$ac_vpsub -$extrasub -s%@SHELL@%$SHELL%g -s%@CFLAGS@%$CFLAGS%g -s%@CPPFLAGS@%$CPPFLAGS%g -s%@CXXFLAGS@%$CXXFLAGS%g -s%@FFLAGS@%$FFLAGS%g -s%@DEFS@%$DEFS%g -s%@LDFLAGS@%$LDFLAGS%g -s%@LIBS@%$LIBS%g -s%@exec_prefix@%$exec_prefix%g -s%@prefix@%$prefix%g -s%@program_transform_name@%$program_transform_name%g -s%@bindir@%$bindir%g -s%@sbindir@%$sbindir%g -s%@libexecdir@%$libexecdir%g -s%@datadir@%$datadir%g -s%@sysconfdir@%$sysconfdir%g -s%@sharedstatedir@%$sharedstatedir%g -s%@localstatedir@%$localstatedir%g -s%@libdir@%$libdir%g -s%@includedir@%$includedir%g -s%@oldincludedir@%$oldincludedir%g -s%@infodir@%$infodir%g -s%@mandir@%$mandir%g -s%@IF_GNU_MAKE@%$IF_GNU_MAKE%g - -CEOF -EOF - -cat >> $CONFIG_STATUS <<\EOF - -# Split the substitutions into bite-sized pieces for seds with -# small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -ac_file=1 # Number of current file. -ac_beg=1 # First line for current file. -ac_end=$ac_max_sed_cmds # Line after last line for current file. -ac_more_lines=: -ac_sed_cmds="" -while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file - else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file - else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" - else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" - fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` - fi -done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat -fi -EOF - -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` - else - ac_dir_suffix= ac_dots= - fi - - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; - *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - - - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; - esac - - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* - -EOF -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF - -exit 0 -EOF -chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - diff --git a/demos/configure.in b/demos/configure.in deleted file mode 100644 index 25cbcd2568..0000000000 --- a/demos/configure.in +++ /dev/null @@ -1,27 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_REVISION($Id$)dnl - -AC_INIT(Makefile.in) - -dnl we need the values the main configure determined for us, so refuse -dnl to run if we don't have them -dnl -dnl note that the only one we use here if wx_cv_if_gnu_make but we can't test -dnl for this because it may perfectly well be empty (if we're using GNU make), -dnl so use something else -if test "x$wx_cv_path_ifs" = "x"; then - AC_MSG_ERROR([Please run configure from the top level directory.]) -fi - -IF_GNU_MAKE=$wx_cv_if_gnu_make -AC_SUBST(IF_GNU_MAKE) - -AC_OUTPUT([ - Makefile - bombs/Makefile - dbbrowse/Makefile - forty/Makefile - fractal/Makefile - life/Makefile - poem/Makefile - ]) diff --git a/samples/Makefile.in b/samples/Makefile.in index f48dbc92a2..331de0e916 100644 --- a/samples/Makefile.in +++ b/samples/Makefile.in @@ -64,10 +64,10 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_PLATFORM_WIN321@DLLIMPEXT = .a -@COND_PLATFORM_WIN320@DLLIMPEXT = .$(SO_SUFFIX) -@COND_USE_GUI0@__console___depname = console -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_USE_GUI_0@__console___depname = console +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in index 46863c5422..266b23715a 100644 --- a/samples/access/Makefile.in +++ b/samples/access/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_PLATFORM_MAC1@__accesstest___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_PLATFORM_MAC1@__accesstest___mac_setfilecmd = $(SETFILE) -a C accesstest$(EXEEXT) -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@COND_PLATFORM_WIN321@__accesstest___win32rc = accesstest_rc.o -@COND_WXUNIV1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@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_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 accesstest$(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 +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_PLATFORM_MAC_1@__accesstest___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_MAC_1@__accesstest___mac_setfilecmd = $(SETFILE) -a C accesstest$(EXEEXT) +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_WIN32_1@__accesstest___win32rc = accesstest_rc.o +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o accesstest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -119,7 +119,7 @@ accesstest.o: $(srcdir)/accesstest.cpp $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(DEPS_FLAG) $(CXXFLAGS) $< accesstest$(EXEEXT): accesstest.o $(__accesstest___win32rc) - $(CXX) -o $@ accesstest.o $(__accesstest___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ accesstest.o $(__accesstest___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__accesstest___mac_rezcmd) $(__accesstest___mac_setfilecmd) diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in index 6250b0b7e9..922f38421b 100644 --- a/samples/artprov/Makefile.in +++ b/samples/artprov/Makefile.in @@ -70,45 +70,45 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_PLATFORM_MAC1@__arttest___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_PLATFORM_MAC1@__arttest___mac_setfilecmd = $(SETFILE) -a C arttest$(EXEEXT) -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@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_PLATFORM_WIN321@__arttest___win32rc = arttest_rc.o -@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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 arttest$(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 +@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_PLATFORM_MAC_1@__arttest___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_MAC_1@__arttest___mac_setfilecmd = $(SETFILE) -a C arttest$(EXEEXT) +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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@__arttest___win32rc = arttest_rc.o +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o arttest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### all: arttest$(EXEEXT) arttest$(EXEEXT): arttest.o artbrows.o $(__arttest___win32rc) - $(CXX) -o $@ arttest.o artbrows.o $(__arttest___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ arttest.o artbrows.o $(__arttest___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__arttest___mac_rezcmd) $(__arttest___mac_setfilecmd) diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in index efdb2057d4..65b45fc8d6 100644 --- a/samples/calendar/Makefile.in +++ b/samples/calendar/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_PLATFORM_MAC1@__calendar___mac_setfilecmd = $(SETFILE) -a C calendar$(EXEEXT) -@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@__calendar___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_PLATFORM_WIN321@__calendar___win32rc = calendar_rc.o -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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 calendar$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_TOOLKITMAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_WXUSE_REGEXBUILTIN@LIB_REGEX = wxregex -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d -@COND_WXUSE_REGEXBUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib +@COND_UNICODE_1@WXUNICODEFLAG = u +@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_PLATFORM_MAC_1@__calendar___mac_setfilecmd = $(SETFILE) -a C calendar$(EXEEXT) +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_MAC_1@__calendar___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_PLATFORM_WIN32_1@__calendar___win32rc = calendar_rc.o +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o calendar$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex ### Targets: ### @@ -119,7 +119,7 @@ clean: install: all calendar$(EXEEXT): calendar.o $(__calendar___win32rc) - $(CXX) -o $@ calendar.o $(__calendar___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ calendar.o $(__calendar___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__calendar___mac_rezcmd) $(__calendar___mac_setfilecmd) diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in index 5f17b72013..008e0d2c5c 100644 --- a/samples/caret/Makefile.in +++ b/samples/caret/Makefile.in @@ -70,45 +70,45 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_PLATFORM_MAC1@__caret___mac_setfilecmd = $(SETFILE) -a C caret$(EXEEXT) -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@COND_PLATFORM_MAC1@__caret___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_WIN321@__caret___win32rc = caret_rc.o -@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 caret$(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 +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_MAC_1@__caret___mac_setfilecmd = $(SETFILE) -a C caret$(EXEEXT) +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_MAC_1@__caret___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_PLATFORM_WIN32_1@__caret___win32rc = caret_rc.o +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o caret$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### all: caret$(EXEEXT) caret$(EXEEXT): caret.o $(__caret___win32rc) - $(CXX) -o $@ caret.o $(__caret___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ caret.o $(__caret___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__caret___mac_rezcmd) $(__caret___mac_setfilecmd) diff --git a/samples/checklst/Makefile.in b/samples/checklst/Makefile.in index 874c83cb8b..f952487cae 100644 --- a/samples/checklst/Makefile.in +++ b/samples/checklst/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_PLATFORM_MAC1@__checklst___mac_setfilecmd = $(SETFILE) -a C checklst$(EXEEXT) -@COND_PLATFORM_WIN321@__checklst___win32rc = checklst_rc.o -@COND_WXUSE_LIBPNGBUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_p = -lwxodbc -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_MONOLITHIC0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_PLATFORM_MAC1@__checklst___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUNIV1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_WXUNIV1@WXUNIVNAME = univ -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@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_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 checklst$(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 +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib +@COND_UNICODE_1@WXUNICODEFLAG = u +@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_PLATFORM_MAC_1@__checklst___mac_setfilecmd = $(SETFILE) -a C checklst$(EXEEXT) +@COND_PLATFORM_WIN32_1@__checklst___win32rc = checklst_rc.o +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_PLATFORM_MAC_1@__checklst___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o checklst$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -116,7 +116,7 @@ clean: install: all checklst$(EXEEXT): checklst.o $(__checklst___win32rc) - $(CXX) -o $@ checklst.o $(__checklst___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ checklst.o $(__checklst___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__checklst___mac_rezcmd) $(__checklst___mac_setfilecmd) diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in index b6dc6d5f8a..2a6c6e2e24 100644 --- a/samples/config/Makefile.in +++ b/samples/config/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_p = -lwxodbc -@COND_WXUSE_LIBPNGBUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@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@__conftest___win32rc = conftest_rc.o -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_PLATFORM_MAC1@__conftest___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_REGEXBUILTIN@LIB_REGEX = wxregex -@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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 conftest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_WXUSE_REGEXBUILTIN@__LIB_REGEX_p = -lwxregex -@COND_PLATFORM_MAC1@__conftest___mac_setfilecmd = $(SETFILE) -a C conftest$(EXEEXT) -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@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_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@__conftest___win32rc = conftest_rc.o +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_MAC_1@__conftest___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o conftest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_PLATFORM_MAC_1@__conftest___mac_setfilecmd = $(SETFILE) -a C conftest$(EXEEXT) +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -121,7 +121,7 @@ conftest_rc.o: $(srcdir)/conftest.rc uninstall: conftest$(EXEEXT): conftest.o $(__conftest___win32rc) - $(CXX) -o $@ conftest.o $(__conftest___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ conftest.o $(__conftest___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__conftest___mac_rezcmd) $(__conftest___mac_setfilecmd) diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in index 9acdadba77..ea61947c85 100644 --- a/samples/console/Makefile.in +++ b/samples/console/Makefile.in @@ -70,36 +70,36 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_WXUNIV1@WXUNIVNAME = univ -@COND_WXUNIV1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@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_PLATFORM_MAC1@__console___mac_setfilecmd = $(SETFILE) -a C console$(EXEEXT) -@COND_TOOLKITMAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o console$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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_PLATFORM_MAC1@__console___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_REGEXBUILTIN@__LIB_REGEX_p = -lwxregex -@COND_WXUSE_REGEXBUILTIN@LIB_REGEX = wxregex -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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_MAC_1@__console___mac_setfilecmd = $(SETFILE) -a C console$(EXEEXT) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o console$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_PLATFORM_MAC_1@__console___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -111,7 +111,7 @@ console.o: $(srcdir)/console.cpp $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(DEPS_FLAG) $(CXXFLAGS) $< console$(EXEEXT): console.o - $(CXX) -o $@ console.o -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ console.o -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__console___mac_rezcmd) $(__console___mac_setfilecmd) diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in index 3970255006..5fa7363b9e 100644 --- a/samples/controls/Makefile.in +++ b/samples/controls/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_PLATFORM_MAC1@__controls___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@COND_WXUNIV1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@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_PLATFORM_WIN321@__controls___win32rc = controls_rc.o -@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_WXUSE_ODBCBUILTIN@LIB_ODBC = wxodbc -@COND_MONOLITHIC1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_WXUSE_LIBJPEGBUILTIN@LIB_JPEG = wxjpeg -@COND_PLATFORM_MAC1@__controls___mac_setfilecmd = $(SETFILE) -a C controls$(EXEEXT) -@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 controls$(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 +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_PLATFORM_MAC_1@__controls___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_PLATFORM_WIN32_1@__controls___win32rc = controls_rc.o +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_PLATFORM_MAC_1@__controls___mac_setfilecmd = $(SETFILE) -a C controls$(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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o controls$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -122,7 +122,7 @@ controls_rc.o: $(srcdir)/controls.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ --define $(WXUNIV_DEFINE) --include-dir $(srcdir)/../../include --include-dir $(srcdir) controls$(EXEEXT): controls.o $(__controls___win32rc) - $(CXX) -o $@ controls.o $(__controls___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ controls.o $(__controls___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__controls___mac_rezcmd) $(__controls___mac_setfilecmd) diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in index 1e96a234b3..4076ad55c1 100644 --- a/samples/db/Makefile.in +++ b/samples/db/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_p = -lwxodbc -@COND_WXUSE_LIBPNGBUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@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_PLATFORM_MAC1@__dbtest___mac_setfilecmd = $(SETFILE) -a C dbtest$(EXEEXT) -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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_PLATFORM_MAC1@__dbtest___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 dbtest$(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_PLATFORM_WIN321@__dbtest___win32rc = dbtest_rc.o -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@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_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_MAC_1@__dbtest___mac_setfilecmd = $(SETFILE) -a C dbtest$(EXEEXT) +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_PLATFORM_MAC_1@__dbtest___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o dbtest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_PLATFORM_WIN32_1@__dbtest___win32rc = dbtest_rc.o +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -119,7 +119,7 @@ clean: install: all dbtest$(EXEEXT): dbtest.o listdb.o $(__dbtest___win32rc) - $(CXX) -o $@ dbtest.o listdb.o $(__dbtest___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ dbtest.o listdb.o $(__dbtest___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__dbtest___mac_rezcmd) $(__dbtest___mac_setfilecmd) diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index cf3886747e..9875c8216d 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_PLATFORM_MAC1@__dialogs___mac_setfilecmd = $(SETFILE) -a C dialogs$(EXEEXT) -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@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_PLATFORM_MAC1@__dialogs___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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_PLATFORM_WIN321@__dialogs___win32rc = dialogs_rc.o -@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 dialogs$(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 +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_MAC_1@__dialogs___mac_setfilecmd = $(SETFILE) -a C dialogs$(EXEEXT) +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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_MAC_1@__dialogs___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_PLATFORM_WIN32_1@__dialogs___win32rc = dialogs_rc.o +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o dialogs$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -113,7 +113,7 @@ dialogs.o: $(srcdir)/dialogs.cpp $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(DEPS_FLAG) $(CXXFLAGS) $< dialogs$(EXEEXT): dialogs.o $(__dialogs___win32rc) - $(CXX) -o $@ dialogs.o $(__dialogs___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ dialogs.o $(__dialogs___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__dialogs___mac_rezcmd) $(__dialogs___mac_setfilecmd) diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in index 67cc9576de..ff361f6054 100644 --- a/samples/dialup/Makefile.in +++ b/samples/dialup/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_PLATFORM_MAC1@__nettest___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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@__nettest___mac_setfilecmd = $(SETFILE) -a C nettest$(EXEEXT) -@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_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_PLATFORM_WIN321@__nettest___win32rc = nettest_rc.o -@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 nettest$(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 +@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_PLATFORM_MAC_1@__nettest___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_MAC_1@__nettest___mac_setfilecmd = $(SETFILE) -a C nettest$(EXEEXT) +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_PLATFORM_WIN32_1@__nettest___win32rc = nettest_rc.o +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o nettest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -121,7 +121,7 @@ install: all uninstall: nettest$(EXEEXT): nettest.o $(__nettest___win32rc) - $(CXX) -o $@ nettest.o $(__nettest___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ nettest.o $(__nettest___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__nettest___mac_rezcmd) $(__nettest___mac_setfilecmd) diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in index 6e47261a5a..6bf20b8395 100644 --- a/samples/display/Makefile.in +++ b/samples/display/Makefile.in @@ -70,37 +70,37 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_p = -lwxpng -@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_MAC1@__display___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@COND_TOOLKITMAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_PLATFORM_MAC1@__display___mac_setfilecmd = $(SETFILE) -a C display$(EXEEXT) -@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_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 display$(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 +@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_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_MAC_1@__display___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_PLATFORM_MAC_1@__display___mac_setfilecmd = $(SETFILE) -a C display$(EXEEXT) +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o display$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -118,7 +118,7 @@ display.o: $(srcdir)/display.cpp $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(DEPS_FLAG) $(CXXFLAGS) $< display$(EXEEXT): display.o - $(CXX) -o $@ display.o -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ display.o -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__display___mac_rezcmd) $(__display___mac_setfilecmd) diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in index ac225733b2..5f19989c5e 100644 --- a/samples/dnd/Makefile.in +++ b/samples/dnd/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_PLATFORM_WIN321@__dnd___win32rc = dnd_rc.o -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_p = -lwxodbc -@COND_WXUSE_LIBPNGBUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@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_PLATFORM_MAC1@__dnd___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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_PLATFORM_MAC1@__dnd___mac_setfilecmd = $(SETFILE) -a C dnd$(EXEEXT) -@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 dnd$(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 +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib +@COND_UNICODE_1@WXUNICODEFLAG = u +@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_PLATFORM_WIN32_1@__dnd___win32rc = dnd_rc.o +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_MAC_1@__dnd___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_PLATFORM_MAC_1@__dnd___mac_setfilecmd = $(SETFILE) -a C dnd$(EXEEXT) +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o dnd$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -115,7 +115,7 @@ dnd_rc.o: $(srcdir)/dnd.rc install: all dnd$(EXEEXT): dnd.o $(__dnd___win32rc) - $(CXX) -o $@ dnd.o $(__dnd___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ dnd.o $(__dnd___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__dnd___mac_rezcmd) $(__dnd___mac_setfilecmd) diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in index cae843dfd2..737bd36dbb 100644 --- a/samples/docview/Makefile.in +++ b/samples/docview/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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@__docview___mac_setfilecmd = $(SETFILE) -a C docview$(EXEEXT) -@COND_PLATFORM_WIN321@__docview___win32rc = docview_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@__docview___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 docview$(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 +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = $(SETFILE) -a C docview$(EXEEXT) +@COND_PLATFORM_WIN32_1@__docview___win32rc = docview_rc.o +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_PLATFORM_MAC_1@__docview___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o docview$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -127,7 +127,7 @@ doc.o: $(srcdir)/doc.cpp uninstall: docview$(EXEEXT): docview.o doc.o view.o $(__docview___win32rc) - $(CXX) -o $@ docview.o doc.o view.o $(__docview___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ docview.o doc.o view.o $(__docview___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__docview___mac_rezcmd) $(__docview___mac_setfilecmd) diff --git a/samples/docvwmdi/Makefile.in b/samples/docvwmdi/Makefile.in index cae843dfd2..737bd36dbb 100644 --- a/samples/docvwmdi/Makefile.in +++ b/samples/docvwmdi/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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@__docview___mac_setfilecmd = $(SETFILE) -a C docview$(EXEEXT) -@COND_PLATFORM_WIN321@__docview___win32rc = docview_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@__docview___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 docview$(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 +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = $(SETFILE) -a C docview$(EXEEXT) +@COND_PLATFORM_WIN32_1@__docview___win32rc = docview_rc.o +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_PLATFORM_MAC_1@__docview___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o docview$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -127,7 +127,7 @@ doc.o: $(srcdir)/doc.cpp uninstall: docview$(EXEEXT): docview.o doc.o view.o $(__docview___win32rc) - $(CXX) -o $@ docview.o doc.o view.o $(__docview___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ docview.o doc.o view.o $(__docview___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__docview___mac_rezcmd) $(__docview___mac_setfilecmd) diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in index 788702c1b6..934c03c8e0 100644 --- a/samples/dragimag/Makefile.in +++ b/samples/dragimag/Makefile.in @@ -70,45 +70,45 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_PLATFORM_MAC1@__dragimag___mac_setfilecmd = $(SETFILE) -a C dragimag$(EXEEXT) -@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_WIN321@__dragimag___win32rc = dragimag_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_WXUSE_ODBCBUILTIN@LIB_ODBC = wxodbc -@COND_MONOLITHIC1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_WXUSE_LIBJPEGBUILTIN@LIB_JPEG = wxjpeg -@COND_PLATFORM_MAC1@__dragimag___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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 dragimag$(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 -@COND_WXUSE_LIBTIFFBUILTIN@LIB_TIFF = wxtiff +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib +@COND_UNICODE_1@WXUNICODEFLAG = u +@COND_PLATFORM_MAC_1@__dragimag___mac_setfilecmd = $(SETFILE) -a C dragimag$(EXEEXT) +@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_WIN32_1@__dragimag___win32rc = dragimag_rc.o +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_PLATFORM_MAC_1@__dragimag___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o dragimag$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff ### Targets: ### all: dragimag$(EXEEXT) data dragimag$(EXEEXT): dragimag.o $(__dragimag___win32rc) - $(CXX) -o $@ dragimag.o $(__dragimag___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ dragimag.o $(__dragimag___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__dragimag___mac_rezcmd) $(__dragimag___mac_setfilecmd) diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in index b7583831d1..a1640cfcee 100644 --- a/samples/drawing/Makefile.in +++ b/samples/drawing/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_PLATFORM_MAC1@__drawing___mac_setfilecmd = $(SETFILE) -a C drawing$(EXEEXT) -@COND_WXUSE_LIBPNGBUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_p = -lwxodbc -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@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@__drawing___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_PLATFORM_WIN321@__drawing___win32rc = drawing_rc.o -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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 drawing$(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 +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib +@COND_UNICODE_1@WXUNICODEFLAG = u +@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_PLATFORM_MAC_1@__drawing___mac_setfilecmd = $(SETFILE) -a C drawing$(EXEEXT) +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_MAC_1@__drawing___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_PLATFORM_WIN32_1@__drawing___win32rc = drawing_rc.o +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o drawing$(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_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -130,7 +130,7 @@ data: done drawing$(EXEEXT): drawing.o $(__drawing___win32rc) - $(CXX) -o $@ drawing.o $(__drawing___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ drawing.o $(__drawing___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__drawing___mac_rezcmd) $(__drawing___mac_setfilecmd) diff --git a/samples/dynamic/Makefile.in b/samples/dynamic/Makefile.in index 93cc4488a6..d80a7a79ff 100644 --- a/samples/dynamic/Makefile.in +++ b/samples/dynamic/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_PLATFORM_MAC1@__dynamic___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_LIBPNGBUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_p = -lwxodbc -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@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_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_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 dynamic$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_PLATFORM_MAC1@__dynamic___mac_setfilecmd = $(SETFILE) -a C dynamic$(EXEEXT) -@COND_WXUSE_REGEXBUILTIN@__LIB_REGEX_p = -lwxregex -@COND_WXUSE_REGEXBUILTIN@LIB_REGEX = wxregex -@COND_PLATFORM_WIN321@__dynamic___win32rc = dynamic_rc.o -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib +@COND_UNICODE_1@WXUNICODEFLAG = u +@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_PLATFORM_MAC_1@__dynamic___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o dynamic$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_PLATFORM_MAC_1@__dynamic___mac_setfilecmd = $(SETFILE) -a C dynamic$(EXEEXT) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_PLATFORM_WIN32_1@__dynamic___win32rc = dynamic_rc.o +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -119,7 +119,7 @@ dynamic.o: $(srcdir)/dynamic.cpp $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(DEPS_FLAG) $(CXXFLAGS) $< dynamic$(EXEEXT): dynamic.o $(__dynamic___win32rc) - $(CXX) -o $@ dynamic.o $(__dynamic___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ dynamic.o $(__dynamic___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__dynamic___mac_rezcmd) $(__dynamic___mac_setfilecmd) diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in index 1901ec7709..e5fc935ec5 100644 --- a/samples/erase/Makefile.in +++ b/samples/erase/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_TOOLKITMAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_PLATFORM_MAC1@__erase___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_PLATFORM_WIN321@__erase___win32rc = erase_rc.o -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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_PLATFORM_MAC1@__erase___mac_setfilecmd = $(SETFILE) -a C erase$(EXEEXT) -@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 erase$(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_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@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_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -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_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -110,7 +110,7 @@ all: erase$(EXEEXT) install-strip: install erase$(EXEEXT): erase.o $(__erase___win32rc) - $(CXX) -o $@ erase.o $(__erase___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(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) diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in index f6427c56f3..ce0202196d 100644 --- a/samples/event/Makefile.in +++ b/samples/event/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_PLATFORM_MAC1@__event___mac_setfilecmd = $(SETFILE) -a C event$(EXEEXT) -@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@__event___win32rc = event_rc.o -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@COND_PLATFORM_MAC1@__event___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_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 event$(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 +@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_PLATFORM_MAC_1@__event___mac_setfilecmd = $(SETFILE) -a C event$(EXEEXT) +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@__event___win32rc = event_rc.o +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_MAC_1@__event___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o event$(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_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -122,7 +122,7 @@ event.o: $(srcdir)/event.cpp $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(DEPS_FLAG) $(CXXFLAGS) $< event$(EXEEXT): event.o $(__event___win32rc) - $(CXX) -o $@ event.o $(__event___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ event.o $(__event___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__event___mac_rezcmd) $(__event___mac_setfilecmd) diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in index fba5075dd1..775862325e 100644 --- a/samples/exec/Makefile.in +++ b/samples/exec/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_PLATFORM_MAC1@__exec___mac_setfilecmd = $(SETFILE) -a C exec$(EXEEXT) -@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_MAC1@__exec___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_PLATFORM_WIN321@__exec___win32rc = exec_rc.o -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@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_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 exec$(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 +@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_PLATFORM_MAC_1@__exec___mac_setfilecmd = $(SETFILE) -a C exec$(EXEEXT) +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_MAC_1@__exec___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_WIN32_1@__exec___win32rc = exec_rc.o +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o exec$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -119,7 +119,7 @@ clean: install: all exec$(EXEEXT): exec.o $(__exec___win32rc) - $(CXX) -o $@ exec.o $(__exec___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ exec.o $(__exec___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__exec___mac_rezcmd) $(__exec___mac_setfilecmd) diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in index fd0df3b919..806dfc02c5 100644 --- a/samples/font/Makefile.in +++ b/samples/font/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_WIN321@__font___win32rc = font_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_WXUSE_ODBCBUILTIN@LIB_ODBC = wxodbc -@COND_MONOLITHIC1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_WXUSE_LIBJPEGBUILTIN@LIB_JPEG = wxjpeg -@COND_PLATFORM_MAC1@__font___mac_setfilecmd = $(SETFILE) -a C font$(EXEEXT) -@COND_PLATFORM_MAC1@__font___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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 font$(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 +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_WIN32_1@__font___win32rc = font_rc.o +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_PLATFORM_MAC_1@__font___mac_setfilecmd = $(SETFILE) -a C font$(EXEEXT) +@COND_PLATFORM_MAC_1@__font___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o font$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -121,7 +121,7 @@ install: all uninstall: font$(EXEEXT): font.o $(__font___win32rc) - $(CXX) -o $@ font.o $(__font___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ font.o $(__font___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__font___mac_rezcmd) $(__font___mac_setfilecmd) diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in index 299a01a094..68772d9c8b 100644 --- a/samples/grid/Makefile.in +++ b/samples/grid/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_PLATFORM_MAC1@__grid___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_LIBPNGBUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_p = -lwxodbc -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@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_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_PLATFORM_MAC1@__grid___mac_setfilecmd = $(SETFILE) -a C grid$(EXEEXT) -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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_PLATFORM_WIN321@__grid___win32rc = grid_rc.o -@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 grid$(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_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib +@COND_UNICODE_1@WXUNICODEFLAG = u +@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_PLATFORM_MAC_1@__grid___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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_MAC_1@__grid___mac_setfilecmd = $(SETFILE) -a C grid$(EXEEXT) +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_PLATFORM_WIN32_1@__grid___win32rc = grid_rc.o +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o grid$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -113,7 +113,7 @@ grid.o: $(srcdir)/grid.cpp $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(DEPS_FLAG) $(CXXFLAGS) $< grid$(EXEEXT): grid.o $(__grid___win32rc) - $(CXX) -o $@ grid.o $(__grid___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ grid.o $(__grid___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__grid___mac_rezcmd) $(__grid___mac_setfilecmd) diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in index b1d8e58645..538e941a14 100644 --- a/samples/help/Makefile.in +++ b/samples/help/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_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_TOOLKITMAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o help$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_PLATFORM_WIN321@__help___win32rc = help_rc.o -@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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_PLATFORM_MAC1@__help___mac_setfilecmd = $(SETFILE) -a C help$(EXEEXT) -@COND_PLATFORM_MAC1@__help___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_REGEXBUILTIN@__LIB_REGEX_p = -lwxregex -@COND_WXUSE_REGEXBUILTIN@LIB_REGEX = wxregex -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o help$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_PLATFORM_WIN32_1@__help___win32rc = help_rc.o +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_PLATFORM_MAC_1@__help___mac_setfilecmd = $(SETFILE) -a C help$(EXEEXT) +@COND_PLATFORM_MAC_1@__help___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -110,7 +110,7 @@ all: help$(EXEEXT) install-strip: install help$(EXEEXT): help.o $(__help___win32rc) - $(CXX) -o $@ help.o $(__help___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ help.o $(__help___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__help___mac_rezcmd) $(__help___mac_setfilecmd) diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in index 4fd27e4198..3ce8543ec1 100644 --- a/samples/htlbox/Makefile.in +++ b/samples/htlbox/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_PLATFORM_WIN321@__htlbox___win32rc = htlbox_rc.o -@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_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_WXUSE_ODBCBUILTIN@LIB_ODBC = wxodbc -@COND_MONOLITHIC1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_WXUSE_LIBJPEGBUILTIN@LIB_JPEG = wxjpeg -@COND_PLATFORM_MAC1@__htlbox___mac_setfilecmd = $(SETFILE) -a C htlbox$(EXEEXT) -@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 htlbox$(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_PLATFORM_MAC1@__htlbox___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d -@COND_WXUSE_LIBTIFFBUILTIN@LIB_TIFF = wxtiff +@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_PLATFORM_WIN32_1@__htlbox___win32rc = htlbox_rc.o +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_PLATFORM_MAC_1@__htlbox___mac_setfilecmd = $(SETFILE) -a C htlbox$(EXEEXT) +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o htlbox$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_PLATFORM_MAC_1@__htlbox___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff ### Targets: ### @@ -122,7 +122,7 @@ htlbox.o: $(srcdir)/htlbox.cpp $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(DEPS_FLAG) $(CXXFLAGS) $< htlbox$(EXEEXT): htlbox.o $(__htlbox___win32rc) - $(CXX) -o $@ htlbox.o $(__htlbox___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ htlbox.o $(__htlbox___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__htlbox___mac_rezcmd) $(__htlbox___mac_setfilecmd) diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in index 7cbcc1b868..97cb5138ee 100644 --- a/samples/image/Makefile.in +++ b/samples/image/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_PLATFORM_WIN321@__image___win32rc = image_rc.o -@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_TOOLKITMAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_WXUSE_ODBCBUILTIN@LIB_ODBC = wxodbc -@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_LIBPNGBUILTIN@__LIB_PNG_p = -lwxpng -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_PLATFORM_MAC1@__image___mac_setfilecmd = $(SETFILE) -a C image$(EXEEXT) -@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 image$(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_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d -@COND_PLATFORM_MAC1@__image___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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_PLATFORM_WIN32_1@__image___win32rc = image_rc.o +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_PLATFORM_MAC_1@__image___mac_setfilecmd = $(SETFILE) -a C image$(EXEEXT) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o image$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@COND_PLATFORM_MAC_1@__image___mac_rezcmd = $(__MACOSX_RESOURCES_p) ### Targets: ### @@ -123,7 +123,7 @@ image_rc.o: $(srcdir)/image.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ --define $(WXUNIV_DEFINE) --include-dir $(srcdir)/../../include --include-dir $(srcdir) image$(EXEEXT): image.o $(__image___win32rc) - $(CXX) -o $@ image.o $(__image___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ image.o $(__image___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__image___mac_rezcmd) $(__image___mac_setfilecmd) diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in index a0d4e5599c..30c35c28d5 100644 --- a/samples/internat/Makefile.in +++ b/samples/internat/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_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_PLATFORM_WIN321@__internat___win32rc = internat_rc.o -@COND_PLATFORM_MAC1@__internat___mac_setfilecmd = $(SETFILE) -a C internat$(EXEEXT) -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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_PLATFORM_MAC1@__internat___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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 internat$(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_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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@__internat___win32rc = internat_rc.o +@COND_PLATFORM_MAC_1@__internat___mac_setfilecmd = $(SETFILE) -a C internat$(EXEEXT) +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_PLATFORM_MAC_1@__internat___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o internat$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -122,7 +122,7 @@ internat_rc.o: $(srcdir)/internat.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ --define $(WXUNIV_DEFINE) --include-dir $(srcdir)/../../include --include-dir $(srcdir) internat$(EXEEXT): internat.o $(__internat___win32rc) - $(CXX) -o $@ internat.o $(__internat___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ internat.o $(__internat___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__internat___mac_rezcmd) $(__internat___mac_setfilecmd) diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in index 21fbf739c4..b3ab34b353 100644 --- a/samples/ipc/Makefile.in +++ b/samples/ipc/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_WXUNIV1@WXUNIVNAME = univ -@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_PLATFORM_MAC1@__ipc___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUNIV1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_PLATFORM_MAC1@__ipc___mac_setfilecmd = $(SETFILE) -a C ipc$(EXEEXT) -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@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_PLATFORM_WIN321@__ipc___win32rc = ipc_rc.o -@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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 ipc$(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 +@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_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_PLATFORM_MAC_1@__ipc___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_MAC_1@__ipc___mac_setfilecmd = $(SETFILE) -a C ipc$(EXEEXT) +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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@__ipc___win32rc = ipc_rc.o +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o ipc$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -116,7 +116,7 @@ clean: install: all ipc$(EXEEXT): ipc.o $(__ipc___win32rc) - $(CXX) -o $@ ipc.o $(__ipc___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ ipc.o $(__ipc___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__ipc___mac_rezcmd) $(__ipc___mac_setfilecmd) diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in index 4ab8268a4b..53c4f4982b 100644 --- a/samples/joytest/Makefile.in +++ b/samples/joytest/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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@__joytest___mac_setfilecmd = $(SETFILE) -a C joytest$(EXEEXT) -@COND_TOOLKITMAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_PLATFORM_WIN321@__joytest___win32rc = joytest_rc.o -@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_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 joytest$(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_PLATFORM_MAC1@__joytest___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_MAC_1@__joytest___mac_setfilecmd = $(SETFILE) -a C joytest$(EXEEXT) +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_PLATFORM_WIN32_1@__joytest___win32rc = joytest_rc.o +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o joytest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_PLATFORM_MAC_1@__joytest___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -110,7 +110,7 @@ all: joytest$(EXEEXT) install-strip: install joytest$(EXEEXT): joytest.o $(__joytest___win32rc) - $(CXX) -o $@ joytest.o $(__joytest___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ joytest.o $(__joytest___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__joytest___mac_rezcmd) $(__joytest___mac_setfilecmd) diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in index b756cc6482..f3479b2e64 100644 --- a/samples/keyboard/Makefile.in +++ b/samples/keyboard/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_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_PLATFORM_WIN321@__keyboard___win32rc = keyboard_rc.o -@COND_PLATFORM_MAC1@__keyboard___mac_setfilecmd = $(SETFILE) -a C keyboard$(EXEEXT) -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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_PLATFORM_MAC1@__keyboard___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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 keyboard$(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_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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@__keyboard___win32rc = keyboard_rc.o +@COND_PLATFORM_MAC_1@__keyboard___mac_setfilecmd = $(SETFILE) -a C keyboard$(EXEEXT) +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_PLATFORM_MAC_1@__keyboard___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o keyboard$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -116,7 +116,7 @@ clean: install: all keyboard$(EXEEXT): keyboard.o $(__keyboard___win32rc) - $(CXX) -o $@ keyboard.o $(__keyboard___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ keyboard.o $(__keyboard___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__keyboard___mac_rezcmd) $(__keyboard___mac_setfilecmd) diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in index 2bd5638899..618a79a240 100644 --- a/samples/layout/Makefile.in +++ b/samples/layout/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_PLATFORM_MAC1@__layout___mac_setfilecmd = $(SETFILE) -a C layout$(EXEEXT) -@COND_WXUNIV1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_PLATFORM_WIN321@__layout___win32rc = layout_rc.o -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_WXUNIV1@WXUNIVNAME = univ -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@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_PLATFORM_MAC1@__layout___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_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 layout$(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 +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_PLATFORM_MAC_1@__layout___mac_setfilecmd = $(SETFILE) -a C layout$(EXEEXT) +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@__layout___win32rc = layout_rc.o +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_PLATFORM_MAC_1@__layout___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o layout$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -110,7 +110,7 @@ all: layout$(EXEEXT) install-strip: install layout$(EXEEXT): layout.o $(__layout___win32rc) - $(CXX) -o $@ layout.o $(__layout___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ layout.o $(__layout___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__layout___mac_rezcmd) $(__layout___mac_setfilecmd) diff --git a/samples/listbox/Makefile.in b/samples/listbox/Makefile.in index 6784d80231..e767dfd6cc 100644 --- a/samples/listbox/Makefile.in +++ b/samples/listbox/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_PLATFORM_MAC1@__listbox___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_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_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_PLATFORM_MAC1@__listbox___mac_setfilecmd = $(SETFILE) -a C listbox$(EXEEXT) -@COND_PLATFORM_WIN321@__listbox___win32rc = listbox_rc.o -@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 listbox$(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 +@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_PLATFORM_MAC_1@__listbox___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_PLATFORM_MAC_1@__listbox___mac_setfilecmd = $(SETFILE) -a C listbox$(EXEEXT) +@COND_PLATFORM_WIN32_1@__listbox___win32rc = listbox_rc.o +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o listbox$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -119,7 +119,7 @@ listbox.o: $(srcdir)/listbox.cpp $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(DEPS_FLAG) $(CXXFLAGS) $< listbox$(EXEEXT): listbox.o $(__listbox___win32rc) - $(CXX) -o $@ listbox.o $(__listbox___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ listbox.o $(__listbox___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__listbox___mac_rezcmd) $(__listbox___mac_setfilecmd) diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in index 662ec00016..ec31598012 100644 --- a/samples/listctrl/Makefile.in +++ b/samples/listctrl/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_PLATFORM_WIN321@__listctrl___win32rc = listctrl_rc.o -@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_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_REGEXBUILTIN@LIB_REGEX = wxregex -@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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_PLATFORM_MAC1@__listctrl___mac_setfilecmd = $(SETFILE) -a C listctrl$(EXEEXT) -@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 listctrl$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_WXUSE_REGEXBUILTIN@__LIB_REGEX_p = -lwxregex -@COND_PLATFORM_MAC1@__listctrl___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib +@COND_UNICODE_1@WXUNICODEFLAG = u +@COND_PLATFORM_WIN32_1@__listctrl___win32rc = listctrl_rc.o +@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_PLATFORM_MAC_1@__listctrl___mac_setfilecmd = $(SETFILE) -a C listctrl$(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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o listctrl$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_PLATFORM_MAC_1@__listctrl___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -110,7 +110,7 @@ all: listctrl$(EXEEXT) install-strip: install listctrl$(EXEEXT): listctrl.o $(__listctrl___win32rc) - $(CXX) -o $@ listctrl.o $(__listctrl___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ listctrl.o $(__listctrl___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__listctrl___mac_rezcmd) $(__listctrl___mac_setfilecmd) diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in index c72191d4be..2a4349f103 100644 --- a/samples/mdi/Makefile.in +++ b/samples/mdi/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_USE_GUI0@PORTNAME = base -@COND_USE_GUI1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@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_PLATFORM_MAC1@__mdi___mac_setfilecmd = $(SETFILE) -a C mdi$(EXEEXT) -@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_PLATFORM_WIN321@__mdi___win32rc = mdi_rc.o -@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_PLATFORM_MAC1@__mdi___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_TOOLKITMAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o mdi$(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 +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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_MAC_1@__mdi___mac_setfilecmd = $(SETFILE) -a C mdi$(EXEEXT) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_PLATFORM_WIN32_1@__mdi___win32rc = mdi_rc.o +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_PLATFORM_MAC_1@__mdi___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o mdi$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -113,7 +113,7 @@ mdi.o: $(srcdir)/mdi.cpp install-strip: install mdi$(EXEEXT): mdi.o $(__mdi___win32rc) - $(CXX) -o $@ mdi.o $(__mdi___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ mdi.o $(__mdi___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__mdi___mac_rezcmd) $(__mdi___mac_setfilecmd) diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in index 599c94e571..cdb323d2c2 100644 --- a/samples/memcheck/Makefile.in +++ b/samples/memcheck/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_PLATFORM_MAC1@__memcheck___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_PLATFORM_MAC1@__memcheck___mac_setfilecmd = $(SETFILE) -a C memcheck$(EXEEXT) -@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_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_PLATFORM_WIN321@__memcheck___win32rc = memcheck_rc.o -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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 memcheck$(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 +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib +@COND_UNICODE_1@WXUNICODEFLAG = u +@COND_PLATFORM_MAC_1@__memcheck___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg +@COND_PLATFORM_MAC_1@__memcheck___mac_setfilecmd = $(SETFILE) -a C memcheck$(EXEEXT) +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_PLATFORM_WIN32_1@__memcheck___win32rc = memcheck_rc.o +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o memcheck$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -115,7 +115,7 @@ memcheck_rc.o: $(srcdir)/memcheck.rc install: all memcheck$(EXEEXT): memcheck.o $(__memcheck___win32rc) - $(CXX) -o $@ memcheck.o $(__memcheck___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ memcheck.o $(__memcheck___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__memcheck___mac_rezcmd) $(__memcheck___mac_setfilecmd) diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in index 10274df309..e243529b55 100644 --- a/samples/menu/Makefile.in +++ b/samples/menu/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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@__menu___mac_setfilecmd = $(SETFILE) -a C menu$(EXEEXT) -@COND_PLATFORM_MAC1@__menu___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_PLATFORM_WIN321@__menu___win32rc = menu_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_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 menu$(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 +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_MAC_1@__menu___mac_setfilecmd = $(SETFILE) -a C menu$(EXEEXT) +@COND_PLATFORM_MAC_1@__menu___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_PLATFORM_WIN32_1@__menu___win32rc = menu_rc.o +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o menu$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -116,7 +116,7 @@ clean: install: all menu$(EXEEXT): menu.o $(__menu___win32rc) - $(CXX) -o $@ menu.o $(__menu___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ menu.o $(__menu___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__menu___mac_rezcmd) $(__menu___mac_setfilecmd) diff --git a/samples/mfc/Makefile.in b/samples/mfc/Makefile.in index 5723e729e8..bf68a03846 100644 --- a/samples/mfc/Makefile.in +++ b/samples/mfc/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_PLATFORM_MAC1@__mfc___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_WIN321@__mfc___win32rc = mfc_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_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_PLATFORM_MAC1@__mfc___mac_setfilecmd = $(SETFILE) -a C mfc$(EXEEXT) -@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 mfc$(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 +@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_PLATFORM_MAC_1@__mfc___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_WIN32_1@__mfc___win32rc = mfc_rc.o +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_PLATFORM_MAC_1@__mfc___mac_setfilecmd = $(SETFILE) -a C mfc$(EXEEXT) +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o mfc$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -113,7 +113,7 @@ mfc.o: $(srcdir)/mfc.cpp install-strip: install mfc$(EXEEXT): mfc.o $(__mfc___win32rc) - $(CXX) -o $@ mfc.o $(__mfc___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ mfc.o $(__mfc___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__mfc___mac_rezcmd) $(__mfc___mac_setfilecmd) diff --git a/samples/minifram/Makefile.in b/samples/minifram/Makefile.in index 657c113afe..b94c984d8a 100644 --- a/samples/minifram/Makefile.in +++ b/samples/minifram/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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@__minifram___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_PLATFORM_WIN321@__minifram___win32rc = minifram_rc.o -@COND_PLATFORM_MAC1@__minifram___mac_setfilecmd = $(SETFILE) -a C minifram$(EXEEXT) -@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_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 minifram$(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 +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_MAC_1@__minifram___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_PLATFORM_WIN32_1@__minifram___win32rc = minifram_rc.o +@COND_PLATFORM_MAC_1@__minifram___mac_setfilecmd = $(SETFILE) -a C minifram$(EXEEXT) +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o minifram$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -122,7 +122,7 @@ minifram_rc.o: $(srcdir)/minifram.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ --define $(WXUNIV_DEFINE) --include-dir $(srcdir)/../../include --include-dir $(srcdir) minifram$(EXEEXT): minifram.o $(__minifram___win32rc) - $(CXX) -o $@ minifram.o $(__minifram___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ minifram.o $(__minifram___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__minifram___mac_rezcmd) $(__minifram___mac_setfilecmd) diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in index c71d955e3c..f1b207daef 100644 --- a/samples/minimal/Makefile.in +++ b/samples/minimal/Makefile.in @@ -70,37 +70,37 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o minimal$(EXEEXT) $(MACOSX_RESOURCES) mondrian.r -@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_WXUSE_REGEXBUILTIN@__LIB_REGEX_p = -lwxregex -@COND_WXUSE_REGEXBUILTIN@LIB_REGEX = wxregex -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_MAC_1@__minimal___mac_setfilecmd = $(SETFILE) -a C minimal$(EXEEXT) +@COND_PLATFORM_WIN32_1@__minimal___win32rc = minimal_rc.o +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_PLATFORM_MAC_1@__minimal___mac_rezcmd = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o minimal$(EXEEXT) $(MACOSX_RESOURCES) mondrian.r +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -121,7 +121,7 @@ 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) + $(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) diff --git a/samples/mobile/Makefile.in b/samples/mobile/Makefile.in index 46decc0e60..b508398475 100644 --- a/samples/mobile/Makefile.in +++ b/samples/mobile/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_PLATFORM_MAC1@__mobile___mac_setfilecmd = $(SETFILE) -a C mobile$(EXEEXT) -@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@__mobile___win32rc = mobile_rc.o -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@COND_PLATFORM_MAC1@__mobile___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_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 mobile$(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 +@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_PLATFORM_MAC_1@__mobile___mac_setfilecmd = $(SETFILE) -a C mobile$(EXEEXT) +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@__mobile___win32rc = mobile_rc.o +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_MAC_1@__mobile___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o mobile$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -116,7 +116,7 @@ clean: install: all mobile$(EXEEXT): mobile.o $(__mobile___win32rc) - $(CXX) -o $@ mobile.o $(__mobile___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ mobile.o $(__mobile___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__mobile___mac_rezcmd) $(__mobile___mac_setfilecmd) diff --git a/samples/multimon/Makefile.in b/samples/multimon/Makefile.in index 76596874d9..466e93e49d 100644 --- a/samples/multimon/Makefile.in +++ b/samples/multimon/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_p = -lwxodbc -@COND_WXUSE_LIBPNGBUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@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_PLATFORM_MAC1@__multimon___mac_setfilecmd = $(SETFILE) -a C multimon$(EXEEXT) -@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_PLATFORM_MAC1@__multimon___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_PLATFORM_WIN321@__multimon___win32rc = multimon_rc.o -@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 multimon$(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 +@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_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_MAC_1@__multimon___mac_setfilecmd = $(SETFILE) -a C multimon$(EXEEXT) +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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_MAC_1@__multimon___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_PLATFORM_WIN32_1@__multimon___win32rc = multimon_rc.o +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o multimon$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -110,7 +110,7 @@ all: multimon$(EXEEXT) install-strip: install multimon$(EXEEXT): multimon.o $(__multimon___win32rc) - $(CXX) -o $@ multimon.o $(__multimon___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ multimon.o $(__multimon___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__multimon___mac_rezcmd) $(__multimon___mac_setfilecmd) diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in index f33b3e2c4d..8fe4d6b278 100644 --- a/samples/nativdlg/Makefile.in +++ b/samples/nativdlg/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_p = -lwxodbc -@COND_WXUSE_LIBPNGBUILTIN@LIB_PNG = wxpng -@COND_PLATFORM_MAC1@__nativdlg___mac_setfilecmd = $(SETFILE) -a C nativdlg$(EXEEXT) -@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_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_TOOLKITMAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o nativdlg$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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_PLATFORM_MAC1@__nativdlg___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_REGEXBUILTIN@__LIB_REGEX_p = -lwxregex -@COND_WXUSE_REGEXBUILTIN@LIB_REGEX = wxregex -@COND_PLATFORM_WIN321@__nativdlg___win32rc = nativdlg_rc.o -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@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_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_PLATFORM_MAC_1@__nativdlg___mac_setfilecmd = $(SETFILE) -a C nativdlg$(EXEEXT) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o nativdlg$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_PLATFORM_MAC_1@__nativdlg___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_PLATFORM_WIN32_1@__nativdlg___win32rc = nativdlg_rc.o +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -110,7 +110,7 @@ all: nativdlg$(EXEEXT) install-strip: install nativdlg$(EXEEXT): nativdlg.o $(__nativdlg___win32rc) - $(CXX) -o $@ nativdlg.o $(__nativdlg___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ nativdlg.o $(__nativdlg___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__nativdlg___mac_rezcmd) $(__nativdlg___mac_setfilecmd) diff --git a/samples/newgrid/Makefile.in b/samples/newgrid/Makefile.in index 3e2eab7612..969aba5319 100644 --- a/samples/newgrid/Makefile.in +++ b/samples/newgrid/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_PLATFORM_MAC1@__newgrid___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@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_TOOLKITMAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o newgrid$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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_PLATFORM_WIN321@__newgrid___win32rc = newgrid_rc.o -@COND_WXUSE_REGEXBUILTIN@__LIB_REGEX_p = -lwxregex -@COND_WXUSE_REGEXBUILTIN@LIB_REGEX = wxregex -@COND_PLATFORM_MAC1@__newgrid___mac_setfilecmd = $(SETFILE) -a C newgrid$(EXEEXT) -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_MAC_1@__newgrid___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o newgrid$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_PLATFORM_WIN32_1@__newgrid___win32rc = newgrid_rc.o +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_PLATFORM_MAC_1@__newgrid___mac_setfilecmd = $(SETFILE) -a C newgrid$(EXEEXT) +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -110,7 +110,7 @@ all: newgrid$(EXEEXT) install-strip: install newgrid$(EXEEXT): newgrid.o $(__newgrid___win32rc) - $(CXX) -o $@ newgrid.o $(__newgrid___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ newgrid.o $(__newgrid___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__newgrid___mac_rezcmd) $(__newgrid___mac_setfilecmd) diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in index 050702182b..d56fa84973 100644 --- a/samples/notebook/Makefile.in +++ b/samples/notebook/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_PLATFORM_MAC1@__notebook___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@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_PLATFORM_MAC1@__notebook___mac_setfilecmd = $(SETFILE) -a C notebook$(EXEEXT) -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@COND_WXUNIV1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@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_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_PLATFORM_WIN321@__notebook___win32rc = notebook_rc.o -@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 notebook$(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 +@COND_PLATFORM_MAC_1@__notebook___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_UNICODE_1@WXUNICODEFLAG = u +@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_PLATFORM_MAC_1@__notebook___mac_setfilecmd = $(SETFILE) -a C notebook$(EXEEXT) +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_PLATFORM_WIN32_1@__notebook___win32rc = notebook_rc.o +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o notebook$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -110,7 +110,7 @@ all: notebook$(EXEEXT) install-strip: install notebook$(EXEEXT): notebook.o $(__notebook___win32rc) - $(CXX) -o $@ notebook.o $(__notebook___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ notebook.o $(__notebook___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__notebook___mac_rezcmd) $(__notebook___mac_setfilecmd) diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in index 8e4dae9c83..8396958eb9 100644 --- a/samples/oleauto/Makefile.in +++ b/samples/oleauto/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_p = -lwxpng -@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@__oleauto___win32rc = oleauto_rc.o -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@COND_TOOLKITMAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_PLATFORM_MAC1@__oleauto___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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@__oleauto___mac_setfilecmd = $(SETFILE) -a C oleauto$(EXEEXT) -@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 oleauto$(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 +@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_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@__oleauto___win32rc = oleauto_rc.o +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_PLATFORM_MAC_1@__oleauto___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_PLATFORM_MAC_1@__oleauto___mac_setfilecmd = $(SETFILE) -a C oleauto$(EXEEXT) +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o oleauto$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -116,7 +116,7 @@ clean: install: all oleauto$(EXEEXT): oleauto.o $(__oleauto___win32rc) - $(CXX) -o $@ oleauto.o $(__oleauto___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ oleauto.o $(__oleauto___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__oleauto___mac_rezcmd) $(__oleauto___mac_setfilecmd) diff --git a/samples/opengl/Makefile.in b/samples/opengl/Makefile.in index acc93b8454..0212645131 100644 --- a/samples/opengl/Makefile.in +++ b/samples/opengl/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_PLATFORM_WIN321@__opengl___win32rc = opengl_rc.o -@COND_WXUSE_LIBPNGBUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_p = -lwxodbc -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@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@__opengl___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_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 opengl$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_PLATFORM_MAC1@__opengl___mac_setfilecmd = $(SETFILE) -a C opengl$(EXEEXT) -@COND_WXUSE_REGEXBUILTIN@LIB_REGEX = wxregex -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d -@COND_WXUSE_REGEXBUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib +@COND_UNICODE_1@WXUNICODEFLAG = u +@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_PLATFORM_WIN32_1@__opengl___win32rc = opengl_rc.o +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_MAC_1@__opengl___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o opengl$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_PLATFORM_MAC_1@__opengl___mac_setfilecmd = $(SETFILE) -a C opengl$(EXEEXT) +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex ### Targets: ### @@ -122,7 +122,7 @@ clean: install: all opengl$(EXEEXT): opengl.o $(__opengl___win32rc) - $(CXX) -o $@ opengl.o $(__opengl___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ opengl.o $(__opengl___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__opengl___mac_rezcmd) $(__opengl___mac_setfilecmd) diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in index e98ac3dbc2..047ef2abd9 100644 --- a/samples/ownerdrw/Makefile.in +++ b/samples/ownerdrw/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_PLATFORM_MAC1@__ownerdrw___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@COND_WXUNIV1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@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_PLATFORM_WIN321@__ownerdrw___win32rc = ownerdrw_rc.o -@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_WXUSE_ODBCBUILTIN@LIB_ODBC = wxodbc -@COND_MONOLITHIC1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_WXUSE_LIBJPEGBUILTIN@LIB_JPEG = wxjpeg -@COND_PLATFORM_MAC1@__ownerdrw___mac_setfilecmd = $(SETFILE) -a C ownerdrw$(EXEEXT) -@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 ownerdrw$(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 +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_PLATFORM_MAC_1@__ownerdrw___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_PLATFORM_WIN32_1@__ownerdrw___win32rc = ownerdrw_rc.o +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_PLATFORM_MAC_1@__ownerdrw___mac_setfilecmd = $(SETFILE) -a C ownerdrw$(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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o ownerdrw$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -122,7 +122,7 @@ ownerdrw_rc.o: $(srcdir)/ownerdrw.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ --define $(WXUNIV_DEFINE) --include-dir $(srcdir)/../../include --include-dir $(srcdir) ownerdrw$(EXEEXT): ownerdrw.o $(__ownerdrw___win32rc) - $(CXX) -o $@ ownerdrw.o $(__ownerdrw___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ ownerdrw.o $(__ownerdrw___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__ownerdrw___mac_rezcmd) $(__ownerdrw___mac_setfilecmd) diff --git a/samples/png/Makefile.in b/samples/png/Makefile.in index a2b0d79a0c..2463fa21fc 100644 --- a/samples/png/Makefile.in +++ b/samples/png/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_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_PLATFORM_MAC1@__png___mac_setfilecmd = $(SETFILE) -a C png$(EXEEXT) -@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_PLATFORM_MAC1@__png___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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_PLATFORM_WIN321@__png___win32rc = png_rc.o -@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 png$(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 +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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_MAC_1@__png___mac_setfilecmd = $(SETFILE) -a C png$(EXEEXT) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_PLATFORM_MAC_1@__png___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_PLATFORM_WIN32_1@__png___win32rc = png_rc.o +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o png$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -122,7 +122,7 @@ png_rc.o: $(srcdir)/png.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ --define $(WXUNIV_DEFINE) --include-dir $(srcdir)/../../include --include-dir $(srcdir) png$(EXEEXT): png.o $(__png___win32rc) - $(CXX) -o $@ png.o $(__png___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ png.o $(__png___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__png___mac_rezcmd) $(__png___mac_setfilecmd) diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in index 51491f0631..92bddf7787 100644 --- a/samples/printing/Makefile.in +++ b/samples/printing/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_p = -lwxodbc -@COND_WXUSE_LIBPNGBUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@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_PLATFORM_MAC1@__printing___mac_setfilecmd = $(SETFILE) -a C printing$(EXEEXT) -@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_PLATFORM_MAC1@__printing___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_PLATFORM_WIN321@__printing___win32rc = printing_rc.o -@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 printing$(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 +@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_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_MAC_1@__printing___mac_setfilecmd = $(SETFILE) -a C printing$(EXEEXT) +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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_MAC_1@__printing___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_PLATFORM_WIN32_1@__printing___win32rc = printing_rc.o +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o printing$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -110,7 +110,7 @@ all: printing$(EXEEXT) install-strip: install printing$(EXEEXT): printing.o $(__printing___win32rc) - $(CXX) -o $@ printing.o $(__printing___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ printing.o $(__printing___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__printing___mac_rezcmd) $(__printing___mac_setfilecmd) diff --git a/samples/propsize/Makefile.in b/samples/propsize/Makefile.in index c46ff81169..01478e43ab 100644 --- a/samples/propsize/Makefile.in +++ b/samples/propsize/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_PLATFORM_MAC1@__propsize___mac_setfilecmd = $(SETFILE) -a C propsize$(EXEEXT) -@COND_WXUSE_LIBPNGBUILTIN@__LIB_PNG_p = -lwxpng -@COND_PLATFORM_WIN321@__propsize___win32rc = propsize_rc.o -@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_TOOLKITMAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_PLATFORM_MAC1@__propsize___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_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 propsize$(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 +@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_PLATFORM_MAC_1@__propsize___mac_setfilecmd = $(SETFILE) -a C propsize$(EXEEXT) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@__propsize___win32rc = propsize_rc.o +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_PLATFORM_MAC_1@__propsize___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o propsize$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -116,7 +116,7 @@ clean: install: all propsize$(EXEEXT): propsize.o $(__propsize___win32rc) - $(CXX) -o $@ propsize.o $(__propsize___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ propsize.o $(__propsize___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__propsize___mac_rezcmd) $(__propsize___mac_setfilecmd) diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in index f2b9540686..84809f4a09 100644 --- a/samples/regtest/Makefile.in +++ b/samples/regtest/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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@__regtest___mac_setfilecmd = $(SETFILE) -a C regtest$(EXEEXT) -@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_WXUSE_ODBCBUILTIN@LIB_ODBC = wxodbc -@COND_MONOLITHIC1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_WXUSE_LIBJPEGBUILTIN@LIB_JPEG = wxjpeg -@COND_PLATFORM_WIN321@__regtest___win32rc = regtest_rc.o -@COND_WXUSE_LIBTIFFBUILTIN@LIB_TIFF = wxtiff -@COND_PLATFORM_MAC1@__regtest___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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 regtest$(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 +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_MAC_1@__regtest___mac_setfilecmd = $(SETFILE) -a C regtest$(EXEEXT) +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_PLATFORM_WIN32_1@__regtest___win32rc = regtest_rc.o +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_PLATFORM_MAC_1@__regtest___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o regtest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -116,7 +116,7 @@ clean: install: all regtest$(EXEEXT): regtest.o $(__regtest___win32rc) - $(CXX) -o $@ regtest.o $(__regtest___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ regtest.o $(__regtest___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__regtest___mac_rezcmd) $(__regtest___mac_setfilecmd) diff --git a/samples/richedit/Makefile.in b/samples/richedit/Makefile.in index 01a772056d..969b8bcce3 100644 --- a/samples/richedit/Makefile.in +++ b/samples/richedit/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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@__richedit___mac_setfilecmd = $(SETFILE) -a C richedit$(EXEEXT) -@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_WXUSE_ODBCBUILTIN@LIB_ODBC = wxodbc -@COND_MONOLITHIC1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_WXUSE_LIBJPEGBUILTIN@LIB_JPEG = wxjpeg -@COND_PLATFORM_WIN321@__richedit___win32rc = richedit_rc.o -@COND_WXUSE_LIBTIFFBUILTIN@LIB_TIFF = wxtiff -@COND_PLATFORM_MAC1@__richedit___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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 richedit$(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 +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_MAC_1@__richedit___mac_setfilecmd = $(SETFILE) -a C richedit$(EXEEXT) +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_PLATFORM_WIN32_1@__richedit___win32rc = richedit_rc.o +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_PLATFORM_MAC_1@__richedit___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o richedit$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -113,7 +113,7 @@ richedit_rc.o: $(srcdir)/richedit.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ --define $(WXUNIV_DEFINE) --include-dir $(srcdir)/../../include --include-dir $(srcdir) richedit$(EXEEXT): richedit.o $(__richedit___win32rc) - $(CXX) -o $@ richedit.o $(__richedit___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ richedit.o $(__richedit___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__richedit___mac_rezcmd) $(__richedit___mac_setfilecmd) diff --git a/samples/rotate/Makefile.in b/samples/rotate/Makefile.in index ec8419f80b..75b9122058 100644 --- a/samples/rotate/Makefile.in +++ b/samples/rotate/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_TOOLKITMAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_PLATFORM_MAC1@__rotate___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_LIBPNGBUILTIN@__LIB_PNG_p = -lwxpng -@COND_PLATFORM_WIN321@DLLIMPEXT = .a -@COND_PLATFORM_WIN320@DLLIMPEXT = .$(SO_SUFFIX) -@COND_PLATFORM_MAC1@__rotate___mac_setfilecmd = $(SETFILE) -a C rotate$(EXEEXT) -@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_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 rotate$(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_PLATFORM_WIN321@__rotate___win32rc = rotate_rc.o -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_PLATFORM_MAC_1@__rotate___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_PLATFORM_MAC_1@__rotate___mac_setfilecmd = $(SETFILE) -a C rotate$(EXEEXT) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o rotate$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_PLATFORM_WIN32_1@__rotate___win32rc = rotate_rc.o +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -110,7 +110,7 @@ all: rotate$(EXEEXT) install-strip: install rotate$(EXEEXT): rotate.o $(__rotate___win32rc) - $(CXX) -o $@ rotate.o $(__rotate___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ rotate.o $(__rotate___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__rotate___mac_rezcmd) $(__rotate___mac_setfilecmd) diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in index 30367f05aa..640a6711be 100644 --- a/samples/sashtest/Makefile.in +++ b/samples/sashtest/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_PLATFORM_MAC1@__sashtest___mac_setfilecmd = $(SETFILE) -a C sashtest$(EXEEXT) -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@COND_WXUNIV1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_TOOLKITMAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_PLATFORM_WIN321@__sashtest___win32rc = sashtest_rc.o -@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_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_PLATFORM_MAC1@__sashtest___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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 sashtest$(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 +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_PLATFORM_MAC_1@__sashtest___mac_setfilecmd = $(SETFILE) -a C sashtest$(EXEEXT) +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_PLATFORM_WIN32_1@__sashtest___win32rc = sashtest_rc.o +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_PLATFORM_MAC_1@__sashtest___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o sashtest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -122,7 +122,7 @@ sashtest.o: $(srcdir)/sashtest.cpp $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(DEPS_FLAG) $(CXXFLAGS) $< sashtest$(EXEEXT): sashtest.o $(__sashtest___win32rc) - $(CXX) -o $@ sashtest.o $(__sashtest___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ sashtest.o $(__sashtest___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__sashtest___mac_rezcmd) $(__sashtest___mac_setfilecmd) diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in index b0080b813f..8309861c92 100644 --- a/samples/scroll/Makefile.in +++ b/samples/scroll/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_p = -lwxodbc -@COND_WXUSE_LIBPNGBUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@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_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_TOOLKITMAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_PLATFORM_WIN321@__scroll___win32rc = scroll_rc.o -@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_WXUSE_LIBJPEGBUILTIN@LIB_JPEG = wxjpeg -@COND_WXUSE_ODBCBUILTIN@LIB_ODBC = wxodbc -@COND_MONOLITHIC1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_PLATFORM_MAC1@__scroll___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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 scroll$(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_PLATFORM_MAC1@__scroll___mac_setfilecmd = $(SETFILE) -a C scroll$(EXEEXT) -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@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_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_PLATFORM_WIN32_1@__scroll___win32rc = scroll_rc.o +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_PLATFORM_MAC_1@__scroll___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o scroll$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_PLATFORM_MAC_1@__scroll___mac_setfilecmd = $(SETFILE) -a C scroll$(EXEEXT) +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -122,7 +122,7 @@ scroll.o: $(srcdir)/scroll.cpp $(CXX) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(DEPS_FLAG) $(CXXFLAGS) $< scroll$(EXEEXT): scroll.o $(__scroll___win32rc) - $(CXX) -o $@ scroll.o $(__scroll___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ scroll.o $(__scroll___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__scroll___mac_rezcmd) $(__scroll___mac_setfilecmd) diff --git a/samples/scrollsub/Makefile.in b/samples/scrollsub/Makefile.in index 1d89d24263..c4f4d2a6ed 100644 --- a/samples/scrollsub/Makefile.in +++ b/samples/scrollsub/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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@__scrollsub___win32rc = scrollsub_rc.o -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@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_WXUSE_ODBCBUILTIN@LIB_ODBC = wxodbc -@COND_MONOLITHIC1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_WXUSE_LIBJPEGBUILTIN@LIB_JPEG = wxjpeg -@COND_PLATFORM_MAC1@__scrollsub___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_PLATFORM_MAC1@__scrollsub___mac_setfilecmd = $(SETFILE) -a C scrollsub$(EXEEXT) -@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 scrollsub$(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 +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@__scrollsub___win32rc = scrollsub_rc.o +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_PLATFORM_MAC_1@__scrollsub___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_PLATFORM_MAC_1@__scrollsub___mac_setfilecmd = $(SETFILE) -a C scrollsub$(EXEEXT) +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o scrollsub$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -110,7 +110,7 @@ all: scrollsub$(EXEEXT) install-strip: install scrollsub$(EXEEXT): scrollsub.o $(__scrollsub___win32rc) - $(CXX) -o $@ scrollsub.o $(__scrollsub___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ scrollsub.o $(__scrollsub___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__scrollsub___mac_rezcmd) $(__scrollsub___mac_setfilecmd) diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in index 7c7075b1a3..c7e6d8e932 100644 --- a/samples/shaped/Makefile.in +++ b/samples/shaped/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_PLATFORM_MAC1@__shaped___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@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_MAC1@__shaped___mac_setfilecmd = $(SETFILE) -a C shaped$(EXEEXT) -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@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_PLATFORM_WIN321@__shaped___win32rc = shaped_rc.o -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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 shaped$(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_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@COND_PLATFORM_MAC_1@__shaped___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_UNICODE_1@WXUNICODEFLAG = u +@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_MAC_1@__shaped___mac_setfilecmd = $(SETFILE) -a C shaped$(EXEEXT) +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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@__shaped___win32rc = shaped_rc.o +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o shaped$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -122,7 +122,7 @@ clean: install: all shaped$(EXEEXT): shaped.o $(__shaped___win32rc) - $(CXX) -o $@ shaped.o $(__shaped___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ shaped.o $(__shaped___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__shaped___mac_rezcmd) $(__shaped___mac_setfilecmd) diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in index cdaa74acf3..95ee1050cb 100644 --- a/samples/sockets/Makefile.in +++ b/samples/sockets/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_PLATFORM_WIN321@__sockets___win32rc = sockets_rc.o -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@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_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_TOOLKITMAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o sockets$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_PLATFORM_MAC1@__sockets___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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_PLATFORM_MAC1@__sockets___mac_setfilecmd = $(SETFILE) -a C sockets$(EXEEXT) -@COND_WXUSE_REGEXBUILTIN@__LIB_REGEX_p = -lwxregex -@COND_WXUSE_REGEXBUILTIN@LIB_REGEX = wxregex -@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@COND_PLATFORM_WIN32_1@__sockets___win32rc = sockets_rc.o +@COND_UNICODE_1@WXUNICODEFLAG = u +@COND_BUILD_DEBUG@WXDEBUGFLAG = d +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o sockets$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_PLATFORM_MAC_1@__sockets___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_PLATFORM_MAC_1@__sockets___mac_setfilecmd = $(SETFILE) -a C sockets$(EXEEXT) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -122,7 +122,7 @@ sockets_rc.o: $(srcdir)/sockets.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ --define $(WXUNIV_DEFINE) --include-dir $(srcdir)/../../include --include-dir $(srcdir) sockets$(EXEEXT): sockets.o $(__sockets___win32rc) - $(CXX) -o $@ sockets.o $(__sockets___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ sockets.o $(__sockets___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__sockets___mac_rezcmd) $(__sockets___mac_setfilecmd) diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in index 0adfa5e47a..2896ea7122 100644 --- a/samples/splitter/Makefile.in +++ b/samples/splitter/Makefile.in @@ -70,45 +70,45 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_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_PLATFORM_MAC1@__splitter___mac_setfilecmd = $(SETFILE) -a C splitter$(EXEEXT) -@COND_MONOLITHIC1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_PLATFORM_WIN321@__splitter___win32rc = splitter_rc.o -@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_PLATFORM_MAC1@__splitter___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 splitter$(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 +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_PLATFORM_MAC_1@__splitter___mac_setfilecmd = $(SETFILE) -a C splitter$(EXEEXT) +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_PLATFORM_WIN32_1@__splitter___win32rc = splitter_rc.o +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_PLATFORM_MAC_1@__splitter___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o splitter$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### all: splitter$(EXEEXT) splitter$(EXEEXT): splitter.o $(__splitter___win32rc) - $(CXX) -o $@ splitter.o $(__splitter___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ splitter.o $(__splitter___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__splitter___mac_rezcmd) $(__splitter___mac_setfilecmd) diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in index 5c17249642..61ed2e0b0d 100644 --- a/samples/statbar/Makefile.in +++ b/samples/statbar/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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@__statbar___mac_setfilecmd = $(SETFILE) -a C statbar$(EXEEXT) -@COND_PLATFORM_WIN321@__statbar___win32rc = statbar_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@__statbar___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 statbar$(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 +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_MAC_1@__statbar___mac_setfilecmd = $(SETFILE) -a C statbar$(EXEEXT) +@COND_PLATFORM_WIN32_1@__statbar___win32rc = statbar_rc.o +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_PLATFORM_MAC_1@__statbar___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o statbar$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -113,7 +113,7 @@ statbar_rc.o: $(srcdir)/statbar.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ --define $(WXUNIV_DEFINE) --include-dir $(srcdir)/../../include --include-dir $(srcdir) statbar$(EXEEXT): statbar.o $(__statbar___win32rc) - $(CXX) -o $@ statbar.o $(__statbar___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ statbar.o $(__statbar___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__statbar___mac_rezcmd) $(__statbar___mac_setfilecmd) diff --git a/samples/tab/Makefile.in b/samples/tab/Makefile.in index 3aaa268283..1a54eff0c8 100644 --- a/samples/tab/Makefile.in +++ b/samples/tab/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_PLATFORM_WIN321@__tab___win32rc = tab_rc.o -@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_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_REGEXBUILTIN@LIB_REGEX = wxregex -@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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_PLATFORM_MAC1@__tab___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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 tab$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_WXUSE_REGEXBUILTIN@__LIB_REGEX_p = -lwxregex -@COND_PLATFORM_MAC1@__tab___mac_setfilecmd = $(SETFILE) -a C tab$(EXEEXT) -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@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_PLATFORM_WIN32_1@__tab___win32rc = tab_rc.o +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_PLATFORM_MAC_1@__tab___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o tab$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_PLATFORM_MAC_1@__tab___mac_setfilecmd = $(SETFILE) -a C tab$(EXEEXT) +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -113,7 +113,7 @@ tab_rc.o: $(srcdir)/tab.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ --define $(WXUNIV_DEFINE) --include-dir $(srcdir)/../../include --include-dir $(srcdir) tab$(EXEEXT): tab.o $(__tab___win32rc) - $(CXX) -o $@ tab.o $(__tab___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ tab.o $(__tab___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__tab___mac_rezcmd) $(__tab___mac_setfilecmd) diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in index 3780ca0b87..24b25b7060 100644 --- a/samples/taskbar/Makefile.in +++ b/samples/taskbar/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_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_PLATFORM_MAC1@__taskbar___mac_setfilecmd = $(SETFILE) -a C taskbar$(EXEEXT) -@COND_PLATFORM_WIN321@__taskbar___win32rc = taskbar_rc.o -@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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 taskbar$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_PLATFORM_MAC1@__taskbar___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_WXUSE_REGEXBUILTIN@__LIB_REGEX_p = -lwxregex -@COND_WXUSE_REGEXBUILTIN@LIB_REGEX = wxregex -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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_MAC_1@__taskbar___mac_setfilecmd = $(SETFILE) -a C taskbar$(EXEEXT) +@COND_PLATFORM_WIN32_1@__taskbar___win32rc = taskbar_rc.o +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o taskbar$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_PLATFORM_MAC_1@__taskbar___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -116,7 +116,7 @@ clean: install: all taskbar$(EXEEXT): taskbar.o $(__taskbar___win32rc) - $(CXX) -o $@ taskbar.o $(__taskbar___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ taskbar.o $(__taskbar___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__taskbar___mac_rezcmd) $(__taskbar___mac_setfilecmd) diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in index d2209f4543..8324b5148e 100644 --- a/samples/text/Makefile.in +++ b/samples/text/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_PLATFORM_MAC1@__text___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_PLATFORM_MAC1@__text___mac_setfilecmd = $(SETFILE) -a C text$(EXEEXT) -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@COND_WXUNIV1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@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_PLATFORM_WIN321@__text___win32rc = text_rc.o -@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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 text$(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 +@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_PLATFORM_MAC_1@__text___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_PLATFORM_MAC_1@__text___mac_setfilecmd = $(SETFILE) -a C text$(EXEEXT) +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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@__text___win32rc = text_rc.o +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o text$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -116,7 +116,7 @@ clean: install: all text$(EXEEXT): text.o $(__text___win32rc) - $(CXX) -o $@ text.o $(__text___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ text.o $(__text___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__text___mac_rezcmd) $(__text___mac_setfilecmd) diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in index 1b5eae5bf7..37491327bc 100644 --- a/samples/thread/Makefile.in +++ b/samples/thread/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_PLATFORM_MAC1@__thread___mac_setfilecmd = $(SETFILE) -a C thread$(EXEEXT) -@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@__thread___win32rc = thread_rc.o -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@COND_PLATFORM_MAC1@__thread___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_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 thread$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_TOOLKITMAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_WXUSE_REGEXBUILTIN@LIB_REGEX = wxregex -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d -@COND_WXUSE_REGEXBUILTIN@__LIB_REGEX_p = -lwxregex +@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_PLATFORM_MAC_1@__thread___mac_setfilecmd = $(SETFILE) -a C thread$(EXEEXT) +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@__thread___win32rc = thread_rc.o +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_MAC_1@__thread___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o thread$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex ### Targets: ### @@ -110,7 +110,7 @@ all: thread$(EXEEXT) install-strip: install thread$(EXEEXT): thread.o $(__thread___win32rc) - $(CXX) -o $@ thread.o $(__thread___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ thread.o $(__thread___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__thread___mac_rezcmd) $(__thread___mac_setfilecmd) diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in index 55a975ceef..02c9809c59 100644 --- a/samples/toolbar/Makefile.in +++ b/samples/toolbar/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_p = -lwxpng -@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_WIN321@__toolbar___win32rc = toolbar_rc.o -@COND_TOOLKITMAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_WXUSE_ODBCBUILTIN@LIB_ODBC = wxodbc -@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@__toolbar___mac_setfilecmd = $(SETFILE) -a C toolbar$(EXEEXT) -@COND_MONOLITHIC1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_WXUSE_LIBJPEGBUILTIN@LIB_JPEG = wxjpeg -@COND_PLATFORM_MAC1@__toolbar___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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 toolbar$(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 +@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_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_WIN32_1@__toolbar___win32rc = toolbar_rc.o +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_PLATFORM_MAC_1@__toolbar___mac_setfilecmd = $(SETFILE) -a C toolbar$(EXEEXT) +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_PLATFORM_MAC_1@__toolbar___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o toolbar$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -122,7 +122,7 @@ toolbar_rc.o: $(srcdir)/toolbar.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ --define $(WXUNIV_DEFINE) --include-dir $(srcdir)/../../include --include-dir $(srcdir) toolbar$(EXEEXT): toolbar.o $(__toolbar___win32rc) - $(CXX) -o $@ toolbar.o $(__toolbar___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ toolbar.o $(__toolbar___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__toolbar___mac_rezcmd) $(__toolbar___mac_setfilecmd) diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in index f0fe6cb676..0e7ee53797 100644 --- a/samples/treectrl/Makefile.in +++ b/samples/treectrl/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_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_PLATFORM_WIN321@__treectrl___win32rc = treectrl_rc.o -@COND_PLATFORM_MAC1@__treectrl___mac_setfilecmd = $(SETFILE) -a C treectrl$(EXEEXT) -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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_PLATFORM_MAC1@__treectrl___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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 treectrl$(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_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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@__treectrl___win32rc = treectrl_rc.o +@COND_PLATFORM_MAC_1@__treectrl___mac_setfilecmd = $(SETFILE) -a C treectrl$(EXEEXT) +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_PLATFORM_MAC_1@__treectrl___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o treectrl$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -110,7 +110,7 @@ all: treectrl$(EXEEXT) install-strip: install treectrl$(EXEEXT): treectrl.o $(__treectrl___win32rc) - $(CXX) -o $@ treectrl.o $(__treectrl___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ treectrl.o $(__treectrl___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__treectrl___mac_rezcmd) $(__treectrl___mac_setfilecmd) diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in index d20d18b458..2a9651c3ae 100644 --- a/samples/typetest/Makefile.in +++ b/samples/typetest/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_MAC1@__typetest___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@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_TOOLKITMAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o typetest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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_PLATFORM_MAC1@__typetest___mac_setfilecmd = $(SETFILE) -a C typetest$(EXEEXT) -@COND_USE_GUI0@PORTNAME = base -@COND_USE_GUI1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) -@COND_PLATFORM_WIN321@__typetest___win32rc = typetest_rc.o -@COND_WXUSE_REGEXBUILTIN@__LIB_REGEX_p = -lwxregex -@COND_WXUSE_REGEXBUILTIN@LIB_REGEX = wxregex -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_MAC_1@__typetest___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o typetest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_PLATFORM_MAC_1@__typetest___mac_setfilecmd = $(SETFILE) -a C typetest$(EXEEXT) +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_PLATFORM_WIN32_1@__typetest___win32rc = typetest_rc.o +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -122,7 +122,7 @@ typetest_rc.o: $(srcdir)/typetest.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ --define $(WXUNIV_DEFINE) --include-dir $(srcdir)/../../include --include-dir $(srcdir) typetest$(EXEEXT): typetest.o $(__typetest___win32rc) - $(CXX) -o $@ typetest.o $(__typetest___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ typetest.o $(__typetest___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__typetest___mac_rezcmd) $(__typetest___mac_setfilecmd) diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in index 0404bb51ee..bab274b001 100644 --- a/samples/validate/Makefile.in +++ b/samples/validate/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_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_TOOLKITMAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o validate$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_PLATFORM_MAC1@__validate___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_PLATFORM_MAC1@__validate___mac_setfilecmd = $(SETFILE) -a C validate$(EXEEXT) -@COND_PLATFORM_WIN321@__validate___win32rc = validate_rc.o -@COND_WXUSE_REGEXBUILTIN@LIB_REGEX = wxregex -@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d -@COND_WXUSE_REGEXBUILTIN@__LIB_REGEX_p = -lwxregex +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@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_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o validate$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_PLATFORM_MAC_1@__validate___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_USE_GUI_0@PORTNAME = base +@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) +@COND_PLATFORM_MAC_1@__validate___mac_setfilecmd = $(SETFILE) -a C validate$(EXEEXT) +@COND_PLATFORM_WIN32_1@__validate___win32rc = validate_rc.o +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex ### Targets: ### @@ -119,7 +119,7 @@ clean: install: all validate$(EXEEXT): validate.o $(__validate___win32rc) - $(CXX) -o $@ validate.o $(__validate___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ validate.o $(__validate___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__validate___mac_rezcmd) $(__validate___mac_setfilecmd) diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in index df2578d948..fb6406da64 100644 --- a/samples/vscroll/Makefile.in +++ b/samples/vscroll/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_PLATFORM_WIN321@__vscroll___win32rc = vscroll_rc.o -@COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_p = -lwxodbc -@COND_WXUSE_LIBPNGBUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@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_PLATFORM_MAC1@__vscroll___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_PLATFORM_MAC1@__vscroll___mac_setfilecmd = $(SETFILE) -a C vscroll$(EXEEXT) -@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@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 vscroll$(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 +@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_PLATFORM_WIN32_1@__vscroll___win32rc = vscroll_rc.o +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_MAC_1@__vscroll___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_PLATFORM_MAC_1@__vscroll___mac_setfilecmd = $(SETFILE) -a C vscroll$(EXEEXT) +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o vscroll$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -122,7 +122,7 @@ vscroll_rc.o: $(srcdir)/vscroll.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ --define $(WXUNIV_DEFINE) --include-dir $(srcdir)/../../include --include-dir $(srcdir) vscroll$(EXEEXT): vscroll.o $(__vscroll___win32rc) - $(CXX) -o $@ vscroll.o $(__vscroll___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ vscroll.o $(__vscroll___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__vscroll___mac_rezcmd) $(__vscroll___mac_setfilecmd) diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in index 455ae2dce2..66d165adb9 100644 --- a/samples/widgets/Makefile.in +++ b/samples/widgets/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_MAC1@__widgets___mac_setfilecmd = $(SETFILE) -a C widgets$(EXEEXT) -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@COND_PLATFORM_MAC1@__widgets___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_PLATFORM_WIN321@__widgets___win32rc = widgets_rc.o -@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_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 widgets$(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 +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_MAC_1@__widgets___mac_setfilecmd = $(SETFILE) -a C widgets$(EXEEXT) +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_PLATFORM_MAC_1@__widgets___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@__widgets___win32rc = widgets_rc.o +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o widgets$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -116,7 +116,7 @@ clean: install: all widgets$(EXEEXT): widgets.o $(__widgets___win32rc) - $(CXX) -o $@ widgets.o $(__widgets___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ widgets.o $(__widgets___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__widgets___mac_rezcmd) $(__widgets___mac_setfilecmd) diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in index 9fcc25f20b..af6bae1039 100644 --- a/samples/wizard/Makefile.in +++ b/samples/wizard/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@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_PLATFORM_MAC1@__wizard___mac_setfilecmd = $(SETFILE) -a C wizard$(EXEEXT) -@COND_PLATFORM_WIN321@WXCOMPILER = _gcc -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@COND_WXUNIV1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@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_PLATFORM_WIN321@__wizard___win32rc = wizard_rc.o -@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_WXUSE_ODBCBUILTIN@LIB_ODBC = wxodbc -@COND_MONOLITHIC1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_WXUSE_LIBJPEGBUILTIN@LIB_JPEG = wxjpeg -@COND_PLATFORM_MAC1@__wizard___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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 wizard$(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 +@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_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_PLATFORM_MAC_1@__wizard___mac_setfilecmd = $(SETFILE) -a C wizard$(EXEEXT) +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@__wizard___win32rc = wizard_rc.o +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@COND_PLATFORM_MAC_1@__wizard___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o wizard$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -118,7 +118,7 @@ install: all uninstall: wizard$(EXEEXT): wizard.o $(__wizard___win32rc) - $(CXX) -o $@ wizard.o $(__wizard___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ wizard.o $(__wizard___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__wizard___mac_rezcmd) $(__wizard___mac_setfilecmd) diff --git a/samples/wxtest/Makefile.in b/samples/wxtest/Makefile.in index 48c7fceb96..987664bd28 100644 --- a/samples/wxtest/Makefile.in +++ b/samples/wxtest/Makefile.in @@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib -@COND_UNICODE1@WXUNICODEFLAG = u -@COND_BUILDDEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_PLATFORM_MAC1@__wxtest___mac_setfilecmd = $(SETFILE) -a C wxtest$(EXEEXT) -@COND_WXUSE_LIBPNGBUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_p = -lwxodbc -@COND_PLATFORM_MAC1@__wxtest___mac_rezcmd = $(__MACOSX_RESOURCES_p) -@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_PLATFORM_WIN321@__wxtest___win32rc = wxtest_rc.o -@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib -@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_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 wxtest$(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 +@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_PLATFORM_MAC_1@__wxtest___mac_setfilecmd = $(SETFILE) -a C wxtest$(EXEEXT) +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc +@COND_PLATFORM_MAC_1@__wxtest___mac_rezcmd = $(__MACOSX_RESOURCES_p) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_PLATFORM_WIN32_1@__wxtest___win32rc = wxtest_rc.o +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib +@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng +@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a +@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff +@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc +@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg +@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)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o wxtest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d ### Targets: ### @@ -122,7 +122,7 @@ clean: install: all wxtest$(EXEEXT): wxtest.o $(__wxtest___win32rc) - $(CXX) -o $@ wxtest.o $(__wxtest___win32rc) -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ wxtest.o $(__wxtest___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__wxtest___mac_rezcmd) $(__wxtest___mac_setfilecmd) diff --git a/utils/configure b/utils/configure deleted file mode 100755 index 1c8fe9c402..0000000000 --- a/utils/configure +++ /dev/null @@ -1,821 +0,0 @@ -#! /bin/sh - -# From configure.in Id: configure.in -# Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. -# -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. - -# Defaults: -ac_help= -ac_default_prefix=/usr/local -# Any additions from configure.in: - -# Initialize some variables set by options. -# The variables have the same names as the options, with -# dashes changed to underlines. -build=NONE -cache_file=./config.cache -exec_prefix=NONE -host=NONE -no_create= -nonopt=NONE -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -target=NONE -verbose= -x_includes=NONE -x_libraries=NONE -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' -includedir='${prefix}/include' -oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' - -# Initialize some other variables. -subdirs= -MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -ac_max_here_lines=12 - -ac_prev= -for ac_option -do - - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" - ac_prev= - continue - fi - - case "$ac_option" in - -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) ac_optarg= ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case "$ac_option" in - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir="$ac_optarg" ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build="$ac_optarg" ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file="$ac_optarg" ;; - - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) - datadir="$ac_optarg" ;; - - -disable-* | --disable-*) - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - eval "enable_${ac_feature}=no" ;; - - -enable-* | --enable-*) - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "enable_${ac_feature}='$ac_optarg'" ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix="$ac_optarg" ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he) - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat << EOF -Usage: configure [options] [host] -Options: [defaults in brackets after descriptions] -Configuration: - --cache-file=FILE cache test results in FILE - --help print this message - --no-create do not create output files - --quiet, --silent do not print \`checking...' messages - --version print the version of autoconf that created configure -Directory and file names: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [same as prefix] - --bindir=DIR user executables in DIR [EPREFIX/bin] - --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] - --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR - [PREFIX/share] - --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR - [PREFIX/com] - --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] - --libdir=DIR object code libraries in DIR [EPREFIX/lib] - --includedir=DIR C header files in DIR [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] - --infodir=DIR info documentation in DIR [PREFIX/info] - --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR find the sources in DIR [configure dir or ..] - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM - run sed PROGRAM on installed program names -EOF - cat << EOF -Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] - --target=TARGET configure for TARGET [TARGET=HOST] -Features and packages: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF - if test -n "$ac_help"; then - echo "--enable and --with options recognized:$ac_help" - fi - exit 0 ;; - - -host | --host | --hos | --ho) - ac_prev=host ;; - -host=* | --host=* | --hos=* | --ho=*) - host="$ac_optarg" ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir="$ac_optarg" ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir="$ac_optarg" ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir="$ac_optarg" ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir="$ac_optarg" ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir="$ac_optarg" ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir="$ac_optarg" ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir="$ac_optarg" ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix="$ac_optarg" ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix="$ac_optarg" ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix="$ac_optarg" ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name="$ac_optarg" ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir="$ac_optarg" ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir="$ac_optarg" ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site="$ac_optarg" ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir="$ac_optarg" ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir="$ac_optarg" ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target="$ac_optarg" ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13" - exit 0 ;; - - -with-* | --with-*) - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "with_${ac_package}='$ac_optarg'" ;; - - -without-* | --without-*) - ac_package=`echo $ac_option|sed -e 's/-*without-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - eval "with_${ac_package}=no" ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes="$ac_optarg" ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries="$ac_optarg" ;; - - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } - ;; - - *) - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi - if test "x$nonopt" != xNONE; then - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } - fi - nonopt="$ac_option" - ;; - - esac -done - -if test -n "$ac_prev"; then - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } -fi - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -# File descriptor usage: -# 0 standard input -# 1 file creation -# 2 errors and warnings -# 3 some systems may open it to /dev/tty -# 4 used on the Kubota Titan -# 6 checking for... messages and results -# 5 compiler messages saved in config.log -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 -fi -exec 5>./config.log - -echo "\ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -" 1>&5 - -# Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell metacharacters. -ac_configure_args= -for ac_arg -do - case "$ac_arg" in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) - ac_configure_args="$ac_configure_args '$ac_arg'" ;; - *) ac_configure_args="$ac_configure_args $ac_arg" ;; - esac -done - -# NLS nuisances. -# Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -# Non-C LC_CTYPE values break the ctype check. -if test "${LANG+set}" = set; then LANG=C; export LANG; fi -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo > confdefs.h - -# A filename unique to this package, relative to the directory that -# configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=Makefile.in - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } - else - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } - fi -fi -srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` - -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi -fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - echo "loading site script $ac_site_file" - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - echo "loading cache $cache_file" - . $cache_file -else - echo "creating cache $cache_file" - > $cache_file -fi - -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -ac_exeext= -ac_objext=o -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi -else - ac_n= ac_c='\c' ac_t= -fi - - - -if test "x$wx_cv_use_gui" = "x"; then - { echo "configure: error: Please run configure from the top level directory." 1>&2; exit 1; } -fi - -GL_TOOLKIT_DIR=$wx_cv_path_glcanvas -USE_GUI=$wx_cv_use_gui -USE_RESOURCES=$wx_cv_use_resources - - - - -trap '' 1 2 15 -cat > confcache <<\EOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. -# -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. -# -EOF -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else - if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# Any assignment to VPATH causes Sun make to only execute -# the first set of double-colon rules, so remove it if not needed. -# If there is a colon in the path, we need to keep it. -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' -fi - -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 - -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs - - -# Without the "./", some shells look in PATH for config.status. -: ${CONFIG_STATUS=./config.status} - -echo creating $CONFIG_STATUS -rm -f $CONFIG_STATUS -cat > $CONFIG_STATUS </dev/null | sed 1q`: -# -# $0 $ac_configure_args -# -# Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. - -ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" -for ac_option -do - case "\$ac_option" in - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.13" - exit 0 ;; - -help | --help | --hel | --he | --h) - echo "\$ac_cs_usage"; exit 0 ;; - *) echo "\$ac_cs_usage"; exit 1 ;; - esac -done - -ac_given_srcdir=$srcdir - -trap 'rm -fr `echo " - Makefile - makegen/Makefile - HelpGen/Makefile - HelpGen/src/Makefile - tex2rtf/Makefile - tex2rtf/src/Makefile - hhp2cached/Makefile - dialoged/Makefile - dialoged/src/Makefile - emulator/Makefile - emulator/src/Makefile - helpview/Makefile - helpview/src/Makefile - wxconfigtool/Makefile - wxconfigtool/src/Makefile - " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -EOF -cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF -$ac_vpsub -$extrasub -s%@SHELL@%$SHELL%g -s%@CFLAGS@%$CFLAGS%g -s%@CPPFLAGS@%$CPPFLAGS%g -s%@CXXFLAGS@%$CXXFLAGS%g -s%@FFLAGS@%$FFLAGS%g -s%@DEFS@%$DEFS%g -s%@LDFLAGS@%$LDFLAGS%g -s%@LIBS@%$LIBS%g -s%@exec_prefix@%$exec_prefix%g -s%@prefix@%$prefix%g -s%@program_transform_name@%$program_transform_name%g -s%@bindir@%$bindir%g -s%@sbindir@%$sbindir%g -s%@libexecdir@%$libexecdir%g -s%@datadir@%$datadir%g -s%@sysconfdir@%$sysconfdir%g -s%@sharedstatedir@%$sharedstatedir%g -s%@localstatedir@%$localstatedir%g -s%@libdir@%$libdir%g -s%@includedir@%$includedir%g -s%@oldincludedir@%$oldincludedir%g -s%@infodir@%$infodir%g -s%@mandir@%$mandir%g -s%@GL_TOOLKIT_DIR@%$GL_TOOLKIT_DIR%g -s%@USE_GUI@%$USE_GUI%g -s%@USE_RESOURCES@%$USE_RESOURCES%g - -CEOF -EOF - -cat >> $CONFIG_STATUS <<\EOF - -# Split the substitutions into bite-sized pieces for seds with -# small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -ac_file=1 # Number of current file. -ac_beg=1 # First line for current file. -ac_end=$ac_max_sed_cmds # Line after last line for current file. -ac_more_lines=: -ac_sed_cmds="" -while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file - else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file - else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" - else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" - fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` - fi -done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat -fi -EOF - -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` - else - ac_dir_suffix= ac_dots= - fi - - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; - *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - - - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; - esac - - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* - -EOF -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF - -exit 0 -EOF -chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - diff --git a/utils/configure.in b/utils/configure.in deleted file mode 100644 index 165039beda..0000000000 --- a/utils/configure.in +++ /dev/null @@ -1,35 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_REVISION($Id$)dnl - -AC_INIT(Makefile.in) - -dnl we need the values the main configure determined for us, so refuse -dnl to run if we don't have them -if test "x$wx_cv_use_gui" = "x"; then - AC_MSG_ERROR([Please run configure from the top level directory.]) -fi - -GL_TOOLKIT_DIR=$wx_cv_path_glcanvas -USE_GUI=$wx_cv_use_gui -USE_RESOURCES=$wx_cv_use_resources -AC_SUBST(GL_TOOLKIT_DIR) -AC_SUBST(USE_GUI) -AC_SUBST(USE_RESOURCES) - -AC_OUTPUT([ - Makefile - makegen/Makefile - HelpGen/Makefile - HelpGen/src/Makefile - tex2rtf/Makefile - tex2rtf/src/Makefile - hhp2cached/Makefile - dialoged/Makefile - dialoged/src/Makefile - emulator/Makefile - emulator/src/Makefile - helpview/Makefile - helpview/src/Makefile - wxconfigtool/Makefile - wxconfigtool/src/Makefile - ]) -- 2.45.2