Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tools/groff Having `build/Makefile' depend on `.configure_do...



details:   https://anonhg.NetBSD.org/src/rev/6a1411e17d6d
branches:  trunk
changeset: 522445:6a1411e17d6d
user:      pk <pk%NetBSD.org@localhost>
date:      Tue Feb 19 12:13:10 2002 +0000

description:
Having `build/Makefile' depend on `.configure_done' doesn't work. Instead,
just add the additional commands to the `.configure_done' target.

Also, since the groff distribution Makefiles don't get their dependencies
right, use internal knowledge to add additional target ordering to the
generated makefile. Note, this hack can be removed once our own make(1)
can be invoked in true sequential (i.e. compatible) mode again for subdir
makes.

diffstat:

 tools/groff/Makefile |  19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r a1f8dff86885 -r 6a1411e17d6d tools/groff/Makefile
--- a/tools/groff/Makefile      Tue Feb 19 08:30:23 2002 +0000
+++ b/tools/groff/Makefile      Tue Feb 19 12:13:10 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.13 2002/02/01 13:51:38 tv Exp $
+#      $NetBSD: Makefile,v 1.14 2002/02/19 12:13:10 pk Exp $
 
 MODULE=                groff
 
@@ -9,9 +9,20 @@
 
 # Add gnuwrap hack directly to the Makefile.
 _NOWRAPPER=1
-.build_done: build/Makefile
-build/Makefile: .configure_done
-       @printf '.include "${.CURDIR}/../Makefile.gnuwrap"\n' >>$@
+
+#
+# Fixup build/Makefile.
+# XXX - the groff distribution Makefiles don't get their dependencies right.
+#      We use internal knowledge to specify additional target ordering.
+#      This can be removed once our own make(1) can be invoked in true
+#      sequential (i.e. compatible) mode again for subdir makes.
+#
+.configure_done: _post_conf
+_post_conf: .USE
+       @(echo '.include "${.CURDIR}/../Makefile.gnuwrap"'; \
+         echo '.ORDER: $$(ALLDIRS) dot';\
+         echo '.ORDER: all install' ) >> build/Makefile
+
 
 .include "${.CURDIR}/../Makefile.gnuhost"
 



Home | Main Index | Thread Index | Old Index