summaryrefslogtreecommitdiff
path: root/texinfo
diff options
context:
space:
mode:
authorwilson <wilson@138bc75d-0d04-0410-961f-82ee72b054a4>1997-09-10 18:54:55 +0000
committerwilson <wilson@138bc75d-0d04-0410-961f-82ee72b054a4>1997-09-10 18:54:55 +0000
commitf0f17aea1b7cb795761dd8974cef3de57ff9f5eb (patch)
treeafc711cfd3ed92f786da2f50c3ac7ce4812bc3a8 /texinfo
parentfac49e1bfa449024c91ad837517918d5ea49aa43 (diff)
downloadgcc-f0f17aea1b7cb795761dd8974cef3de57ff9f5eb.tar.gz
Patch to fix parallel makes from H.J. Lu.
* Makefile (all): Remove sub-all. (stmp-sub-all): New target. Renamed from sub-all. (info, texinfo): Also depend on stmp-sub-all. (clean): Also remove stmp*. (maintainer-clean): New target. Same as realclean. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@15263 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'texinfo')
-rw-r--r--texinfo/ChangeLog8
-rw-r--r--texinfo/Makefile.in20
2 files changed, 22 insertions, 6 deletions
diff --git a/texinfo/ChangeLog b/texinfo/ChangeLog
index ffe778a1c6a..cb7b421cd06 100644
--- a/texinfo/ChangeLog
+++ b/texinfo/ChangeLog
@@ -1,3 +1,11 @@
+Tue Sep 9 23:16:35 1997 H.J. Lu (hjl@gnu.ai.mit.edu)
+
+ * Makefile (all): Remove sub-all.
+ (stmp-sub-all): New target. Renamed from sub-all.
+ (info, texinfo): Also depend on stmp-sub-all.
+ (clean): Also remove stmp*.
+ (maintainer-clean): New target. Same as realclean.
+
Fri Sep 5 09:07:33 1997 Jeffrey A Law (law@cygnus.com)
* install-sh: Delete duplicate install script.
diff --git a/texinfo/Makefile.in b/texinfo/Makefile.in
index 0539b9b71de..2c76a752e1a 100644
--- a/texinfo/Makefile.in
+++ b/texinfo/Makefile.in
@@ -1,5 +1,5 @@
# Makefile for Texinfo distribution.
-# $Id: Makefile.in,v 1.1.1.1 1997/08/21 22:57:51 jason Exp $
+# $Id: Makefile.in,v 1.2 1997/09/03 04:25:21 law Exp $
#
# Copyright (C) 1993, 96 Free Software Foundation, Inc.
@@ -80,7 +80,7 @@ MDEFINES = bindir='$(bindir)' mandir='$(mandir)' manext='$(manext)' \
INSTALL='$(INSTALL)' INSTALL_DATA='$(INSTALL_DATA)' \
INSTALL_PROGRAM='$(INSTALL_PROGRAM)'
-all: sub-all texinfo
+all: texinfo
check:
installcheck:
@@ -98,18 +98,26 @@ config.status: configure
#configure: configure.in
# cd $(srcdir) && autoconf
-sub-all TAGS:
+TAGS:
for dir in $(SUBDIRS); do \
echo making $@ in $$dir; \
(cd $$dir && $(MAKE) $(MDEFINES) $@ || exit 1); \
done
-.PHONY: sub-all
+
+stmp-sub-all:
+ -rm -f stmp-sub-all
+ for dir in $(SUBDIRS); do \
+ echo making sub-all in $$dir; \
+ (cd $$dir && $(MAKE) $(MDEFINES) sub-all || exit 1); \
+ done
+ touch stmp-sub-all
clean mostlyclean:
for dir in $(SUBDIRS); do \
echo making $@ in $$dir; \
(cd $$dir && $(MAKE) $(MDEFINES) $@ || exit 1); \
done
+ -rm -f stmp*
distclean: clean texclean
for dir in $(SUBDIRS); do \
@@ -122,11 +130,11 @@ texclean:
$(RM) *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.pg *.pgs
$(RM) *.toc *.tp *.tps *.vr *.vrs
-realclean: distclean
+realclean maintainer-clean: distclean
# Let's hope we weren't cross-compiling.
# If we depend on sub-all, this always gets remade. Annoying.
-info texinfo: texinfo.texi
+info texinfo: texinfo.texi stmp-sub-all
./makeinfo/makeinfo$(EXEEXT) -I$(srcdir) texinfo.texi
.PHONY: info