diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | source4/Makefile.in (renamed from source4/Makefile) | 4 | ||||
| -rwxr-xr-x | source4/autogen.sh | 4 | ||||
| -rw-r--r-- | source4/configure.ac | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index 8931c6a4c8..b10999393d 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/source4/Makefile b/source4/Makefile.in index dd9376b476..3d9b1f2add 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.sh b/source4/autogen.sh index 86fb1ac7ab..22e35e0316 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 c6bdc54fe3..e5bcc0254b 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=$? |