sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s4:configure: generate Makefile from Makefile.in

Browse Source 
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
This commit is contained in:
Stefan Metzmacher 2010-04-10 10:49:18 +02:00
parent 8966a28b68
commit 61d3ba04b4
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -14,7 +14,7 @@ config.h.in
config.log config.log
config.status config.status
configure configure
makefile Makefile
*.d *.d
*_err.c *_err.c
*_err.h *_err.h

4
source4/Makefile → source4/Makefile.in
View File

@ -308,3 +308,7 @@ include $(srcdir)/selftest/config.mk
showflags:: showflags::
@echo ' pwd = '`/bin/pwd` @echo ' pwd = '`/bin/pwd`
Makefile: Makefile.in
@echo "Makefile.in is newer than Makefile, please rerun ./config.status"
@false

4
source4/autogen.sh
View File

@ -69,6 +69,7 @@ echo "$0: running script/mkversion.sh"
rm -rf autom4te*.cache rm -rf autom4te*.cache
rm -f configure include/config_tmp.h* rm -f configure include/config_tmp.h*
rm -f makefile Makefile
IPATHS="-I. -I../lib/replace" IPATHS="-I. -I../lib/replace"
@ -80,8 +81,5 @@ $AUTOCONF $IPATHS || exit 1
rm -rf autom4te*.cache 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." echo "Now run ./configure (or ./configure.developer) and then make."
exit 0 exit 0

2
source4/configure.ac
View File

@ -200,7 +200,7 @@ $SMB_INFO_LIBRARIES
CEOF CEOF
SMB_BUILD_RUN(data.mk) SMB_BUILD_RUN(data.mk)
AC_OUTPUT AC_OUTPUT(Makefile)
cmp include/config_tmp.h include/config.h >/dev/null 2>&1 cmp include/config_tmp.h include/config.h >/dev/null 2>&1
CMP_RET=$? CMP_RET=$?