From: Ben Pfaff Date: Sat, 27 Sep 2014 04:21:51 +0000 (-0700) Subject: Makefiles: Make most of the handwritten rules support --enable-silent-rules. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=ac68295023b2145ca2cb5357f9f7115a9f591169 Makefiles: Make most of the handwritten rules support --enable-silent-rules. --- diff --git a/Makefile.am b/Makefile.am index 9b1ef044d2..aea415d15e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ endif .q.c: @$(MKDIR_P) `dirname $@` - ./src/language/lexer/q2c$(EXEEXT_FOR_BUILD) $< $@ + $(AM_V_GEN)./src/language/lexer/q2c$(EXEEXT_FOR_BUILD) $< $@ $(all_q_sources:.q=.c): src/language/lexer/q2c$(EXEEXT_FOR_BUILD) all_q_sources = diff --git a/configure.ac b/configure.ac index 032b6f505c..dcdf02b204 100644 --- a/configure.ac +++ b/configure.ac @@ -336,7 +336,11 @@ PSPP_CHECK_PREREQS AC_CONFIG_FILES( [Makefile gl/Makefile po/Makefile tests/atlocal perl-module/lib/PSPP.pm]) -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) +m4_ifdef( + [AM_SILENT_RULES], + [AM_SILENT_RULES], + [AM_V_P=: + AC_SUBST([AM_V_P])]) AC_OUTPUT echo "PSPP configured successfully." diff --git a/perl-module/automake.mk b/perl-module/automake.mk index fae888633b..276af3930a 100644 --- a/perl-module/automake.mk +++ b/perl-module/automake.mk @@ -18,7 +18,7 @@ module_sources = \ PERL_MAKEFLAGS = $(AM_MAKEFLAGS) LD_RUN_PATH=$(pkglibdir) perl-module/pspp-module-config: Makefile - (echo '%Locations = (';\ + $(AM_V_GEN)(echo '%Locations = (';\ printf " SourceDir => '";\ (cd $(top_srcdir) && echo `pwd`\', ) ;\ printf " BuildDir => '";\ @@ -26,15 +26,15 @@ perl-module/pspp-module-config: Makefile echo ');') > $(top_builddir)/perl-module/pspp-module-config perl-module/Makefile: perl-module/Makefile.PL perl-module/pspp-module-config $(module_sources) - cd perl-module && $(PERL) Makefile.PL PREFIX=$(prefix) + $(AM_V_GEN)cd perl-module && $(PERL) Makefile.PL PREFIX=$(prefix) perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz: $(module_sources) perl-module/Makefile - rm -f $@ - cd perl-module && $(MAKE) $(PERL_MAKEFLAGS) tardist + $(AM_V_at)rm -f $@ + $(AM_V_GEN)cd perl-module && $(MAKE) $(PERL_MAKEFLAGS) tardist PHONY += module-make module-make: perl-module/Makefile - cd perl-module && $(MAKE) $(PERL_MAKEFLAGS) + $(AM_V_GEN)cd perl-module && $(MAKE) $(PERL_MAKEFLAGS) ALL_LOCAL += perl_module_tarball perl_module_tarball: $(module_sources) src/libpspp-core.la @@ -44,12 +44,16 @@ perl_module_tarball: $(module_sources) src/libpspp-core.la mkdir -p $$destdir ;\ if test ! -e "$(top_builddir)/$$f" || \ test "$(top_srcdir)/$$f" -nt "$(top_builddir)/$$f" ; then \ + if $(AM_V_P); then \ + echo cp $(top_srcdir)/$$f $$destdir ; \ + else \ + echo " GEN $$destdir/$$f"; \ + fi; \ cp $(top_srcdir)/$$f $$destdir ; \ - echo cp $(top_srcdir)/$$f $$destdir ; \ fi ; \ done \ fi - $(MAKE) $(PERL_MAKEFLAGS) module-make perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz + $(AM_V_GEN)$(MAKE) $(PERL_MAKEFLAGS) module-make perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz CLEAN_LOCAL += perl_module_clean perl_module_clean: diff --git a/po/automake.mk b/po/automake.mk index 745f4b5a90..149624044e 100644 --- a/po/automake.mk +++ b/po/automake.mk @@ -33,14 +33,14 @@ XGETTEXT_OPTIONS = \ $(POTFILE): $(TRANSLATABLE_FILES) $(UI_FILES) src/ui/gui/gen-dot-desktop.sh @$(MKDIR_P) po - $(XGETTEXT) --directory=$(top_srcdir) $(XGETTEXT_OPTIONS) $(TRANSLATABLE_FILES) --language=C --keyword=_ --keyword=N_ -o $@ - $(XGETTEXT) --directory=$(top_srcdir) $(XGETTEXT_OPTIONS) -j $(UI_FILES) --language=glade -o $@ - $(XGETTEXT) --directory=$(top_srcdir) $(XGETTEXT_OPTIONS) -j src/ui/gui/gen-dot-desktop.sh --language=shell --keyword=TRANSLATE -o $@ + $(AM_V_GEN)$(XGETTEXT) --directory=$(top_srcdir) $(XGETTEXT_OPTIONS) $(TRANSLATABLE_FILES) --language=C --keyword=_ --keyword=N_ -o $@ + $(AM_V_at)$(XGETTEXT) --directory=$(top_srcdir) $(XGETTEXT_OPTIONS) -j $(UI_FILES) --language=glade -o $@ + $(AM_V_at)$(XGETTEXT) --directory=$(top_srcdir) $(XGETTEXT_OPTIONS) -j src/ui/gui/gen-dot-desktop.sh --language=shell --keyword=TRANSLATE -o $@ $(POFILES): $(POTFILE) - $(MSGMERGE) $(top_srcdir)/$@ $? -o $@ - if test -e $(top_srcdir)/$@,aux ; then \ + $(AM_V_GEN)$(MSGMERGE) --quiet $(top_srcdir)/$@ $? -o $@ + $(AM_V_at)if test -e $(top_srcdir)/$@,aux ; then \ touch $@ ; \ msgcat --use-first $(top_srcdir)/$@,aux $@ -o $@; \ fi ; @@ -50,7 +50,7 @@ $(POFILES): $(POTFILE) SUFFIXES += .po .gmo .po.gmo: @$(MKDIR_P) `dirname $@` - $(MSGFMT) $< -o $@ + $(AM_V_GEN)$(MSGFMT) $< -o $@ GMOFILES = $(POFILES:.po=.gmo) diff --git a/src/language/expressions/automake.mk b/src/language/expressions/automake.mk index cc856127ae..cc2ed229a7 100644 --- a/src/language/expressions/automake.mk +++ b/src/language/expressions/automake.mk @@ -33,9 +33,9 @@ generate_from_pl = $(MKDIR_P) `dirname $@` && \ $(PERL) -I $(top_srcdir)/src/language/expressions $< -o $@ -i $(top_srcdir)/src/language/expressions/operations.def .hpl.h: - $(generate_from_pl) + $(AM_V_GEN)$(generate_from_pl) .incpl.inc: - $(generate_from_pl) + $(AM_V_GEN)$(generate_from_pl) EXTRA_DIST += src/language/expressions/TODO diff --git a/src/language/lexer/automake.mk b/src/language/lexer/automake.mk index bea557f8a9..7313e08597 100644 --- a/src/language/lexer/automake.mk +++ b/src/language/lexer/automake.mk @@ -28,7 +28,7 @@ EXTRA_DIST += src/language/lexer/q2c.c src/language/lexer/q2c$(EXEEXT_FOR_BUILD): $(top_srcdir)/src/language/lexer/q2c.c @$(MKDIR_P) `dirname $@` - $(CC_FOR_BUILD) $(top_srcdir)/src/language/lexer/q2c.c -o $(top_builddir)/src/language/lexer/q2c$(EXEEXT_FOR_BUILD) + $(AM_V_GEN)$(CC_FOR_BUILD) $(top_srcdir)/src/language/lexer/q2c.c -o $(top_builddir)/src/language/lexer/q2c$(EXEEXT_FOR_BUILD) CLEANFILES += src/language/lexer/q2c$(EXEEXT_FOR_BUILD) diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk index ff8f7c28fe..7db91fe2b7 100644 --- a/src/libpspp/automake.mk +++ b/src/libpspp/automake.mk @@ -113,20 +113,20 @@ nodist_src_libpspp_liblibpspp_la_SOURCES = src/libpspp/version.c src/libpspp/version.c: $(top_srcdir)/AUTHORS Makefile @$(MKDIR_P) src/libpspp - echo "/* -*- mode: c; buffer-read-only: t -*-" > $@ - echo " Generated by src/libpspp/automake.mk --- Do not edit.">> $@ - echo "" >> $@ - echo " The following line is for the benefit of the perl module" >>$@ - echo "\$$VERSION='$(VERSION_FOR_PERL)';" >> $@ - echo "*/" >> $@ - echo "#include \"version.h\"" >> $@ - echo "const char bare_version[] = \"$(VERSION)\";" >> $@ - echo "const char version[] = \"GNU $(PACKAGE) $(VERSION)\";" >> $@ - echo "const char stat_version[] = \"GNU $(PACKAGE) $(VERSION) \ -(`LC_ALL=C TZ=UTC date`).\";" >> $@ - echo "const char host_system[] = \"$(host_triplet)\";" >> $@ - echo "const char build_system[] = \"$(build_triplet)\";" >> $@ - echo "const char locale_dir[] = \"$(datadir)/locale\";" >> $@ - echo "const char *const authors[] = {" >> $@ - sed -e 's/^/ \"/' -e 's/$$/\",/' $(top_srcdir)/AUTHORS >> $@ - echo "0 };" >> $@ + $(AM_V_GEN)echo "/* -*- mode: c; buffer-read-only: t -*-" > $@ + $(AM_V_at)echo " Generated by src/libpspp/automake.mk --- Do not edit.">> $@ + $(AM_V_at)echo "" >> $@ + $(AM_V_at)echo " The following line is for the benefit of the perl module" >>$@ + $(AM_V_at)echo "\$$VERSION='$(VERSION_FOR_PERL)';" >> $@ + $(AM_V_at)echo "*/" >> $@ + $(AM_V_at)echo "#include \"version.h\"" >> $@ + $(AM_V_at)echo "const char bare_version[] = \"$(VERSION)\";" >> $@ + $(AM_V_at)echo "const char version[] = \"GNU $(PACKAGE) $(VERSION)\";" >> $@ + $(AM_V_at)echo "const char stat_version[] = \"GNU $(PACKAGE) $(VERSION) \ +$(AM_V_at)(`LC_ALL=C TZ=UTC date`).\";" >> $@ + $(AM_V_at)echo "const char host_system[] = \"$(host_triplet)\";" >> $@ + $(AM_V_at)echo "const char build_system[] = \"$(build_triplet)\";" >> $@ + $(AM_V_at)echo "const char locale_dir[] = \"$(datadir)/locale\";" >> $@ + $(AM_V_at)echo "const char *const authors[] = {" >> $@ + $(AM_V_at)sed -e 's/^/ \"/' -e 's/$$/\",/' $(top_srcdir)/AUTHORS >> $@ + $(AM_V_at)echo "0 };" >> $@ diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index 707eeed199..3086358ffe 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -340,11 +340,11 @@ src/ui/gui/pspp.desktop: src/ui/gui/gen-dot-desktop.sh $(POFILES) CLEANFILES+=src/ui/gui/pspp.desktop src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list - echo '#include ' > $@ - $(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> $@ + $(AM_V_GEN)echo '#include ' > $@ + $(AM_V_at)$(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> $@ src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list - $(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > $@ + $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > $@ desktopdir = $(datadir)/applications desktop_DATA = src/ui/gui/pspp.desktop diff --git a/tests/automake.mk b/tests/automake.mk index 28159d4c13..7677b4c2b3 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -381,8 +381,8 @@ DISTCLEANFILES += tests/atconfig tests/atlocal $(TESTSUITE) AUTOTEST_PATH = tests/data:tests/language/lexer:tests/libpspp:tests/output:src/ui/terminal:utilities $(srcdir)/tests/testsuite.at: tests/testsuite.in tests/automake.mk - cp $< $@ - for t in $(TESTSUITE_AT); do \ + $(AM_V_GEN)cp $< $@ + $(AM_V_at)for t in $(TESTSUITE_AT); do \ echo "m4_include([$$t])" >> $@ ;\ done EXTRA_DIST += tests/testsuite.at @@ -398,12 +398,12 @@ tests_clean: AUTOM4TE = $(SHELL) $(srcdir)/build-aux/missing --run autom4te AUTOTEST = $(AUTOM4TE) --language=autotest $(TESTSUITE): package.m4 $(srcdir)/tests/testsuite.at $(TESTSUITE_AT) - $(AUTOTEST) -I '$(srcdir)' $@.at | sed 's/@<00A0>@/ /g' > $@.tmp - mv $@.tmp $@ + $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' $@.at | sed 's/@<00A0>@/ /g' > $@.tmp + $(AM_V_at)mv $@.tmp $@ # The `:;' works around a Bash 3.2 bug when the output is not writeable. $(srcdir)/package.m4: $(top_srcdir)/configure.ac - :;{ \ + $(AM_V_GEN):;{ \ echo '# Signature of the current package.' && \ echo 'm4_define([AT_PACKAGE_NAME], [$(PACKAGE_NAME)])' && \ echo 'm4_define([AT_PACKAGE_TARNAME], [$(PACKAGE_TARNAME)])' && \ @@ -447,10 +447,10 @@ valgrind_wrappers = \ $(valgrind_wrappers): tests/valgrind-wrapper.in @$(MKDIR_P) tests/valgrind - sed -e 's,[@]wrap_program[@],$@,' \ + $(AM_V_GEN)sed -e 's,[@]wrap_program[@],$@,' \ $(top_srcdir)/tests/valgrind-wrapper.in > $@.tmp - chmod +x $@.tmp - mv $@.tmp $@ + $(AM_V_at)chmod +x $@.tmp + $(AM_V_at)mv $@.tmp $@ CLEANFILES += $(valgrind_wrappers) EXTRA_DIST += tests/valgrind-wrapper.in