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 6a7dff128ba72b630288b33f6bd7d9434bb47b33..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)
     dep = string.join(deps + [bake], ' ')
 
     add(bake, makedirs, 'Makefile.in', dep, 'autoconf', args)

+    add(bake, makedirs, 'makefile.bcc', dep, 'borland', args)

 
 
 
 
 
 


@@ -60,7 +61,7 @@ def addMakefile(bake, makedirs, deps=[], args={}):
 # main makefile:
 addMakefile('wx.bkl', {'all':'..','autoconf':'../..'},
             ['common.bkl', 'config.bkl', 'files.bkl', 'monolithic.bkl',
 # 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'})
 
 # samples main makefile:
 addMakefile('../../samples/samples.bkl', {'all':'../../samples'})


@@ -76,18 +77,20 @@ def onSubmakefile(type, dirname, names):
     prefix = ''.join(['../' for i in range(0,depth)])
 
     args = {
     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:
         if type==CONTRIB_DIR:
             acdir = '../../contrib/src/%s' % dirname.split('/')[-1]
         'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4',
     }
     
     for bake in bakes:
         if type==CONTRIB_DIR:
             acdir = '../../contrib/src/%s' % dirname.split('/')[-1]

+            ruledep = 'common_contrib.bkl'

         else:
             acdir = dirname
         else:
             acdir = dirname

+            ruledep = 'common_samples.bkl'

         addMakefile('%s/%s' % (dirname, bake),
                     {'all':dirname,'autoconf':acdir},
         addMakefile('%s/%s' % (dirname, bake),
                     {'all':dirname,'autoconf':acdir},

-                    deps=['common.bkl','common_samples.bkl','config.bkl'],
+                    deps=['common.bkl',ruledep,'config.bkl'],

                     args=args)
 
 os.path.walk('../../samples', onSubmakefile, None)
                     args=args)
 
 os.path.walk('../../samples', onSubmakefile, None)