don't create samples/autoconf_inc.m4

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

diff --git a/build/bakefiles/Makefile b/build/bakefiles/Makefile
index 4fe3a222fb5791911c7542f1a6a32580c1afcbfc..72ad2d8afc11f211d1a11a45f308fe7cc2794d08 100644 (file)
--- a/build/bakefiles/Makefile
+++ b/build/bakefiles/Makefile
@@ -192,7 +192,7 @@ Makefile: regenMakefile.py
 
 # from ../../samples/samples.bkl
 ../../samples/Makefile.in: ../../samples/samples.bkl
 
 # from ../../samples/samples.bkl
 ../../samples/Makefile.in: ../../samples/samples.bkl

-       $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/Makefile.in ../../samples/samples.bkl
+       $(BAKEFILE) $(BAKEARGS) -fautoconf -o../../samples/Makefile.in -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../samples/samples.bkl

        touch ../../samples/Makefile.in
 ../../samples/makefile.bcc: ../../samples/samples.bkl
        $(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/makefile.bcc ../../samples/samples.bkl
        touch ../../samples/Makefile.in
 ../../samples/makefile.bcc: ../../samples/samples.bkl
        $(BAKEFILE) $(BAKEARGS) -fborland -o../../samples/makefile.bcc ../../samples/samples.bkl

diff --git a/build/bakefiles/regenMakefile.py b/build/bakefiles/regenMakefile.py
index 89a9985f71a21960aef8993e2684be2425e89fa1..5434dbbfedd8c7a3ea2abb760d24896af49b822f 100755 (executable)
--- a/build/bakefiles/regenMakefile.py
+++ b/build/bakefiles/regenMakefile.py
@@ -64,7 +64,8 @@ addMakefile('wx.bkl', {'all':'..','autoconf':'../..'},
              'multilib.bkl', 'wxwin.py'])
 
 # samples main makefile:
              'multilib.bkl', 'wxwin.py'])
 
 # samples main makefile:

-addMakefile('../../samples/samples.bkl', {'all':'../../samples'})
+addMakefile('../../samples/samples.bkl', {'all':'../../samples'},
+            args={'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4'})

 
 
 CONTRIB_DIR = 1
 
 
 CONTRIB_DIR = 1