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>
This commit is contained in:
Alan Coopersmith 2009-10-02 21:54:53 -07:00
parent 2e294380b6
commit 315aaef557
4 changed files with 11 additions and 11 deletions

View File

@ -42,7 +42,7 @@ MANDEFS = \
-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) -D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME)
.pre: .pre:
$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
.man.pre.man: .man.pre.man:
$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@

View File

@ -51,18 +51,18 @@ if XSERVER_DTRACE
BUILT_SOURCES = Xserver-dtrace.h BUILT_SOURCES = Xserver-dtrace.h
Xserver-dtrace.h: $(srcdir)/Xserver.d 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 $@ || cp Xserver-dtrace.h.in $@
if SPECIAL_DTRACE_OBJECTS if SPECIAL_DTRACE_OBJECTS
# Generate dtrace object code for probes in libdix # Generate dtrace object code for probes in libdix
dtrace-dix.o: $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS) 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 noinst_PROGRAMS = dix.O
dix.O: dtrace-dix.o $(am_libdix_la_OBJECTS) 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
endif endif

View File

@ -33,19 +33,19 @@ SUFFIXES = .sgml .txt .html .ps .pdf
.sgml.txt: .sgml.txt:
@rm -f $@ @rm -f $@
$(MAKE_TEXT) $< $(AM_V_GEN)$(MAKE_TEXT) $<
.sgml.ps: .sgml.ps:
@rm -f $@ @rm -f $@
$(MAKE_PS) $< $(AM_V_GEN)$(MAKE_PS) $<
.ps.pdf: .ps.pdf:
@rm -f $@ @rm -f $@
$(MAKE_PDF) $< $(AM_V_GEN)$(MAKE_PDF) $<
.sgml.html: .sgml.html:
@rm -f $@ @rm -f $@
$(MAKE_HTML) $< $(AM_V_GEN)$(MAKE_HTML) $<
noinst_DATA = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES) noinst_DATA = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES)
CLEANFILES = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES) CLEANFILES = $(TXT_FILES) $(PS_FILES) $(PDF_FILES) $(HTML_FILES)

View File

@ -44,12 +44,12 @@ EXTRA_DIST = $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \
if SPECIAL_DTRACE_OBJECTS if SPECIAL_DTRACE_OBJECTS
# Generate dtrace object code for probes in libos & libdix # Generate dtrace object code for probes in libos & libdix
dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS) 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 noinst_PROGRAMS = os.O
os.O: dtrace.o $(am_libos_la_OBJECTS) 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 endif
os.c: os.c: