A few files are generated using custom commands, which so far did not
follow the silent rule as the compilation stuff.
This patch adds the needed stuff so they will also be silent if the user
wants so, leading to a cleaner build process where warning/error messages
are more visible.
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
---
WindowMaker/Defaults/Makefile.am | 16 ++++++----------
WindowMaker/IconSets/Makefile.am | 9 +++------
src/Makefile.am | 2 +-
util/Makefile.am | 7 ++-----
4 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/WindowMaker/Defaults/Makefile.am b/WindowMaker/Defaults/Makefile.am
index 33975ea..344c0bf 100644
--- a/WindowMaker/Defaults/Makefile.am
+++ b/WindowMaker/Defaults/Makefile.am
@@ -10,22 +10,18 @@ EXTRA_DIST = WMGLOBAL WMWindowAttributes.in WindowMaker.in
WMState.in
CLEANFILES = WMWindowAttributes WindowMaker WMState WMRootMenu
WMWindowAttributes: $(srcdir)/WMWindowAttributes.in
- -rm -f WMWindowAttributes
- sed -e "s:#extension#:@ICONEXT@:" \
- $(srcdir)/WMWindowAttributes.in > WMWindowAttributes
+ $(AM_V_GEN)sed -e "s:#extension#:@ICONEXT@:" \
+ $(srcdir)/WMWindowAttributes.in > WMWindowAttributes ; \
chmod 644 WMWindowAttributes
WindowMaker: $(srcdir)/WindowMaker.in
- -rm -f WindowMaker
- sed -e "s:#pkgdatadir#:$(pkgdatadir):" $(srcdir)/WindowMaker.in \
- > WindowMaker
+ $(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):"
$(srcdir)/WindowMaker.in \
+ > WindowMaker ; \
chmod 644 WindowMaker
WMState: $(srcdir)/WMState.in
- -rm -f WMState
- sed -e "s:#wprefs#:$(wpexecbindir)/WPrefs:" $(srcdir)/WMState.in >
WMState
+ $(AM_V_GEN)sed -e "s:#wprefs#:$(wpexecbindir)/WPrefs:"
$(srcdir)/WMState.in > WMState ; \
chmod 644 WMState
WMRootMenu: $(srcdir)/../plmenu
- -cp -f $(srcdir)/../plmenu WMRootMenu
-
+ $(AM_V_GEN)cp -f $(srcdir)/../plmenu WMRootMenu
diff --git a/WindowMaker/IconSets/Makefile.am b/WindowMaker/IconSets/Makefile.am
index ec5ca12..ed4317d 100644
--- a/WindowMaker/IconSets/Makefile.am
+++ b/WindowMaker/IconSets/Makefile.am
@@ -8,10 +8,7 @@ EXTRA_DIST =
CLEANFILES = Default.iconset
Default.iconset: $(top_builddir)/WindowMaker/Defaults/WMWindowAttributes
- -rm -f Default.iconset
- echo '{' > Default.iconset
- grep Icon $(top_builddir)/WindowMaker/Defaults/WMWindowAttributes >>
Default.iconset
- echo '}' >> Default.iconset
+ $(AM_V_GEN)echo '{' > Default.iconset ; \
+ grep Icon $(top_builddir)/WindowMaker/Defaults/WMWindowAttributes >>
Default.iconset ; \
+ echo '}' >> Default.iconset ; \
chmod 644 Default.iconset
-
-
diff --git a/src/Makefile.am b/src/Makefile.am
index a7aa1d0..76fc18f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -132,7 +132,7 @@ nodist_wmaker_SOURCES = misc.hack_nf.c
CLEANFILES = $(nodist_wmaker_SOURCES)
misc.hack_nf.c: misc.c $(top_srcdir)/script/nested-func-to-macro.sh
- $(top_srcdir)/script/nested-func-to-macro.sh \
+ $(AM_V_GEN)$(top_srcdir)/script/nested-func-to-macro.sh \
$(srcdir)/misc.c -o $(builddir)/misc.hack_nf.c \
-f "append_string" -f "append_modifier"
endif
diff --git a/util/Makefile.am b/util/Makefile.am
index b5c9d04..cf07fd5 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -80,12 +80,9 @@ wmiv_SOURCES = wmiv.c wmiv.h
CLEANFILES = wmaker.inst
wmaker.inst: $(srcdir)/wmaker.inst.in ./Makefile
- -rm -f wmaker.inst
- sed -e "s|#pkgdatadir#|$(pkgdatadir)|" \
+ $(AM_V_GEN)sed -e "s|#pkgdatadir#|$(pkgdatadir)|" \
-e "s|#sysconfdir#|$(sysconfdir)/WindowMaker|" \
-e "s|#version#|$(VERSION)|" \
-e "s|#bindir#|$(bindir)|" \
- $(srcdir)/wmaker.inst.in >wmaker.inst
-
+ $(srcdir)/wmaker.inst.in >wmaker.inst ; \
chmod 755 wmaker.inst
-
--
2.1.3
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
