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 <[EMAIL PROTECTED]>
---
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 b4f4972..55c28c3 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -20,9 +20,10 @@ edit = sed \
-e 's|@[EMAIL PROTECTED]|$(ROOTDIR)|g'
$(dist_sysconf_DATA): Makefile
- rm -f $@ [EMAIL PROTECTED]
- $(edit) `test -f ./[EMAIL PROTECTED] || echo $(srcdir)/[EMAIL
PROTECTED] >[EMAIL PROTECTED]
- mv [EMAIL PROTECTED] $@
+ @echo ' ' GEN $@;
+ @rm -f $@ [EMAIL PROTECTED]
+ @$(edit) `test -f ./[EMAIL PROTECTED] || echo $(srcdir)/[EMAIL
PROTECTED] >[EMAIL PROTECTED]
+ @mv [EMAIL PROTECTED] $@
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 42ca5cb..b793687 100644
--- a/pactest/tests/Makefile.am
+++ b/pactest/tests/Makefile.am
@@ -17,10 +17,11 @@ edit = sed \
$(CONFTESTS): Makefile
- rm -f $@ [EMAIL PROTECTED]
- test -f $(srcdir)/[EMAIL PROTECTED] && $(edit) $(srcdir)/[EMAIL
PROTECTED] >[EMAIL PROTECTED] || true
- test -f [EMAIL PROTECTED] || false
- chmod a-w [EMAIL PROTECTED]
- mv [EMAIL PROTECTED] $@
+ @echo ' ' GEN $@;
+ @rm -f $@ [EMAIL PROTECTED]
+ @test -f $(srcdir)/[EMAIL PROTECTED] && $(edit) $(srcdir)/[EMAIL
PROTECTED] >[EMAIL PROTECTED] || true
+ @test -f [EMAIL PROTECTED] || false
+ @chmod a-w [EMAIL PROTECTED]
+ @mv [EMAIL PROTECTED] $@
# vim:set ts=2 sw=2 noet:
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index fd8fab7..014ae87 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 $@ [EMAIL PROTECTED]
- test -f $(srcdir)/[EMAIL PROTECTED] && $(edit) $(srcdir)/[EMAIL
PROTECTED] >[EMAIL PROTECTED] || true
- test -f $(srcdir)/[EMAIL PROTECTED] && $(edit) $(srcdir)/[EMAIL
PROTECTED] >[EMAIL PROTECTED] || true
- test -f [EMAIL PROTECTED] || false
- chmod +x [EMAIL PROTECTED]
- chmod a-w [EMAIL PROTECTED]
- mv [EMAIL PROTECTED] $@
+ @echo ' ' GEN $@;
+ @rm -f $@ [EMAIL PROTECTED]
+ @test -f $(srcdir)/[EMAIL PROTECTED] && $(edit) $(srcdir)/[EMAIL
PROTECTED] >[EMAIL PROTECTED] || true
+ @test -f $(srcdir)/[EMAIL PROTECTED] && $(edit) $(srcdir)/[EMAIL
PROTECTED] >[EMAIL PROTECTED] || true
+ @test -f [EMAIL PROTECTED] || false
+ @chmod +x [EMAIL PROTECTED]
+ @chmod a-w [EMAIL PROTECTED]
+ @mv [EMAIL PROTECTED] $@
makepkg: $(srcdir)/makepkg.sh.in
pacman-optimize: $(srcdir)/pacman-optimize.sh.in
--
1.6.0
_______________________________________________
pacman-dev mailing list
[email protected]
http://archlinux.org/mailman/listinfo/pacman-dev
