aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-10-08 08:44:09 +0000
committerRoland McGrath <roland@gnu.org>2002-10-08 08:44:09 +0000
commit1400de2e9c706bc2ff357be7f84910723b84fb33 (patch)
tree4a0397e3eae619384abbcfd778d780fdefd90f74 /Makefile
parent44f8b0fd29027efd23d3267ffa664bc612bdb473 (diff)
downloadglibc-1400de2e9c706bc2ff357be7f84910723b84fb33.tar
glibc-1400de2e9c706bc2ff357be7f84910723b84fb33.tar.gz
glibc-1400de2e9c706bc2ff357be7f84910723b84fb33.tar.bz2
glibc-1400de2e9c706bc2ff357be7f84910723b84fb33.zip
2002-10-08 Roland McGrath <roland@redhat.com>
* configure.in (AUTOCONF): New check to set it. Set to "no" if the one found doesn't work on our configure.in. * configure: Regenerated. * config.make.in (AUTOCONF): New substituted variable. * Makefile (autoconf-it-cvs): New canned sequence, broken out of ... (autoconf-it): ... here, use that instead of defining conditionally. Use $(AUTOCONF) instead of literal autoconf. [$(AUTOCONF) != no] (configure, %/configure): Protect these rules with this condition. * Make-dist (autoconf-it, configure, %/configure): Copy those changes.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile24
1 files changed, 14 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 2e2a8af06c..36ba5d60fe 100644
--- a/Makefile
+++ b/Makefile
@@ -30,29 +30,33 @@ include Makeconfig
.PHONY: all
all: lib others
+ifneq ($(AUTOCONF),no)
+
ifeq ($(with-cvs),yes)
-define autoconf-it
-@-rm -f $@.new
-autoconf $(ACFLAGS) $< > $@.new
-chmod a-w,a+x $@.new
-mv -f $@.new $@
+define autoconf-it-cvs
test ! -d CVS || cvs $(CVSOPTS) commit -m'Regenerated: autoconf $(ACFLAGS) $<' $@
endef
else
+autoconf-it-cvs =
+endif
+
define autoconf-it
@-rm -f $@.new
-autoconf $(ACFLAGS) $< > $@.new
+$(AUTOCONF) $(ACFLAGS) $< > $@.new
chmod a-w,a+x $@.new
mv -f $@.new $@
+$(autoconf-it-cvs)
endef
-endif
-
-# We don't want to run anything here in parallel.
-.NOTPARALLEL:
configure: configure.in aclocal.m4; $(autoconf-it)
%/configure: %/configure.in aclocal.m4; $(autoconf-it)
+endif # $(AUTOCONF) = no
+
+
+# We don't want to run anything here in parallel.
+.NOTPARALLEL:
+
# These are the targets that are made by making them in each subdirectory.
+subdir_targets := subdir_lib objects objs others subdir_mostlyclean \
subdir_clean subdir_distclean subdir_realclean \