diff options
| author | Xake <xake@rymdraket.net> | 2009-09-27 11:16:36 +0200 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-08 08:29:58 -0700 |
| commit | 383165916ddac91740d4c780174d4c0d07cdb994 (patch) | |
| tree | 7d04a5297331d0e06edb2d9ad74ff9020b8a15e6 | |
| parent | 854269d55cdda8caf425515bfed2855e211a5ada (diff) | |
Use AM_V_GEN instead of customized macros for AM_SILENT_RULES
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, 6 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index dedcf8bc..e77c5161 100644 --- a/configure.ac +++ b/configure.ac @@ -428,10 +428,6 @@ AC_DEFINE_DIR(XERRORDB, XERRORDB, [Location of error message database]) XORG_CHECK_MALLOC_ZERO -# 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) - AC_OUTPUT([Makefile include/Makefile man/Makefile diff --git a/cpprules.in b/cpprules.in index e49341f0..845e242e 100644 --- a/cpprules.in +++ b/cpprules.in @@ -25,13 +25,5 @@ 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: - $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ diff --git a/man/Makefile.am b/man/Makefile.am index 328e386c..2715777b 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -218,7 +218,7 @@ MANDEFS = -D__libmansuffix__=$(LIB_MAN_SUFFIX) \ CPP_MAN_FLAGS = $(MANDEFS) $(EXTRAMANDEFS) .man.$(LIB_MAN_SUFFIX): - $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(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 a15932f4..a4eaa6bd 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): - $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ diff --git a/nls/Makefile.am b/nls/Makefile.am index b4d57ca5..9a00f944 100644 --- a/nls/Makefile.am +++ b/nls/Makefile.am @@ -75,19 +75,19 @@ SUBDIRS= \ include $(top_srcdir)/cpprules.in locale.alias: locale.alias.pre - $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.alias.pre | $(CPP_SED_MAGIC) > locale.alias.l1 + $(AM_V_GEN)$(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 - $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/compose.dir.pre | $(CPP_SED_MAGIC) > compose.dir.l1 + $(AM_V_GEN)$(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 - $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/locale.dir.pre | $(CPP_SED_MAGIC) > locale.dir.l1 + $(AM_V_GEN)$(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 |