diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-11-12 17:07:38 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-11-24 19:58:41 -0500 |
| commit | 1dc0ef42cf009596db60a9fd08435621f70b81e7 (patch) | |
| tree | 4ac98f55e688be4b2f37d27b19764a1d5566ac9a | |
| parent | 083f3d0ee8ecbb48b86dddfcf2f172fafb579f08 (diff) | |
config: use AM_V_GEN instead of customized macros for AM_SILENT_RULES
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | config/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | cpprules.in | 9 |
3 files changed, 2 insertions, 12 deletions
diff --git a/config/Makefile.am b/config/Makefile.am index d13645f..30e22ea 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 - $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/Xservers.ws.cpp | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/Xservers.ws.cpp | $(CPP_SED_MAGIC) > $@ diff --git a/configure.ac b/configure.ac index d1050e5..c47779d 100644 --- a/configure.ac +++ b/configure.ac @@ -101,9 +101,6 @@ AC_FUNC_FORK AC_CHECK_FUNCS([daemon sigaction openlog asprintf setproctitle setusercontext \ mkstemp getifaddrs getspnam arc4random]) -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 eb7ef5e..c6daca3 100644 --- a/cpprules.in +++ b/cpprules.in @@ -22,12 +22,5 @@ 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: - $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ |