From 44547edd7ca7db128df2666fbb3f080f205582db Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Wed, 29 Aug 2012 16:37:24 +0200 Subject: build: don't use recursive make to build the 'man' subdirectory * Makefile.am: Include 'man/local.mk'. (SUBDIRS): Remove 'man'. * configure.ac ($MAN): Adjust so that each of its entries has a leading 'man/' component. (AC_CONFIG_FILES): Remove 'man/Makefile'. * man/Makefile.am: Rename ... * man/local.mk: ... like this. With further adjustments: each 'foo.1' target renamed like 'man/foo.1', each '../src/foo.c' dependency as 'src/foo.c', and each '$(srcdir)' usage as '$(srcdir)/man'. Also ... (mandep): Adjust, removing the leading '../' component. Several whitespace adjustments while at it. (ASSORT): Remove, it's already defined in the top-level Makefile.am. * cfg.mk (sc_option_desc_uppercase, sc_man_file_correlation): Remove the associated recipes, they are now directly available from the included 'man/local.mk'. Actually, the other changes in this commit have made these recipes instable and not completely correct, but that will be fixed in later changes. --- cfg.mk | 2 -- 1 file changed, 2 deletions(-) (limited to 'cfg.mk') diff --git a/cfg.mk b/cfg.mk index e6e0828c7..5f7193e91 100644 --- a/cfg.mk +++ b/cfg.mk @@ -172,12 +172,10 @@ sc_long_lines: # but that would miss descriptions not on the same line as the -option. ALL_RECURSIVE_TARGETS += sc_option_desc_uppercase sc_option_desc_uppercase: all_programs - @$(MAKE) -s -C man $@ # Ensure all man/*.[1x] files are present ALL_RECURSIVE_TARGETS += sc_man_file_correlation sc_man_file_correlation: all_programs - @$(MAKE) -s -C man $@ # Ensure that the end of each release's section is marked by two empty lines. sc_NEWS_two_empty_lines: -- cgit v1.2.3-54-g00ecf