summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-09-24 01:12:43 +0000
committerAndrew Tridgell <tridge@samba.org>1998-09-24 01:12:43 +0000
commite59d7a7f801b2946acd173b62f99fe939649fc9f (patch)
tree8c2a79e72d1f0c3c67b6e8ecb2aaa3f076aa9c5d
parent500a474aae49bd1cc8e75481a3b3cd6e79720d89 (diff)
downloadsamba-e59d7a7f801b2946acd173b62f99fe939649fc9f.tar.gz
samba-e59d7a7f801b2946acd173b62f99fe939649fc9f.tar.bz2
samba-e59d7a7f801b2946acd173b62f99fe939649fc9f.zip
some changes to the autoconf support
- added config.cache to "make clean". We get two many bug reports from people builing on multiple architectures who don't remove config.cache between compiles. Hopefully a future version of autoconf will do this automatically - removed the targets that run autoconf and autoheader. There is far too great a risk of a enduser getting a error "autoheader not found" if the date on a file is changed. Samba developers will have to run autoconf and autoheader manually (as before) (This used to be commit 811fe3b174b9d7c57966491ab867637b82fff607)
-rw-r--r--source3/Makefile.in12
1 files changed, 5 insertions, 7 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 30766881f8..ac51d34b23 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -19,8 +19,6 @@ INSTALLCMD=@INSTALL@
VPATH=@srcdir@
srcdir=@srcdir@
SHELL=/bin/sh
-AUTOCONF=autoconf
-AUTOHEADER=autoheader
.SUFFIXES:
.SUFFIXES: .c .o
@@ -303,7 +301,7 @@ uninstallcp:
@$(SHELL) $(srcdir)/script/uninstallcp.sh $(CODEPAGEDIR) $(CODEPAGELIST)
clean:
- -rm -f core */*~ *~ */*.o
+ -rm -f core */*~ *~ */*.o config.cache
proto:
@echo rebuilding include/proto.h
@@ -330,11 +328,9 @@ finddead:
nm */*.o |grep 'T ' | awk '{print $$3}' | sort -u > nmfns.txt
comm -13 nmused.txt nmfns.txt
-# when configure.in is updated, reconfigure
-$(srcdir)/configure: $(srcdir)/configure.in
- cd $(srcdir) && $(AUTOCONF)
config.status: $(srcdir)/configure
$(SHELL) ./config.status --recheck
+
Makefile: $(srcdir)/Makefile.in config.status
CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -342,11 +338,13 @@ Makefile: $(srcdir)/Makefile.in config.status
# only when explicitly requested
include/config.h: include/stamp-h
@:
+
include/stamp-h: $(srcdir)/include/config.h.in config.status
CONFIG_FILES= CONFIG_HEADERS=include/config.h $(SHELL) ./config.status
@ls -l config.status $(srcdir)/include/config.h.in > include/stamp-h
+
$(srcdir)/include/config.h.in: $(srcdir)/include/stamp-h.in
@:
+
$(srcdir)/include/stamp-h.in: $(srcdir)/acconfig.h $(srcdir)/configure.in
- cd $(srcdir) && $(AUTOHEADER)
@cd $(srcdir) && ls -l acconfig.h configure.in > include/stamp-h.in