summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwlemb <wlemb>2003-09-01 12:15:09 +0000
committerwlemb <wlemb>2003-09-01 12:15:09 +0000
commitf5eaf69d5f342d444ad135f297e76a5f9f1b6b29 (patch)
treecc4ca4df4ca82657d8cf3cae708d00f0cddb1720
parentc645530aeed3f085d53552337d51ac3ce2d6359c (diff)
downloadgroff-f5eaf69d5f342d444ad135f297e76a5f9f1b6b29.tar.gz
* contrib/mom/Makefile.sub: Fix last change to make it really work.
* Makefile.comm: Use `test ... ||' in favor of `if test ...; then'. (install_dev, uninstall_dev): Check whether $(DEVSCRIPTS) and $(DEVFILES) are not empty. * Makefile.in: Use `test ... ||' in favor of `if test ...; then'.
-rw-r--r--ChangeLog16
-rw-r--r--Makefile.comm58
-rw-r--r--Makefile.in39
-rw-r--r--contrib/mom/Makefile.sub4
4 files changed, 70 insertions, 47 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ca76716..e7b0145b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2003-08-31 Werner LEMBERG <wl@gnu.org>
+
+ * contrib/mom/Makefile.sub: Fix last change to make it really work.
+ * Makefile.comm: Use `test ... ||' in favor of `if test ...; then'.
+ (install_dev, uninstall_dev): Check whether $(DEVSCRIPTS) and
+ $(DEVFILES) are not empty.
+ * Makefile.in: Use `test ... ||' in favor of `if test ...; then'.
+
+2003-08-26 Chuck Silvers <chuq@chuq.com>
+
+ * contrib/mom/Makefile.sub (prepare_make_examples): Make it work
+ with parallel runs of `make'.
+
2003-08-23 Stephen Gildea <gildea@stop.mail-abuse.org>
* src/preproc/ref/ref.cpp (reference::compute_sort_key): Always
@@ -37,7 +50,8 @@
2003-08-07 Werner LEMBERG <wl@gnu.org>
* doc/Makefile.sub: Not all shells expand wildcards in the `for'
- argument list. Use `ls' to expand, similar to autoconf.
+ argument list to nothing if there is no file to match. Use `ls' as
+ a protection, similar to autoconf.
* Makefile.comm (install_dev, uninstall_dev): Protect `for' against
empty argument lists.
diff --git a/Makefile.comm b/Makefile.comm
index 836c262a..2b8b7ffd 100644
--- a/Makefile.comm
+++ b/Makefile.comm
@@ -118,7 +118,7 @@ extraclean: distclean
-test -f y.tab.h && mv y.tab.h y_tab.h
-test -f y.tab.c && mv y.tab.c y_tab.c
mv y_tab.c $(YTABC)
- if test -n "$(YTABH)"; then mv y_tab.h $(YTABH); fi
+ test -z "$(YTABH)" || mv y_tab.h $(YTABH)
# The next rule is needed for make of Solaris 2.5.1 to override its
# built-in .y.o rule (which takes precedence over the .y.cpp rule above).
@@ -131,7 +131,7 @@ extraclean: distclean
-test -f y.tab.h && mv y.tab.h y_tab.h
-test -f y.tab.c && mv y.tab.c y_tab.c
mv y_tab.c $(YTABC)
- if test -n "$(YTABH)"; then mv y_tab.h $(YTABH); fi
+ test -z "$(YTABH)" || mv y_tab.h $(YTABH)
$(COMPILE.cpp) $(YTABC)
.man.n:
@@ -234,32 +234,35 @@ install_dev:
-test -d $(fontdir) || $(mkinstalldirs) $(fontdir)
-test -d $(fontsubdir) || $(mkinstalldirs) $(fontsubdir)
-if test -d $(srcdir)/generate; then \
- test -d $(fontsubdir)/generate || \
- $(mkinstalldirs) $(fontsubdir)/generate; \
+ test -d $(fontsubdir)/generate \
+ || $(mkinstalldirs) $(fontsubdir)/generate; \
fi
- -for f in ""$(DEVFILES); do \
- rm -f $(fontsubdir)/$$f; \
- if test -f $$f; then \
- $(INSTALL_DATA) $$f $(fontsubdir)/$$f; \
- else \
- $(INSTALL_DATA) $(srcdir)/$$f $(fontsubdir)/$$f; \
- fi; \
- done
- -for f in ""$(DEVSCRIPTS); do \
- rm -f $(fontsubdir)/$$f; \
- if test -f $$f; then \
- $(INSTALL_SCRIPT) $$f $(fontsubdir)/$$f; \
- else \
- $(INSTALL_SCRIPT) $(srcdir)/$$f $(fontsubdir)/$$f; \
- fi; \
- done
+ -test -z "$(DEVFILES)" \
+ || for f in $(DEVFILES); do \
+ rm -f $(fontsubdir)/$$f; \
+ if test -f $$f; then \
+ $(INSTALL_DATA) $$f $(fontsubdir)/$$f; \
+ else \
+ $(INSTALL_DATA) $(srcdir)/$$f $(fontsubdir)/$$f; \
+ fi; \
+ done
+ -test -z "$(DEVSCRIPTS)" \
+ || for f in $(DEVSCRIPTS); do \
+ rm -f $(fontsubdir)/$$f; \
+ if test -f $$f; then \
+ $(INSTALL_SCRIPT) $$f $(fontsubdir)/$$f; \
+ else \
+ $(INSTALL_SCRIPT) $(srcdir)/$$f $(fontsubdir)/$$f; \
+ fi; \
+ done
.PHONY: uninstall_dev
uninstall_dev:
- -for f in ""$(DEVFILES) $(DEVSCRIPTS); do rm -f $(fontsubdir)/$$f; done
- -if test -d $(fontsubdir)/generate; then \
- rmdir $(fontsubdir)/generate; \
- fi
+ -test -z "$(DEVFILES)$(DEVSCRIPTS)" \
+ || for f in $(DEVFILES) $(DEVSCRIPTS); do \
+ rm -f $(fontsubdir)/$$f; \
+ done
+ -test -d $(fontsubdir)/generate && rmdir $(fontsubdir)/generate
-rmdir $(fontsubdir)
.PHONY: depend_src
@@ -277,10 +280,9 @@ depend.temp: FORCE
|| $(CCC) $(ALL_CCFLAGS) -MM $(CCSRCS) $$ytabc >>depend.temp
test -z "$(CSRCS)" \
|| $(CC) $(ALL_CFLAGS) -MM $(CSRCS) >>depend.temp
- if test -n "$(YTABH)"; then \
- sed -e 's|$(YTABH)|$(YTABC)|g' depend.temp >depend1.temp; \
- mv depend1.temp depend.temp; \
- fi
+ test -z "$(YTABH)" \
+ || (sed -e 's|$(YTABH)|$(YTABC)|g' depend.temp >depend1.temp; \
+ mv depend1.temp depend.temp)
.PHONY: TAGS_src
TAGS_src:
diff --git a/Makefile.in b/Makefile.in
index 9bcdb521..3523d8fd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -496,8 +496,8 @@ TARGETS=all install install_bin install_data clean distclean mostlyclean \
# where Make needs to be case-sensitive to find files like BI and VERSION.
ENVSETUP=\
if test -f $(srcdir)/makefile.ccpg* && \
- test -f $(srcdir)/Makefile.ccpg*; \
- then FNCASE=y; export FNCASE; \
+ test -f $(srcdir)/Makefile.ccpg*; then \
+ FNCASE=y; export FNCASE; \
else :; \
fi
@@ -518,9 +518,10 @@ dot: FORCE
$(LIBDIRS): FORCE
@$(ENVSETUP); \
- if test $(srcdir) = .; \
- then srcdir=.; \
- else srcdir=`cd $(srcdir); pwd`/$@; \
+ if test $(srcdir) = .; then \
+ srcdir=.; \
+ else \
+ srcdir=`cd $(srcdir); pwd`/$@; \
fi; \
test -d $@ || $(mkinstalldirs) $@; \
cd $@; \
@@ -533,9 +534,10 @@ $(LIBDIRS): FORCE
$(CPROGDIRS): FORCE
@$(ENVSETUP); \
- if test $(srcdir) = .; \
- then srcdir=.; \
- else srcdir=`cd $(srcdir); pwd`/$@; \
+ if test $(srcdir) = .; then \
+ srcdir=.; \
+ else \
+ srcdir=`cd $(srcdir); pwd`/$@; \
fi; \
test -d $@ || $(mkinstalldirs) $@; \
cd $@; \
@@ -548,9 +550,10 @@ $(CPROGDIRS): FORCE
$(CCPROGDIRS): FORCE
@$(ENVSETUP); \
- if test $(srcdir) = .; \
- then srcdir=.; \
- else srcdir=`cd $(srcdir); pwd`/$@; \
+ if test $(srcdir) = .; then \
+ srcdir=.; \
+ else \
+ srcdir=`cd $(srcdir); pwd`/$@; \
fi; \
test -d $@ || $(mkinstalldirs) $@; \
cd $@; \
@@ -563,9 +566,10 @@ $(CCPROGDIRS): FORCE
$(DEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE
@$(ENVSETUP); \
- if test $(srcdir) = .; \
- then srcdir=.; \
- else srcdir=`cd $(srcdir); pwd`/$@; \
+ if test $(srcdir) = .; then \
+ srcdir=.; \
+ else \
+ srcdir=`cd $(srcdir); pwd`/$@; \
fi; \
test -d $@ || $(mkinstalldirs) $@; \
cd $@; \
@@ -576,9 +580,10 @@ $(DEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE
$(INCDIRS) $(OTHERDIRS): FORCE
@$(ENVSETUP); \
- if test $(srcdir) = .; \
- then srcdir=.; \
- else srcdir=`cd $(srcdir); pwd`/$@; \
+ if test $(srcdir) = .; then \
+ srcdir=.; \
+ else \
+ srcdir=`cd $(srcdir); pwd`/$@; \
fi; \
test -d $@ || $(mkinstalldirs) $@; \
cd $@; \
diff --git a/contrib/mom/Makefile.sub b/contrib/mom/Makefile.sub
index f066153a..6ff41e60 100644
--- a/contrib/mom/Makefile.sub
+++ b/contrib/mom/Makefile.sub
@@ -86,13 +86,15 @@ CLEANADD=\
all: make_examples
-.PHONY: make_examples
+.PHONY: make_examples prepare_make_examples
make_examples: prepare_make_examples $(PROCESSEDEXAMPLEFILES)
prepare_make_examples: examples/penguin.ps
test -d examples || $(mkinstalldirs) examples
test -f penguin.ps || cp $(srcdir)/examples/penguin.ps .
+$(PROCESSEDEXAMPLEFILES): prepare_make_examples
+
install_data: $(NORMALFILES) $(HTMLDOCFILES) \
$(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES)
-test -d $(tmacdir) || $(mkinstalldirs) $(tmacdir)