diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-11 09:15:31 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-11 09:15:58 -0700 |
| commit | 69fc0647bed461a19cf99f4d362a44df8c18de38 (patch) | |
| tree | cd1eb02f0bf2d2aa8285a6e66ecf9d55d22e088f | |
| parent | 3d51edf9d96f8adcb6f2ab50f4960aa9ecc76afe (diff) | |
Add support for AM_SILENT_RULES for building files with cpp
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | config/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | cpprules.in | 9 |
4 files changed, 13 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index e90f7bd..1b21b9c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -133,7 +133,7 @@ CPP_FILES_FLAGS = $(MANDEFS) $(RANDOMMANDEFS) $(EXTRAMANDEFS) SUFFIXES += .$(APP_MAN_SUFFIX) .man.cpp .man.cpp.$(APP_MAN_SUFFIX): - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ # # xdmshell diff --git a/config/Makefile.am b/config/Makefile.am index 7682725..d13645f 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -59,4 +59,4 @@ CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \ -DSHELL_CMD="$(SHELL_CMD)" $(MKTEMP_DEFINES) Xservers.ws: $(srcdir)/Xservers.ws.cpp - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/Xservers.ws.cpp | $(CPP_SED_MAGIC) > $@ + $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/Xservers.ws.cpp | $(CPP_SED_MAGIC) > $@ diff --git a/configure.ac b/configure.ac index 6e05acc..655eae6 100644 --- a/configure.ac +++ b/configure.ac @@ -43,6 +43,9 @@ XORG_PROG_RAWCPP XORG_DEFAULT_OPTIONS XORG_WITH_LINT +m4_ifdef([AM_SILENT_RULES],[HAVE_AM_SILENT_RULES=yes]) +AM_CONDITIONAL(HAVE_AM_SILENT_RULES, test x$HAVE_AM_SILENT_RULES != x) + XDM_CFLAGS="$XDM_CFLAGS" GREETER_CFLAGS="$GREETER_CFLAGS" CHOOSER_CFLAGS="$CHOOSER_CFLAGS" diff --git a/cpprules.in b/cpprules.in index 09b7567..eb7ef5e 100644 --- a/cpprules.in +++ b/cpprules.in @@ -22,5 +22,12 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ -e '/^[ ]*XHASH/s/XHASH/\#/' \ -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 + .cpp: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ |