summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-10-02 21:54:53 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-10-06 19:40:20 -0700
commit315aaef55750a863c08a16ad9120ffb76f9b48e0 (patch)
treee77127c2c83fdcf89f4e30ab0fa39e28c94795ee
parent2e294380b64b6362173d0590c4292f290e50af50 (diff)
Use $(AM_V_GEN) to silence more commands when AM_SILENT_RULES is active
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Eric Anholt <eric@anholt.net> Acked-by: Dan Nicholson <dbn.lists@gmail.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--cpprules.in4
-rw-r--r--dix/Makefile.am6
-rw-r--r--hw/xfree86/doc/sgml/Makefile.am8
-rw-r--r--os/Makefile.am4
4 files changed, 11 insertions, 11 deletions
diff --git a/cpprules.in b/cpprules.in
index 755620005..7fcb9bd6f 100644
--- a/cpprules.in
+++ b/cpprules.in
@@ -42,7 +42,7 @@ MANDEFS = \
-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME)
.pre:
- $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
.man.pre.man:
- $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
+ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
diff --git a/dix/Makefile.am b/dix/Makefile.am
index 0996cffea..ae47dc472 100644
--- a/dix/Makefile.am
+++ b/dix/Makefile.am
@@ -51,18 +51,18 @@ if XSERVER_DTRACE
BUILT_SOURCES = Xserver-dtrace.h
Xserver-dtrace.h: $(srcdir)/Xserver.d
- $(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d \
+ $(AM_V_GEN)$(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d \
|| cp Xserver-dtrace.h.in $@
if SPECIAL_DTRACE_OBJECTS
# Generate dtrace object code for probes in libdix
dtrace-dix.o: $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS)
- $(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS:%.lo=.libs/%.o)
+ $(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS:%.lo=.libs/%.o)
noinst_PROGRAMS = dix.O
dix.O: dtrace-dix.o $(am_libdix_la_OBJECTS)
- ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o)
+ $(AM_V_GEN)ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o)
endif
endif
diff --git a/hw/xfree86/doc/sgml/Makefile.am b/hw/xfree86/doc/sgml/Makefile.am
index d2c821c03..09b64f7b0 100644
--- a/hw/xfree86/doc/sgml/Makefile.am
+++ b/hw/xfree86/doc/sgml/Makefile.am
@@ -33,19 +33,19 @@ SUFFIXES = .sgml .txt .html .ps .pdf
.sgml.txt:
@rm -f $@
- $(MAKE_TEXT) $<
+ $(AM_V_GEN)$(MAKE_TEXT) $<
.sgml.ps:
@rm -f $@
- $(MAKE_PS) $<
+ $(AM_V_GEN)$(MAKE_PS) $<
.ps.pdf:
@rm -f $@
- $(MAKE_PDF) $<
+ $(AM_V_GEN)$(MAKE_PDF) $<
.sgml.html:
@rm -f $@
- $(MAKE_HTML) $<
+ $(AM_V_GEN)$(MAKE_HTML) $<
noinst_DATA = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES)
CLEANFILES = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES)
diff --git a/os/Makefile.am b/os/Makefile.am
index 22ed1946c..a7f34a5b8 100644
--- a/os/Makefile.am
+++ b/os/Makefile.am
@@ -44,12 +44,12 @@ EXTRA_DIST = $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \
if SPECIAL_DTRACE_OBJECTS
# Generate dtrace object code for probes in libos & libdix
dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS)
- $(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o
+ $(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o
noinst_PROGRAMS = os.O
os.O: dtrace.o $(am_libos_la_OBJECTS)
- ld -r -o $@ dtrace.o .libs/*.o
+ $(AM_V_GEN)ld -r -o $@ dtrace.o .libs/*.o
endif
os.c: