[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  badc255... s4-build: remove any 'makefile' that may have been left by the waf build
      from  07d9da4... build: use a target_in_list() function for more flexible builtin control

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit badc255748aa71f98c99c4c47343011286c8445d
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Apr 6 20:48:15 2010 +1000

    s4-build: remove any 'makefile' that may have been left by the waf build
    
    this allows ./autogen.sh to be used to switch back to the old build
    system after trying the waf build

-----------------------------------------------------------------------

Summary of changes:
 source4/autogen.sh |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/autogen.sh b/source4/autogen.sh
index 1936af4..86fb1ac 100755
--- a/source4/autogen.sh
+++ b/source4/autogen.sh
@@ -80,5 +80,8 @@ $AUTOCONF $IPATHS || exit 1
 
 rm -rf autom4te*.cache
 
+# remove a 'makefile' that may have been left by the waf build
+rm -f makefile
+
 echo "Now run ./configure (or ./configure.developer) and then make."
 exit 0


-- 
Samba Shared Repository