different location for contrib bakefiles

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/bakefiles/Makefile b/build/bakefiles/Makefile
index d3d76bf0e3e80f5e35aeedbb3b0490d32e50affe..46718ee49025dd739fd328e8ff891268540f94e7 100644 (file)
--- a/build/bakefiles/Makefile
+++ b/build/bakefiles/Makefile
@@ -5,7 +5,7 @@ BAKEFILE = bakefile
 BAKEARGS = -v
 
 
-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 ../../contrib/src/xrc/build/../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 ../../contrib/src/xrc/Makefile.in
 all: autoconf
 
 autoconf: $(AUTOCONF_ALL)
@@ -87,7 +87,7 @@ clean:
        rm -f ../../samples/scrollsub/Makefile.in
        rm -f ../../samples/memcheck/Makefile.in
        rm -f ../../samples/internat/Makefile.in
-       rm -f ../../contrib/src/xrc/build/../Makefile.in
+       rm -f ../../contrib/src/xrc/Makefile.in
 
 
 ../../autoconf_inc.m4: ../../Makefile.in
@@ -473,7 +473,7 @@ Makefile: regenMakefile.py
        $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/internat/Makefile.in -DWXTOPDIR=/../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/internat/internat.bkl
        touch ../../samples/internat/Makefile.in
 
-# from ../../contrib/src/xrc/build/xrc.bkl
-../../contrib/src/xrc/build/../Makefile.in: common.bkl common_samples.bkl config.bkl ../../contrib/src/xrc/build/xrc.bkl
-       $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../contrib/src/xrc/build/../Makefile.in -DWXTOPDIR=/../../../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/src/xrc/build/xrc.bkl
-       touch ../../contrib/src/xrc/build/../Makefile.in
+# from ../../contrib/build/xrc/xrc.bkl
+../../contrib/src/xrc/Makefile.in: common.bkl common_samples.bkl config.bkl ../../contrib/build/xrc/xrc.bkl
+       $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../contrib/src/xrc/Makefile.in -DWXTOPDIR=/../../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/xrc/xrc.bkl
+       touch ../../contrib/src/xrc/Makefile.in

diff --git a/build/bakefiles/regenMakefile.py b/build/bakefiles/regenMakefile.py
index 87e04884eb9e969376c1a59d1c1cb9d1455a87e1..6a7dff128ba72b630288b33f6bd7d9434bb47b33 100755 (executable)
--- a/build/bakefiles/regenMakefile.py
+++ b/build/bakefiles/regenMakefile.py
@@ -66,7 +66,9 @@ addMakefile('wx.bkl', {'all':'..','autoconf':'../..'},
 addMakefile('../../samples/samples.bkl', {'all':'../../samples'})
 
 
-def onSubmakefile(acdir, 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
@@ -79,13 +81,17 @@ def onSubmakefile(acdir, dirname, names):
     }
     
     for bake in bakes:
+        if type==CONTRIB_DIR:
+            acdir = '../../contrib/src/%s' % dirname.split('/')[-1]
+        else:
+            acdir = dirname
         addMakefile('%s/%s' % (dirname, bake),
-                    {'all':dirname,'autoconf':dirname+acdir},
+                    {'all':dirname,'autoconf':acdir},
                     deps=['common.bkl','common_samples.bkl','config.bkl'],
                     args=args)
 
-os.path.walk('../../samples', onSubmakefile, '')
-os.path.walk('../../contrib/src', onSubmakefile, '/..')
+os.path.walk('../../samples', onSubmakefile, None)
+os.path.walk('../../contrib/build', onSubmakefile, CONTRIB_DIR)
 
 
 cleanCmds = ''