Removed wxGetOsVersion stub. It's now handled by utilscmn.cpp.

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

diff --git a/build/bakefiles/regenMakefile.py b/build/bakefiles/regenMakefile.py
index f21e95717d5347f19e27975e8933031230b1c835..89a9985f71a21960aef8993e2684be2425e89fa1 100755 (executable)
--- a/build/bakefiles/regenMakefile.py
+++ b/build/bakefiles/regenMakefile.py
@@ -50,6 +50,7 @@ def addMakefile(bake, makedirs, deps=[], args={}):
     dep = string.join(deps + [bake], ' ')
 
     add(bake, makedirs, 'Makefile.in', dep, 'autoconf', args)
+    add(bake, makedirs, 'makefile.bcc', dep, 'borland', args)
 
 
 
@@ -60,13 +61,15 @@ def addMakefile(bake, makedirs, deps=[], args={}):
 # main makefile:
 addMakefile('wx.bkl', {'all':'..','autoconf':'../..'},
             ['common.bkl', 'config.bkl', 'files.bkl', 'monolithic.bkl',
-             'wxwin.py'])
+             'multilib.bkl', 'wxwin.py'])
 
 # samples main makefile:
 addMakefile('../../samples/samples.bkl', {'all':'../../samples'})
 
 
-def onSample(arg, dirname, names):
+CONTRIB_DIR = 1
+
+def onSubmakefile(type, dirname, names):
     bakes = [x for x in names if x.endswith('.bkl')]
     if len(bakes) == 0: return
     depth = dirname.count('/') - 2
@@ -74,16 +77,24 @@ def onSample(arg, dirname, names):
     prefix = ''.join(['../' for i in range(0,depth)])
 
     args = {
-        'all':'-DWXTOPDIR=/%s..' % prefix,
+        'all':'-DWXTOPDIR=%s../' % prefix,
         'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4',
     }
     
     for bake in bakes:
-        addMakefile('%s/%s' % (dirname, bake), {'all':dirname},
-                    deps=['common.bkl','common_samples.bkl','config.bkl'],
+        if type==CONTRIB_DIR:
+            acdir = '../../contrib/src/%s' % dirname.split('/')[-1]
+            ruledep = 'common_contrib.bkl'
+        else:
+            acdir = dirname
+            ruledep = 'common_samples.bkl'
+        addMakefile('%s/%s' % (dirname, bake),
+                    {'all':dirname,'autoconf':acdir},
+                    deps=['common.bkl',ruledep,'config.bkl'],
                     args=args)
 
-os.path.walk('../../samples', onSample, None)
+os.path.walk('../../samples', onSubmakefile, None)
+os.path.walk('../../contrib/build', onSubmakefile, CONTRIB_DIR)
 
 
 cleanCmds = ''