Looks ok,
Regards,
Hans
On 09/01/2009 11:23 PM, David Cantrell wrote:
Match up to the silent make thing we have by default now.
---
Makefile.am | 6 +++++-
liveinst/Makefile.am | 6 +++++-
loader/Makefile.am | 30 +++++++++++++++++++++++++-----
3 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 89800ef..ebe6909 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,8 +68,12 @@ PYCHECKERPATH = isys:textw:iw:installclasses:/usr/share/system-config-date
PYCHECKEROPTS = -F pycheckrc-for-anaconda
ARCHIVE_TAG = $(PACKAGE_NAME)-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)
+sed_verbose = $(sed_verbose_$(V))
+sed_verbose_ = $(sed_verbose_$(AM_DEFAULT_VERBOSITY))
+sed_verbose_0 = @echo " SED "$@;
+
$(PACKAGE_NAME).spec: $(PACKAGE_NAME).spec.in
- sed -e 's/#VERSION#/$(PACKAGE_VERSION)/'< $< > $@
+ $(sed_verbose)sed -e 's/#VERSION#/$(PACKAGE_VERSION)/'< $< > $@
lang-names: lang-table
PYTHONPATH="." $(PYTHON) scripts/getlangnames.py> lang-names
diff --git a/liveinst/Makefile.am b/liveinst/Makefile.am
index 0193d47..7bcf1a2 100644
--- a/liveinst/Makefile.am
+++ b/liveinst/Makefile.am
@@ -35,8 +35,12 @@ CLEANFILES = liveinst.desktop
MAINTAINERCLEANFILES = Makefile.in
+intltool_merge_verbose = $(intltool_merge_verbose_$(V))
+intltool_merge_verbose_ = $(intltool_merge_verbose_$(AM_DEFAULT_VERBOSITY))
+intltool_merge_verbose_0 = @echo " MERGE "$@;
+
liveinst.desktop: liveinst.desktop.in
- LC_ALL=C intltool-merge -d -u $(top_srcdir)/po liveinst.desktop.in liveinst.desktop
+ $(intltool_merge_verbose)LC_ALL=C intltool-merge -q -d -u $(top_srcdir)/po liveinst.desktop.in liveinst.desktop
install-exec-local:
mkdir -p $(DESTDIR)$(bindir)
diff --git a/loader/Makefile.am b/loader/Makefile.am
index 5734c5c..d73e81b 100644
--- a/loader/Makefile.am
+++ b/loader/Makefile.am
@@ -70,11 +70,31 @@ CLEANFILES = keymaps-override-$(ARCH) ctype.c tr/*.tr
MAINTAINERCLEANFILES = Makefile.in
+sed_verbose = $(sed_verbose_$(V))
+sed_verbose_ = $(sed_verbose_$(AM_DEFAULT_VERBOSITY))
+sed_verbose_0 = @echo " SED "$@;
+
+cp_verbose = $(cp_verbose_$(V))
+cp_verbose_ = $(cp_verbose_$(AM_DEFAULT_VERBOSITY))
+cp_verbose_0 = @echo " CP "$@;
+
+mkctype_verbose = $(mkctype_verbose_$(V))
+mkctype_verbose_ = $(mkctype_verbose_$(AM_DEFAULT_VERBOSITY))
+mkctype_verbose_0 = @echo " MAKE "$@;
+
+msgmerge_verbose = $(msgmerge_verbose_$(V))
+msgmerge_verbose_ = $(msgmerge_verbose_$(AM_DEFAULT_VERBOSITY))
+msgmerge_verbose_0 = echo " MERGE "$${lang}.po;
+
+xgettext_verbose = $(xgettext_verbose_$(V))
+xgettext_verbose_ = $(xgettext_verbose_$(AM_DEFAULT_VERBOSITY))
+xgettext_verbose_0 = @echo " GETTXT "$@;
+
keymaps-override-$(ARCH): keymaps-$(ARCH)
- cp -p $< $@
+ $(cp_verbose)cp -p $< $@
ctype.c: mkctype
- ./mkctype> ctype.c
+ $(mkctype_verbose)./mkctype> ctype.c
loader.tr: $(top_srcdir)/lang-table loader.po
@LANGS="`cut -f 2 $(top_srcdir)/lang-table | egrep -v '(^en$$)'`" ; \
@@ -82,11 +102,11 @@ loader.tr: $(top_srcdir)/lang-table loader.po
mkdir -p tr ; \
fi ; \
for lang in $$LANGS ; do \
- msgmerge -q $(top_srcdir)/po/$$lang.po loader.po | msgconv -t utf-8 | ./simplemot> tr/$$lang.tr ; \
+ $(msgmerge_verbose)msgmerge -q $(top_srcdir)/po/$$lang.po loader.po | msgconv -t utf-8 | ./simplemot> tr/$$lang.tr ; \
done ; \
(cd tr ; ls -1 *.tr | cpio --quiet -Hcrc -o | gzip -9)> $@
loader.po:
- xgettext --default-domain=loader --add-comments \
+ $(xgettext_verbose)xgettext --default-domain=loader --add-comments \
--keyword=_ --keyword=N_ *.c
- sed -i 's/charset=CHARSET/charset=UTF-8/' $@
+ $(sed_verbose)sed -i 's/charset=CHARSET/charset=UTF-8/' $@
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
