[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  5beaef7... s4:autogen-waf: generate 'Makefile' instead of 'makefile'
       via  61d3ba0... s4:configure: generate Makefile from Makefile.in
      from  8966a28... s4:heimdal_build/wscript_build: remove more network related stuff from HEIMDAL_ROKEN_H

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


- Log -----------------------------------------------------------------
commit 5beaef7cde3c311e4543abf71e5fe9794d62cc6e
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Apr 10 10:58:27 2010 +0200

    s4:autogen-waf: generate 'Makefile' instead of 'makefile'
    
    This hopefully fixes the build on MacOS 10.
    
    metze

commit 61d3ba04b497011b933564cc4566239a91e4bf67
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Apr 10 10:49:18 2010 +0200

    s4:configure: generate Makefile from Makefile.in
    
    This makes it possible for the waf build to also generate a 'Makefile'
    instead of 'makefile'. On some platforms 'Makefile' is used before 'makefile'
    
    metze

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

Summary of changes:
 .gitignore                        |    2 +-
 buildtools/scripts/Makefile.waf   |    7 +++++++
 source4/{Makefile => Makefile.in} |    4 ++++
 source4/autogen-waf.sh            |    9 ++++-----
 source4/autogen.sh                |    4 +---
 source4/configure.ac              |    2 +-
 6 files changed, 18 insertions(+), 10 deletions(-)
 rename source4/{Makefile => Makefile.in} (98%)


Changeset truncated at 500 lines:

diff --git a/.gitignore b/.gitignore
index 8931c6a..b109993 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,7 @@ config.h.in
 config.log
 config.status
 configure
-makefile
+Makefile
 *.d
 *_err.c
 *_err.h
diff --git a/buildtools/scripts/Makefile.waf b/buildtools/scripts/Makefile.waf
index 78cd0e1..a1c4b69 100644
--- a/buildtools/scripts/Makefile.waf
+++ b/buildtools/scripts/Makefile.waf
@@ -49,3 +49,10 @@ etags:
 ctags:
 	$(WAF) ctags
 
+configure: autogen-waf.sh BUILDTOOLS/scripts/configure.waf
+	@echo "please run ./autogen-waf.sh to regenerate $@"
+	@-false
+
+Makefile: autogen-waf.sh configure BUILDTOOLS/scripts/Makefile.waf
+	@echo "please run ./autogen-waf.sh to regenerate $@"
+	@false
diff --git a/source4/Makefile b/source4/Makefile.in
similarity index 98%
rename from source4/Makefile
rename to source4/Makefile.in
index dd9376b..3d9b1f2 100644
--- a/source4/Makefile
+++ b/source4/Makefile.in
@@ -308,3 +308,7 @@ include $(srcdir)/selftest/config.mk
 
 showflags::
 	@echo '  pwd        = '`/bin/pwd`
+
+Makefile: Makefile.in
+	@echo "Makefile.in is newer than Makefile, please rerun ./config.status"
+	@false
diff --git a/source4/autogen-waf.sh b/source4/autogen-waf.sh
index a3aa979..7a6e94c 100755
--- a/source4/autogen-waf.sh
+++ b/source4/autogen-waf.sh
@@ -12,14 +12,13 @@ while test \! -d "$p/$d"; do d="../$d"; done
 echo "Found buildtools in $p/$d"
 
 echo "Setting up configure"
-rm -f $p/configure
+rm -f $p/configure $p/include/config*.h*
 sed "s|BUILDTOOLS|$d|g;s|BUILDPATH|$p|g" < "$p/$d/scripts/configure.waf" > $p/configure
 chmod +x $p/configure
 
-echo "Setting up makefile"
-# this relies on the fact that make looks for 'makefile' before 'Makefile'
-rm -f $p/makefile
-sed "s|BUILDTOOLS|$d|g" < "$p/$d/scripts/Makefile.waf" > $p/makefile
+echo "Setting up Makefile"
+rm -f $p/makefile $p/Makefile
+sed "s|BUILDTOOLS|$d|g" < "$p/$d/scripts/Makefile.waf" > $p/Makefile
 
 echo "done. Now run $p/configure or $p/configure.developer then make."
 if [ $p != "." ]; then
diff --git a/source4/autogen.sh b/source4/autogen.sh
index 86fb1ac..22e35e0 100755
--- a/source4/autogen.sh
+++ b/source4/autogen.sh
@@ -69,6 +69,7 @@ echo "$0: running script/mkversion.sh"
 
 rm -rf autom4te*.cache
 rm -f configure include/config_tmp.h*
+rm -f makefile Makefile
 
 IPATHS="-I. -I../lib/replace"
 
@@ -80,8 +81,5 @@ $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
diff --git a/source4/configure.ac b/source4/configure.ac
index c6bdc54..e5bcc02 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -200,7 +200,7 @@ $SMB_INFO_LIBRARIES
 CEOF
 
 SMB_BUILD_RUN(data.mk)
-AC_OUTPUT
+AC_OUTPUT(Makefile)
 
 cmp include/config_tmp.h include/config.h >/dev/null 2>&1
 CMP_RET=$?


-- 
Samba Shared Repository