don't run autoconf automatically, it's problematic on Windows

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

diff --git a/build/bakefiles/Makefile b/build/bakefiles/Makefile
index 00bf8bd52d20dec001e833453781bed5b3dec2c6..f2befb9174f9cc52ee1716d69e1a03838a0e0177 100644 (file)
--- a/build/bakefiles/Makefile
+++ b/build/bakefiles/Makefile
@@ -9,7 +9,6 @@ SDEPS = config.bkl common.bkl common_samples.bkl
 MDEPS = common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl opengl.bkl wxwin.py
 AUTOCONF_ALL = \
        ../../Makefile.in \
 MDEPS = common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl opengl.bkl wxwin.py
 AUTOCONF_ALL = \
        ../../Makefile.in \

-       ../../configure \

        ../../contrib/samples/animate/Makefile.in \
        ../../contrib/samples/svg/Makefile.in \
        ../../contrib/samples/xrc/Makefile.in \
        ../../contrib/samples/animate/Makefile.in \
        ../../contrib/samples/svg/Makefile.in \
        ../../contrib/samples/xrc/Makefile.in \


@@ -499,7 +498,6 @@ watcom: $(WATCOM_ALL)
 clean:
        rm -f ../../autoconf_inc.m4
        rm -f ../../Makefile.in
 clean:
        rm -f ../../autoconf_inc.m4
        rm -f ../../Makefile.in

-       rm -f ../../configure

        rm -f ../../contrib/samples/animate/Makefile.in
        rm -f ../../contrib/samples/svg/Makefile.in
        rm -f ../../contrib/samples/xrc/Makefile.in
        rm -f ../../contrib/samples/animate/Makefile.in
        rm -f ../../contrib/samples/svg/Makefile.in
        rm -f ../../contrib/samples/xrc/Makefile.in


@@ -979,8 +977,6 @@ clean:
 library: ../../Makefile.in ../makefile.bcc ../makefile.vc ../makefile.wat ../makefile.gcc
 
 ../../autoconf_inc.m4: ../../Makefile.in
 library: ../../Makefile.in ../makefile.bcc ../makefile.vc ../makefile.wat ../makefile.gcc
 
 ../../autoconf_inc.m4: ../../Makefile.in

-../../configure: ../../autoconf_inc.m4
-       (cd ../.. ; aclocal && autoconf)

 
 Makefile: regenMakefile.py
        ./regenMakefile.py
 
 Makefile: regenMakefile.py
        ./regenMakefile.py

diff --git a/build/bakefiles/regenMakefile.py b/build/bakefiles/regenMakefile.py
index 2f63fe387e499728fec3b5c34d52520b1baab5b0..94e85d11f96f047a5a5fa1bebf4e832bbe83404f 100755 (executable)
--- a/build/bakefiles/regenMakefile.py
+++ b/build/bakefiles/regenMakefile.py
@@ -23,7 +23,7 @@ MDEPS = common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl opengl.bkl w
 
 lines = {}
 all = {}
 
 lines = {}
 all = {}

-all['autoconf'] = ['../../configure']
+all['autoconf'] = []

 
 linesCur = None
 
 
 linesCur = None
 


@@ -171,8 +171,6 @@ clean:
 library: ../../Makefile.in ../makefile.bcc ../makefile.vc ../makefile.wat ../makefile.gcc
 
 ../../autoconf_inc.m4: ../../Makefile.in
 library: ../../Makefile.in ../makefile.bcc ../makefile.vc ../makefile.wat ../makefile.gcc
 
 ../../autoconf_inc.m4: ../../Makefile.in

-../../configure: ../../autoconf_inc.m4
-\t(cd ../.. ; aclocal && autoconf)

 
 Makefile: regenMakefile.py
 \t./regenMakefile.py
 
 Makefile: regenMakefile.py
 \t./regenMakefile.py