fixed DSW dependencies for samples

[wxWidgets.git] / build / bakefiles / Makefile

diff --git a/build/bakefiles/Makefile b/build/bakefiles/Makefile
index 0a38bea9524f6f827860e81d2344441c8bf1fcb1..741ec1293ff38d53c24a3411508cbbe8125e98cf 100644 (file)
--- a/build/bakefiles/Makefile
+++ b/build/bakefiles/Makefile
@@ -10,7 +10,7 @@ MDEPS = common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl opengl.bkl w
 
 DSWFLAGS = -DRUNTIME_LIBS=dynamic -DOFFICIAL_BUILD=0 -DUSE_HTML=1 \
            -DUSE_OPENGL=1 -DUSE_ODBC=1 -DMONOLITHIC=0 -DUSE_GUI=1 \
-           -DDEBUG_INFO=default -DDEBUG_FLAG=default
+           -DDEBUG_INFO=default -DDEBUG_FLAG=default -DMSLU=0
 
 COMPAT_TARGETS = ../../src/wxWindows.dsp
 
@@ -102,9 +102,10 @@ AUTOCONF_ALL = \
        ../../samples/minifram/Makefile.in \
        ../../samples/minimal/Makefile.in \
        ../../samples/mobile/Makefile.in \
+       ../../samples/mobile/styles/Makefile.in \
+       ../../samples/mobile/wxedit/Makefile.in \
        ../../samples/multimon/Makefile.in \
        ../../samples/nativdlg/Makefile.in \
-       ../../samples/newgrid/Makefile.in \
        ../../samples/notebook/Makefile.in \
        ../../samples/oleauto/Makefile.in \
        ../../samples/opengl/Makefile.in \
@@ -137,7 +138,10 @@ AUTOCONF_ALL = \
        ../../samples/vscroll/Makefile.in \
        ../../samples/widgets/Makefile.in \
        ../../samples/wizard/Makefile.in \
-       ../../samples/wxtest/Makefile.in
+       ../../samples/wxtest/Makefile.in \
+       ../../utils/HelpGen/Makefile.in \
+       ../../utils/Makefile.in \
+       ../../utils/tex2rtf/src/Makefile.in
 BORLAND_ALL = \
        ../../contrib/build/animate/makefile.bcc \
        ../../contrib/build/deprecated/makefile.bcc \
@@ -226,9 +230,10 @@ BORLAND_ALL = \
        ../../samples/minifram/makefile.bcc \
        ../../samples/minimal/makefile.bcc \
        ../../samples/mobile/makefile.bcc \
+       ../../samples/mobile/styles/makefile.bcc \
+       ../../samples/mobile/wxedit/makefile.bcc \
        ../../samples/multimon/makefile.bcc \
        ../../samples/nativdlg/makefile.bcc \
-       ../../samples/newgrid/makefile.bcc \
        ../../samples/notebook/makefile.bcc \
        ../../samples/oleauto/makefile.bcc \
        ../../samples/opengl/cube/makefile.bcc \
@@ -262,6 +267,9 @@ BORLAND_ALL = \
        ../../samples/widgets/makefile.bcc \
        ../../samples/wizard/makefile.bcc \
        ../../samples/wxtest/makefile.bcc \
+       ../../utils/HelpGen/makefile.bcc \
+       ../../utils/makefile.bcc \
+       ../../utils/tex2rtf/src/makefile.bcc \
        ../msw/makefile.bcc
 MINGW_ALL = \
        ../../contrib/build/animate/makefile.gcc \
@@ -351,9 +359,10 @@ MINGW_ALL = \
        ../../samples/minifram/makefile.gcc \
        ../../samples/minimal/makefile.gcc \
        ../../samples/mobile/makefile.gcc \
+       ../../samples/mobile/styles/makefile.gcc \
+       ../../samples/mobile/wxedit/makefile.gcc \
        ../../samples/multimon/makefile.gcc \
        ../../samples/nativdlg/makefile.gcc \
-       ../../samples/newgrid/makefile.gcc \
        ../../samples/notebook/makefile.gcc \
        ../../samples/oleauto/makefile.gcc \
        ../../samples/opengl/cube/makefile.gcc \
@@ -387,6 +396,9 @@ MINGW_ALL = \
        ../../samples/widgets/makefile.gcc \
        ../../samples/wizard/makefile.gcc \
        ../../samples/wxtest/makefile.gcc \
+       ../../utils/HelpGen/makefile.gcc \
+       ../../utils/makefile.gcc \
+       ../../utils/tex2rtf/src/makefile.gcc \
        ../msw/makefile.gcc
 MSVC_ALL = \
        ../../contrib/build/animate/makefile.vc \
@@ -476,9 +488,10 @@ MSVC_ALL = \
        ../../samples/minifram/makefile.vc \
        ../../samples/minimal/makefile.vc \
        ../../samples/mobile/makefile.vc \
+       ../../samples/mobile/styles/makefile.vc \
+       ../../samples/mobile/wxedit/makefile.vc \
        ../../samples/multimon/makefile.vc \
        ../../samples/nativdlg/makefile.vc \
-       ../../samples/newgrid/makefile.vc \
        ../../samples/notebook/makefile.vc \
        ../../samples/oleauto/makefile.vc \
        ../../samples/opengl/cube/makefile.vc \
@@ -512,6 +525,9 @@ MSVC_ALL = \
        ../../samples/widgets/makefile.vc \
        ../../samples/wizard/makefile.vc \
        ../../samples/wxtest/makefile.vc \
+       ../../utils/HelpGen/makefile.vc \
+       ../../utils/makefile.vc \
+       ../../utils/tex2rtf/src/makefile.vc \
        ../msw/makefile.vc
 MSVC6PRJ_ALL = \
        ../../contrib/build/animate/animate.dsw \
@@ -597,10 +613,10 @@ MSVC6PRJ_ALL = \
        ../../samples/mfc/mfc.dsw \
        ../../samples/minifram/minifram.dsw \
        ../../samples/minimal/minimal.dsw \
-       ../../samples/mobile/mobile.dsw \
+       ../../samples/mobile/styles/styles.dsw \
+       ../../samples/mobile/wxedit/wxedit.dsw \
        ../../samples/multimon/multimon.dsw \
        ../../samples/nativdlg/nativdlg.dsw \
-       ../../samples/newgrid/newgrid.dsw \
        ../../samples/notebook/notebook.dsw \
        ../../samples/oleauto/oleauto.dsw \
        ../../samples/opengl/cube/cube.dsw \
@@ -633,6 +649,8 @@ MSVC6PRJ_ALL = \
        ../../samples/widgets/widgets.dsw \
        ../../samples/wizard/wizard.dsw \
        ../../samples/wxtest/wxtest.dsw \
+       ../../utils/HelpGen/helpgen.dsw \
+       ../../utils/tex2rtf/src/tex2rtf.dsw \
        ../msw/wx.dsw
 WATCOM_ALL = \
        ../../contrib/build/animate/makefile.wat \
@@ -722,9 +740,10 @@ WATCOM_ALL = \
        ../../samples/minifram/makefile.wat \
        ../../samples/minimal/makefile.wat \
        ../../samples/mobile/makefile.wat \
+       ../../samples/mobile/styles/makefile.wat \
+       ../../samples/mobile/wxedit/makefile.wat \
        ../../samples/multimon/makefile.wat \
        ../../samples/nativdlg/makefile.wat \
-       ../../samples/newgrid/makefile.wat \
        ../../samples/notebook/makefile.wat \
        ../../samples/oleauto/makefile.wat \
        ../../samples/opengl/cube/makefile.wat \
@@ -758,6 +777,9 @@ WATCOM_ALL = \
        ../../samples/widgets/makefile.wat \
        ../../samples/wizard/makefile.wat \
        ../../samples/wxtest/makefile.wat \
+       ../../utils/HelpGen/makefile.wat \
+       ../../utils/makefile.wat \
+       ../../utils/tex2rtf/src/makefile.wat \
        ../msw/makefile.wat
 
 all: $(COMPAT_TARGETS) autoconf borland mingw msvc msvc6prj watcom
@@ -859,9 +881,10 @@ clean:
        rm -f ../../samples/minifram/Makefile.in
        rm -f ../../samples/minimal/Makefile.in
        rm -f ../../samples/mobile/Makefile.in
+       rm -f ../../samples/mobile/styles/Makefile.in
+       rm -f ../../samples/mobile/wxedit/Makefile.in
        rm -f ../../samples/multimon/Makefile.in
        rm -f ../../samples/nativdlg/Makefile.in
-       rm -f ../../samples/newgrid/Makefile.in
        rm -f ../../samples/notebook/Makefile.in
        rm -f ../../samples/oleauto/Makefile.in
        rm -f ../../samples/opengl/Makefile.in
@@ -895,6 +918,9 @@ clean:
        rm -f ../../samples/widgets/Makefile.in
        rm -f ../../samples/wizard/Makefile.in
        rm -f ../../samples/wxtest/Makefile.in
+       rm -f ../../utils/HelpGen/Makefile.in
+       rm -f ../../utils/Makefile.in
+       rm -f ../../utils/tex2rtf/src/Makefile.in
        rm -f ../../contrib/build/animate/makefile.bcc
        rm -f ../../contrib/build/deprecated/makefile.bcc
        rm -f ../../contrib/build/fl/makefile.bcc
@@ -982,9 +1008,10 @@ clean:
        rm -f ../../samples/minifram/makefile.bcc
        rm -f ../../samples/minimal/makefile.bcc
        rm -f ../../samples/mobile/makefile.bcc
+       rm -f ../../samples/mobile/styles/makefile.bcc
+       rm -f ../../samples/mobile/wxedit/makefile.bcc
        rm -f ../../samples/multimon/makefile.bcc
        rm -f ../../samples/nativdlg/makefile.bcc
-       rm -f ../../samples/newgrid/makefile.bcc
        rm -f ../../samples/notebook/makefile.bcc
        rm -f ../../samples/oleauto/makefile.bcc
        rm -f ../../samples/opengl/cube/makefile.bcc
@@ -1018,6 +1045,9 @@ clean:
        rm -f ../../samples/widgets/makefile.bcc
        rm -f ../../samples/wizard/makefile.bcc
        rm -f ../../samples/wxtest/makefile.bcc
+       rm -f ../../utils/HelpGen/makefile.bcc
+       rm -f ../../utils/makefile.bcc
+       rm -f ../../utils/tex2rtf/src/makefile.bcc
        rm -f ../msw/makefile.bcc
        rm -f ../../contrib/build/animate/makefile.gcc
        rm -f ../../contrib/build/deprecated/makefile.gcc
@@ -1106,9 +1136,10 @@ clean:
        rm -f ../../samples/minifram/makefile.gcc
        rm -f ../../samples/minimal/makefile.gcc
        rm -f ../../samples/mobile/makefile.gcc
+       rm -f ../../samples/mobile/styles/makefile.gcc
+       rm -f ../../samples/mobile/wxedit/makefile.gcc
        rm -f ../../samples/multimon/makefile.gcc
        rm -f ../../samples/nativdlg/makefile.gcc
-       rm -f ../../samples/newgrid/makefile.gcc
        rm -f ../../samples/notebook/makefile.gcc
        rm -f ../../samples/oleauto/makefile.gcc
        rm -f ../../samples/opengl/cube/makefile.gcc
@@ -1142,6 +1173,9 @@ clean:
        rm -f ../../samples/widgets/makefile.gcc
        rm -f ../../samples/wizard/makefile.gcc
        rm -f ../../samples/wxtest/makefile.gcc
+       rm -f ../../utils/HelpGen/makefile.gcc
+       rm -f ../../utils/makefile.gcc
+       rm -f ../../utils/tex2rtf/src/makefile.gcc
        rm -f ../msw/makefile.gcc
        rm -f ../../contrib/build/animate/makefile.vc
        rm -f ../../contrib/build/deprecated/makefile.vc
@@ -1230,9 +1264,10 @@ clean:
        rm -f ../../samples/minifram/makefile.vc
        rm -f ../../samples/minimal/makefile.vc
        rm -f ../../samples/mobile/makefile.vc
+       rm -f ../../samples/mobile/styles/makefile.vc
+       rm -f ../../samples/mobile/wxedit/makefile.vc
        rm -f ../../samples/multimon/makefile.vc
        rm -f ../../samples/nativdlg/makefile.vc
-       rm -f ../../samples/newgrid/makefile.vc
        rm -f ../../samples/notebook/makefile.vc
        rm -f ../../samples/oleauto/makefile.vc
        rm -f ../../samples/opengl/cube/makefile.vc
@@ -1266,6 +1301,9 @@ clean:
        rm -f ../../samples/widgets/makefile.vc
        rm -f ../../samples/wizard/makefile.vc
        rm -f ../../samples/wxtest/makefile.vc
+       rm -f ../../utils/HelpGen/makefile.vc
+       rm -f ../../utils/makefile.vc
+       rm -f ../../utils/tex2rtf/src/makefile.vc
        rm -f ../msw/makefile.vc
        rm -f ../../contrib/build/animate/animate.dsw
        rm -f ../../contrib/build/deprecated/deprecated.dsw
@@ -1350,10 +1388,10 @@ clean:
        rm -f ../../samples/mfc/mfc.dsw
        rm -f ../../samples/minifram/minifram.dsw
        rm -f ../../samples/minimal/minimal.dsw
-       rm -f ../../samples/mobile/mobile.dsw
+       rm -f ../../samples/mobile/styles/styles.dsw
+       rm -f ../../samples/mobile/wxedit/wxedit.dsw
        rm -f ../../samples/multimon/multimon.dsw
        rm -f ../../samples/nativdlg/nativdlg.dsw
-       rm -f ../../samples/newgrid/newgrid.dsw
        rm -f ../../samples/notebook/notebook.dsw
        rm -f ../../samples/oleauto/oleauto.dsw
        rm -f ../../samples/opengl/cube/cube.dsw
@@ -1386,6 +1424,8 @@ clean:
        rm -f ../../samples/widgets/widgets.dsw
        rm -f ../../samples/wizard/wizard.dsw
        rm -f ../../samples/wxtest/wxtest.dsw
+       rm -f ../../utils/HelpGen/helpgen.dsw
+       rm -f ../../utils/tex2rtf/src/tex2rtf.dsw
        rm -f ../msw/wx.dsw
        rm -f ../../contrib/build/animate/makefile.wat
        rm -f ../../contrib/build/deprecated/makefile.wat
@@ -1474,9 +1514,10 @@ clean:
        rm -f ../../samples/minifram/makefile.wat
        rm -f ../../samples/minimal/makefile.wat
        rm -f ../../samples/mobile/makefile.wat
+       rm -f ../../samples/mobile/styles/makefile.wat
+       rm -f ../../samples/mobile/wxedit/makefile.wat
        rm -f ../../samples/multimon/makefile.wat
        rm -f ../../samples/nativdlg/makefile.wat
-       rm -f ../../samples/newgrid/makefile.wat
        rm -f ../../samples/notebook/makefile.wat
        rm -f ../../samples/oleauto/makefile.wat
        rm -f ../../samples/opengl/cube/makefile.wat
@@ -1510,6 +1551,9 @@ clean:
        rm -f ../../samples/widgets/makefile.wat
        rm -f ../../samples/wizard/makefile.wat
        rm -f ../../samples/wxtest/makefile.wat
+       rm -f ../../utils/HelpGen/makefile.wat
+       rm -f ../../utils/makefile.wat
+       rm -f ../../utils/tex2rtf/src/makefile.wat
        rm -f ../msw/makefile.wat
 
 
@@ -3231,23 +3275,60 @@ Makefile: regenMakefile.py
        touch $@
 
 
-../../samples/mobile/Makefile.in: $(SDEPS) ../../samples/mobile/mobile.bkl
-       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mobile/mobile.bkl
+../../samples/mobile/Makefile.in: $(SDEPS) ../../samples/mobile/mobile_samples.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mobile/mobile_samples.bkl
        touch $@
-../../samples/mobile/makefile.bcc: $(SDEPS) ../../samples/mobile/mobile.bkl
-       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/mobile.bkl
+../../samples/mobile/makefile.bcc: $(SDEPS) ../../samples/mobile/mobile_samples.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/mobile_samples.bkl
        touch $@
-../../samples/mobile/makefile.vc: $(SDEPS) ../../samples/mobile/mobile.bkl
-       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/mobile.bkl
+../../samples/mobile/makefile.vc: $(SDEPS) ../../samples/mobile/mobile_samples.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/mobile_samples.bkl
        touch $@
-../../samples/mobile/makefile.gcc: $(SDEPS) ../../samples/mobile/mobile.bkl
-       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/mobile.bkl
+../../samples/mobile/makefile.gcc: $(SDEPS) ../../samples/mobile/mobile_samples.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/mobile_samples.bkl
        touch $@
-../../samples/mobile/makefile.wat: $(SDEPS) ../../samples/mobile/mobile.bkl
-       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/mobile.bkl
+../../samples/mobile/makefile.wat: $(SDEPS) ../../samples/mobile/mobile_samples.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/mobile_samples.bkl
        touch $@
-../../samples/mobile/mobile.dsw: $(SDEPS) ../../samples/mobile/mobile.bkl
-       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/mobile/mobile.bkl
+
+
+../../samples/mobile/styles/Makefile.in: $(SDEPS) ../../samples/mobile/styles/styles.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mobile/styles/styles.bkl
+       touch $@
+../../samples/mobile/styles/makefile.bcc: $(SDEPS) ../../samples/mobile/styles/styles.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/styles/styles.bkl
+       touch $@
+../../samples/mobile/styles/makefile.vc: $(SDEPS) ../../samples/mobile/styles/styles.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/styles/styles.bkl
+       touch $@
+../../samples/mobile/styles/makefile.gcc: $(SDEPS) ../../samples/mobile/styles/styles.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/styles/styles.bkl
+       touch $@
+../../samples/mobile/styles/makefile.wat: $(SDEPS) ../../samples/mobile/styles/styles.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/styles/styles.bkl
+       touch $@
+../../samples/mobile/styles/styles.dsw: $(SDEPS) ../../samples/mobile/styles/styles.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../samples/mobile/styles/styles.bkl
+       touch $@
+
+
+../../samples/mobile/wxedit/Makefile.in: $(SDEPS) ../../samples/mobile/wxedit/wxedit.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/mobile/wxedit/wxedit.bkl
+       touch $@
+../../samples/mobile/wxedit/makefile.bcc: $(SDEPS) ../../samples/mobile/wxedit/wxedit.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/wxedit/wxedit.bkl
+       touch $@
+../../samples/mobile/wxedit/makefile.vc: $(SDEPS) ../../samples/mobile/wxedit/wxedit.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/wxedit/wxedit.bkl
+       touch $@
+../../samples/mobile/wxedit/makefile.gcc: $(SDEPS) ../../samples/mobile/wxedit/wxedit.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/wxedit/wxedit.bkl
+       touch $@
+../../samples/mobile/wxedit/makefile.wat: $(SDEPS) ../../samples/mobile/wxedit/wxedit.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/mobile/wxedit/wxedit.bkl
+       touch $@
+../../samples/mobile/wxedit/wxedit.dsw: $(SDEPS) ../../samples/mobile/wxedit/wxedit.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../samples/mobile/wxedit/wxedit.bkl
        touch $@
 
 
@@ -3291,26 +3372,6 @@ Makefile: regenMakefile.py
        touch $@
 
 
-../../samples/newgrid/Makefile.in: $(SDEPS) ../../samples/newgrid/newgrid.bkl
-       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/newgrid/newgrid.bkl
-       touch $@
-../../samples/newgrid/makefile.bcc: $(SDEPS) ../../samples/newgrid/newgrid.bkl
-       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../samples/newgrid/newgrid.bkl
-       touch $@
-../../samples/newgrid/makefile.vc: $(SDEPS) ../../samples/newgrid/newgrid.bkl
-       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../samples/newgrid/newgrid.bkl
-       touch $@
-../../samples/newgrid/makefile.gcc: $(SDEPS) ../../samples/newgrid/newgrid.bkl
-       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../samples/newgrid/newgrid.bkl
-       touch $@
-../../samples/newgrid/makefile.wat: $(SDEPS) ../../samples/newgrid/newgrid.bkl
-       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../samples/newgrid/newgrid.bkl
-       touch $@
-../../samples/newgrid/newgrid.dsw: $(SDEPS) ../../samples/newgrid/newgrid.bkl
-       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../samples/newgrid/newgrid.bkl
-       touch $@
-
-
 ../../samples/notebook/Makefile.in: $(SDEPS) ../../samples/notebook/notebook.bkl
        $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/notebook/notebook.bkl
        touch $@
@@ -3982,6 +4043,63 @@ Makefile: regenMakefile.py
        touch $@
 
 
+../../utils/HelpGen/Makefile.in: $(SDEPS) ../../utils/HelpGen/helpgen.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../utils/HelpGen/helpgen.bkl
+       touch $@
+../../utils/HelpGen/makefile.bcc: $(SDEPS) ../../utils/HelpGen/helpgen.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../utils/HelpGen/helpgen.bkl
+       touch $@
+../../utils/HelpGen/makefile.vc: $(SDEPS) ../../utils/HelpGen/helpgen.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../utils/HelpGen/helpgen.bkl
+       touch $@
+../../utils/HelpGen/makefile.gcc: $(SDEPS) ../../utils/HelpGen/helpgen.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../utils/HelpGen/helpgen.bkl
+       touch $@
+../../utils/HelpGen/makefile.wat: $(SDEPS) ../../utils/HelpGen/helpgen.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../ -DOPTIONS_FILE=../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../utils/HelpGen/helpgen.bkl
+       touch $@
+../../utils/HelpGen/helpgen.dsw: $(SDEPS) ../../utils/HelpGen/helpgen.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../ $(DSWFLAGS)  ../../utils/HelpGen/helpgen.bkl
+       touch $@
+
+
+../../utils/tex2rtf/src/Makefile.in: $(SDEPS) ../../utils/tex2rtf/src/tex2rtf.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../utils/tex2rtf/src/tex2rtf.bkl
+       touch $@
+../../utils/tex2rtf/src/makefile.bcc: $(SDEPS) ../../utils/tex2rtf/src/tex2rtf.bkl
+       $(BAKEFILE) -fborland -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0  ../../utils/tex2rtf/src/tex2rtf.bkl
+       touch $@
+../../utils/tex2rtf/src/makefile.vc: $(SDEPS) ../../utils/tex2rtf/src/tex2rtf.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.vc -DWRITE_OPTIONS_FILE=0  ../../utils/tex2rtf/src/tex2rtf.bkl
+       touch $@
+../../utils/tex2rtf/src/makefile.gcc: $(SDEPS) ../../utils/tex2rtf/src/tex2rtf.bkl
+       $(BAKEFILE) -fmingw -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0  ../../utils/tex2rtf/src/tex2rtf.bkl
+       touch $@
+../../utils/tex2rtf/src/makefile.wat: $(SDEPS) ../../utils/tex2rtf/src/tex2rtf.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DWXTOPDIR=../../../ -DOPTIONS_FILE=../../../build/msw/config.wat -DWRITE_OPTIONS_FILE=0  ../../utils/tex2rtf/src/tex2rtf.bkl
+       touch $@
+../../utils/tex2rtf/src/tex2rtf.dsw: $(SDEPS) ../../utils/tex2rtf/src/tex2rtf.bkl
+       $(BAKEFILE) -fmsvc6prj -o$@  -DWXTOPDIR=../../../ $(DSWFLAGS)  ../../utils/tex2rtf/src/tex2rtf.bkl
+       touch $@
+
+
+../../utils/Makefile.in: ../../utils/utils.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../utils/utils.bkl
+       touch $@
+../../utils/makefile.bcc: ../../utils/utils.bkl
+       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0 ../../utils/utils.bkl
+       touch $@
+../../utils/makefile.vc: ../../utils/utils.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../build/msw/config.vc -DWRITE_OPTIONS_FILE=0 ../../utils/utils.bkl
+       touch $@
+../../utils/makefile.gcc: ../../utils/utils.bkl
+       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0 ../../utils/utils.bkl
+       touch $@
+../../utils/makefile.wat: ../../utils/utils.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../build/msw/config.wat -DWRITE_OPTIONS_FILE=0 ../../utils/utils.bkl
+       touch $@
+
+
 ../../Makefile.in: $(MDEPS) wx.bkl
        $(BAKEFILE) -fautoconf -o$@  wx.bkl
        touch $@