From 9557003d564892c7a12b4ede8b452636569c0dbb Mon Sep 17 00:00:00 2001
From: wl <wl>
Date: Thu, 19 Jan 2006 16:18:45 +0000
Subject: Let `make -k install' install more files.

* Makefile.in (MAKE_K_FLAG): New variable.  Use it everywhere where
$(MAKE) and $(MDEFINES) are used.
(CPROGDIRS): Remove $(XPROGDIRS).  Treat $(XPROGDIRS) like
$(CPROGDIRS) everywhere.
($(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS)): Don't depend
on $(XPROGDIRS).
($(OTHERDIRS)): Likewise.


* src/devices/grohtml/post-html.cpp (get_html_translation): Remove
failure test for font::name_to_index -- it can never fail.
---
 Makefile.in | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 55975f0a..8169b08f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -530,6 +530,8 @@ MDEFINES= \
   "top_srcdir=$(top_srcdir)" \
   "version=$(version)"
 
+MAKE_K_FLAG=`case "$(MAKEFLAGS)" in *k*) echo ' -k ';; esac`
+
 INCDIRS=src/include
 LIBDIRS=\
   src/libs/libgroff \
@@ -560,10 +562,9 @@ CCPROGDIRS=\
   src/utils/lkbib \
   src/utils/addftinfo
 CPROGDIRS=\
-  src/utils/pfbtops \
-  $(XPROGDIRS)
+  src/utils/pfbtops
 PROGDEPDIRS=arch/misc
-PROGDIRS=$(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS)
+PROGDIRS=$(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) $(XPROGDIRS)
 DEVDIRS=\
   font/devps \
   font/devdvi \
@@ -626,11 +627,11 @@ subdir=src/roff/troff
 
 
 $(TARGETS):
-	@$(ENVSETUP); $(MAKE) $(MDEFINES) do=$@ $(dodirs)
+	@$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) do=$@ $(dodirs)
 
 dot: FORCE
 	@$(ENVSETUP); \
-	$(MAKE) $(MDEFINES) srcdir=$(srcdir) VPATH=$(srcdir) \
+	$(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$(srcdir) VPATH=$(srcdir) \
 	  -f $(top_srcdir)/Makefile.comm \
 	  -f $(top_srcdir)/Makefile.sub $(do)
 
@@ -644,13 +645,13 @@ $(LIBDIRS): FORCE $(INCDIRS) $(PROGDEPDIRS)
 	test -d $@ || $(mkinstalldirs) $@; \
 	cd $@; \
 	test -f Makefile.dep || touch Makefile.dep; \
-	$(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
+	$(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
 	  -f $(top_srcdir)/Makefile.comm \
 	  -f $$srcdir/Makefile.sub \
 	  -f $(top_srcdir)/Makefile.lib \
 	  -f Makefile.dep $(do)
 
-$(CPROGDIRS): FORCE $(LIBDIRS)
+$(CPROGDIRS) $(XPROGDIRS): FORCE $(LIBDIRS)
 	@$(ENVSETUP); \
 	if test $(srcdir) = .; then \
 	  srcdir=.; \
@@ -660,7 +661,7 @@ $(CPROGDIRS): FORCE $(LIBDIRS)
 	test -d $@ || $(mkinstalldirs) $@; \
 	cd $@; \
 	test -f Makefile.dep || touch Makefile.dep; \
-	$(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
+	$(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
 	  -f $(top_srcdir)/Makefile.comm \
 	  -f $$srcdir/Makefile.sub \
 	  -f $(top_srcdir)/Makefile.cpg \
@@ -676,13 +677,13 @@ $(CCPROGDIRS): FORCE $(LIBDIRS)
 	test -d $@ || $(mkinstalldirs) $@; \
 	cd $@; \
 	test -f Makefile.dep || touch Makefile.dep; \
-	$(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
+	$(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
 	  -f $(top_srcdir)/Makefile.comm \
 	  -f $$srcdir/Makefile.sub \
 	  -f $(top_srcdir)/Makefile.ccpg \
 	  -f Makefile.dep $(do)
 
-$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE $(PROGDIRS)
+$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS)
 	@$(ENVSETUP); \
 	if test $(srcdir) = .; then \
 	  srcdir=.; \
@@ -691,12 +692,12 @@ $(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE $(PROGDIRS)
 	fi; \
 	test -d $@ || $(mkinstalldirs) $@; \
 	cd $@; \
-	$(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
+	$(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
 	  -f $(top_srcdir)/Makefile.comm \
 	  -f $$srcdir/Makefile.sub \
 	  -f $(top_srcdir)/Makefile.dev $(do)
 
-$(OTHERDIRS): $(PROGDIRS)
+$(OTHERDIRS): $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS)
 
 $(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS): FORCE
 	@$(ENVSETUP); \
@@ -707,7 +708,7 @@ $(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS): FORCE
 	fi; \
 	test -d $@ || $(mkinstalldirs) $@; \
 	cd $@; \
-	$(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
+	$(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
 	  -f $(top_srcdir)/Makefile.comm \
 	  -f $$srcdir/Makefile.sub \
 	  -f $(top_srcdir)/Makefile.man $(do)
-- 
cgit v1.2.1