From f1f8f0e1c291a2201f122e0ec1d7e6179bf11cc8 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 23 Aug 2008 18:27:01 -0500 Subject: Quiet up the make process a bit When we do our sed edits, we really don't need every command printed out to the terminal. Now with "make -s", the output is quite palatable. Signed-off-by: Dan McGee --- etc/Makefile.am | 7 ++++--- pactest/tests/Makefile.am | 11 ++++++----- scripts/Makefile.am | 15 ++++++++------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/etc/Makefile.am b/etc/Makefile.am index b4f4972e..55c28c3b 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -20,9 +20,10 @@ edit = sed \ -e 's|@ROOTDIR[@]|$(ROOTDIR)|g' $(dist_sysconf_DATA): Makefile - rm -f $@ $@.tmp - $(edit) `test -f ./$@.in || echo $(srcdir)/`$@.in >$@.tmp - mv $@.tmp $@ + @echo ' ' GEN $@; + @rm -f $@ $@.tmp + @$(edit) `test -f ./$@.in || echo $(srcdir)/`$@.in >$@.tmp + @mv $@.tmp $@ makepkg.conf: $(srcdir)/makepkg.conf.in pacman.conf: $(srcdir)/pacman.conf.in diff --git a/pactest/tests/Makefile.am b/pactest/tests/Makefile.am index 42ca5cbe..b793687b 100644 --- a/pactest/tests/Makefile.am +++ b/pactest/tests/Makefile.am @@ -17,10 +17,11 @@ edit = sed \ $(CONFTESTS): Makefile - rm -f $@ $@.tmp - test -f $(srcdir)/$@.in && $(edit) $(srcdir)/$@.in >$@.tmp || true - test -f $@.tmp || false - chmod a-w $@.tmp - mv $@.tmp $@ + @echo ' ' GEN $@; + @rm -f $@ $@.tmp + @test -f $(srcdir)/$@.in && $(edit) $(srcdir)/$@.in >$@.tmp || true + @test -f $@.tmp || false + @chmod a-w $@.tmp + @mv $@.tmp $@ # vim:set ts=2 sw=2 noet: diff --git a/scripts/Makefile.am b/scripts/Makefile.am index fd8fab7f..014ae870 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -46,13 +46,14 @@ edit = sed \ # two 'test' lines- make sure we can handle both sh and py type scripts # third 'test' line- make sure one of the two checks succeeded $(OURSCRIPTS): Makefile - rm -f $@ $@.tmp - test -f $(srcdir)/$@.sh.in && $(edit) $(srcdir)/$@.sh.in >$@.tmp || true - test -f $(srcdir)/$@.py.in && $(edit) $(srcdir)/$@.py.in >$@.tmp || true - test -f $@.tmp || false - chmod +x $@.tmp - chmod a-w $@.tmp - mv $@.tmp $@ + @echo ' ' GEN $@; + @rm -f $@ $@.tmp + @test -f $(srcdir)/$@.sh.in && $(edit) $(srcdir)/$@.sh.in >$@.tmp || true + @test -f $(srcdir)/$@.py.in && $(edit) $(srcdir)/$@.py.in >$@.tmp || true + @test -f $@.tmp || false + @chmod +x $@.tmp + @chmod a-w $@.tmp + @mv $@.tmp $@ makepkg: $(srcdir)/makepkg.sh.in pacman-optimize: $(srcdir)/pacman-optimize.sh.in -- cgit v1.2.3