diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-18 16:58:53 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-18 17:13:04 -0700 |
| commit | 7dabcac973d0b6692a3cd62bd6d8e0467b24200b (patch) | |
| tree | 9824dccc7bda03c5fb688041c99ab1790678b26d | |
| parent | bfa19cddd8546b4930a773f3bbd81137c362d82b (diff) | |
Add AM_SILENT_RULES support for cpp rules for man & nls files
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | cpprules.in | 10 | ||||
| -rw-r--r-- | man/Makefile.am | 2 | ||||
| -rw-r--r-- | man/xkb/Makefile.am | 2 | ||||
| -rw-r--r-- | nls/Makefile.am | 6 |
5 files changed, 18 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index d6b50a00..02e6f621 100644 --- a/configure.ac +++ b/configure.ac @@ -507,6 +507,10 @@ if test -z "$man_pages_suffix"; then man_pages_suffix=none fi +# Support AM_SILENT_RULES if automake-1.11 or later is used +m4_ifdef([AM_SILENT_RULES],[HAVE_AM_SILENT_RULES=yes]) +AM_CONDITIONAL(HAVE_AM_SILENT_RULES, test x$HAVE_AM_SILENT_RULES != x) + echo "" echo "X11 will be built with the following settings:" echo " Loadable i18n module support: "$XLIB_LOADABLE_I18N diff --git a/cpprules.in b/cpprules.in index 52e34a01..e49341f0 100644 --- a/cpprules.in +++ b/cpprules.in @@ -25,5 +25,13 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \ -e '/\@\@$$/s/\@\@$$/\\/' + +if HAVE_AM_SILENT_RULES +# Support for automake 1.11 AM_SILENT_RULES +cpp_verbose = $(cpp_verbose_$(V)) +cpp_verbose_ = $(cpp_verbose_$(AM_DEFAULT_VERBOSITY)) +cpp_verbose_0 = @echo " CPP " $@; +endif HAVE_AM_SILENT_RULES + .pre: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ diff --git a/man/Makefile.am b/man/Makefile.am index b21d8fb9..61d73570 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -220,7 +220,7 @@ MANDEFS = -D__libmansuffix__=$(LIB_MAN_SUFFIX) \ CPP_MAN_FLAGS = $(MANDEFS) $(EXTRAMANDEFS) .man.$(LIB_MAN_SUFFIX): - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ # Generate man page shadow files (Replaces InstallManPageAliases from Imake) all_shadows = \ diff --git a/man/xkb/Makefile.am b/man/xkb/Makefile.am index 542baf29..a15932f4 100644 --- a/man/xkb/Makefile.am +++ b/man/xkb/Makefile.am @@ -230,5 +230,5 @@ MANDEFS = -D__libmansuffix__=$(LIB_MAN_SUFFIX) \ CPP_MAN_FLAGS = $(MANDEFS) $(EXTRAMANDEFS) .man.$(LIB_MAN_SUFFIX): - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ diff --git a/nls/Makefile.am b/nls/Makefile.am index d6ec4e14..b4d57ca5 100644 --- a/nls/Makefile.am +++ b/nls/Makefile.am @@ -75,19 +75,19 @@ SUBDIRS= \ include $(top_srcdir)/cpprules.in locale.alias: locale.alias.pre - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.alias.pre | $(CPP_SED_MAGIC) > locale.alias.l1 + $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.alias.pre | $(CPP_SED_MAGIC) > locale.alias.l1 sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \ < locale.alias.l1 > locale.alias.l2 cat locale.alias.l2 locale.alias.l1 > locale.alias compose.dir: compose.dir.pre - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/compose.dir.pre | $(CPP_SED_MAGIC) > compose.dir.l1 + $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/compose.dir.pre | $(CPP_SED_MAGIC) > compose.dir.l1 sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \ < compose.dir.l1 > compose.dir.l2 cat compose.dir.l2 compose.dir.l1 > compose.dir locale.dir: locale.dir.pre - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.dir.pre | $(CPP_SED_MAGIC) > locale.dir.l1 + $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.dir.pre | $(CPP_SED_MAGIC) > locale.dir.l1 sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \ < locale.dir.l1 > locale.dir.l2 cat locale.dir.l2 locale.dir.l1 > locale.dir |