wx-lib must work on loadable modules, too

[wxWidgets.git] / build / bakefiles / regenMakefile.py

diff --git a/build/bakefiles/regenMakefile.py b/build/bakefiles/regenMakefile.py
index 93af8c706aa9361c3d7ae55739401a8990c576ef..39f1adc85d6dad061800825f56a1ba2550c0faed 100755 (executable)
--- a/build/bakefiles/regenMakefile.py
+++ b/build/bakefiles/regenMakefile.py
@@ -21,8 +21,11 @@ SDEPS = config.bkl common.bkl common_samples.bkl
 MDEPS = common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl opengl.bkl wxwin.py
 
 DSWFLAGS = -DRUNTIME_LIBS=dynamic -DOFFICIAL_BUILD=0 -DUSE_HTML=1 \\
-           -DUSE_OPENGL=1 -DMONOLITHIC=0 -DUSE_GUI=1 \\
+           -DUSE_OPENGL=1 -DUSE_ODBC=1 -DMONOLITHIC=0 -DUSE_GUI=1 \\
            -DDEBUG_INFO=default -DDEBUG_FLAG=default
+
+COMPAT_TARGETS = ../../src/wxWindows.dsp
+
 """)
 
 lines = {}
@@ -145,6 +148,8 @@ def onSubmakefile(type, dirname, names):
 
 os.path.walk(os.path.join('..','..','samples'),
              onSubmakefile, SAMPLES_DIR)
+os.path.walk(os.path.join('..','..','demos'),
+             onSubmakefile, SAMPLES_DIR)
 os.path.walk(os.path.join('..','..','contrib','build'),
              onSubmakefile, CONTRIB_DIR)
 os.path.walk(os.path.join('..','..','contrib','samples'),
@@ -170,7 +175,7 @@ for f in allK:
     var = '%s_ALL' % f.upper()
     file.write('%s = \\\n\t%s\n' % (var,' \\\n\t'.join(all[f])))
 
-file.write('all:')
+file.write('\nall: $(COMPAT_TARGETS)')
 for f in allK:
     file.write(' %s' % f)
 file.write('\n\n')
@@ -180,12 +185,17 @@ for f in allK:
 file.write("""
 clean:
 \trm -f ../../autoconf_inc.m4
+\trm -f $(COMPAT_TARGETS)
 %s
 
 library: ../../Makefile.in ../makefile.bcc ../makefile.vc ../makefile.wat ../makefile.gcc
 
 ../../autoconf_inc.m4: ../../Makefile.in
 
+../../src/wxWindows.dsp: monolithic.bkl files.bkl
+\t$(BAKEFILE) -Icompat -fwx24dsp -DUSE_GUI=1 -DWXUNIV=0 -o$@ wx.bkl
+\ttouch $@
+
 Makefile: regenMakefile.py
 \t./regenMakefile.py
 \t@echo