gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 04:20:27 +01:00
Code Issues Projects Releases Wiki Activity

makefile: make silent rule work also for generated files

Browse Source 
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.curis@free.fr>
This commit is contained in:
Christophe CURIS
2014-12-07 17:10:17 +01:00
committed by Carlos R. Mafra
parent 4bed8d14d7
commit d9438e65ef
4 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
WindowMaker/Defaults/Makefile.am
View File

@@ -10,22 +10,18 @@ EXTRA_DIST = WMGLOBAL WMWindowAttributes.in WindowMaker.in WMState.in
CLEANFILES = WMWindowAttributes WindowMaker WMState WMRootMenu CLEANFILES = WMWindowAttributes WindowMaker WMState WMRootMenu
WMWindowAttributes: $(srcdir)/WMWindowAttributes.in WMWindowAttributes: $(srcdir)/WMWindowAttributes.in
-rm -f WMWindowAttributes $(AM_V_GEN)sed -e "s:#extension#:@ICONEXT@:" \
sed -e "s:#extension#:@ICONEXT@:" \ $(srcdir)/WMWindowAttributes.in > WMWindowAttributes ; \
$(srcdir)/WMWindowAttributes.in > WMWindowAttributes
chmod 644 WMWindowAttributes chmod 644 WMWindowAttributes
WindowMaker: $(srcdir)/WindowMaker.in WindowMaker: $(srcdir)/WindowMaker.in
-rm -f WindowMaker $(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" $(srcdir)/WindowMaker.in \
sed -e "s:#pkgdatadir#:$(pkgdatadir):" $(srcdir)/WindowMaker.in \ > WindowMaker ; \
> WindowMaker
chmod 644 WindowMaker chmod 644 WindowMaker
WMState: $(srcdir)/WMState.in WMState: $(srcdir)/WMState.in
-rm -f WMState $(AM_V_GEN)sed -e "s:#wprefs#:$(wpexecbindir)/WPrefs:" $(srcdir)/WMState.in > WMState ; \
sed -e "s:#wprefs#:$(wpexecbindir)/WPrefs:" $(srcdir)/WMState.in > WMState
chmod 644 WMState chmod 644 WMState
WMRootMenu: $(srcdir)/../plmenu WMRootMenu: $(srcdir)/../plmenu
-cp -f $(srcdir)/../plmenu WMRootMenu $(AM_V_GEN)cp -f $(srcdir)/../plmenu WMRootMenu

9
WindowMaker/IconSets/Makefile.am
View File

@@ -8,10 +8,7 @@ EXTRA_DIST =
CLEANFILES = Default.iconset CLEANFILES = Default.iconset
Default.iconset: $(top_builddir)/WindowMaker/Defaults/WMWindowAttributes Default.iconset: $(top_builddir)/WindowMaker/Defaults/WMWindowAttributes
-rm -f Default.iconset $(AM_V_GEN)echo '{' > Default.iconset ; \
echo '{' > Default.iconset grep Icon $(top_builddir)/WindowMaker/Defaults/WMWindowAttributes >> Default.iconset ; \
grep Icon $(top_builddir)/WindowMaker/Defaults/WMWindowAttributes >> Default.iconset echo '}' >> Default.iconset ; \
echo '}' >> Default.iconset
chmod 644 Default.iconset chmod 644 Default.iconset

2
src/Makefile.am
View File

@@ -132,7 +132,7 @@ nodist_wmaker_SOURCES = misc.hack_nf.c
CLEANFILES = $(nodist_wmaker_SOURCES) CLEANFILES = $(nodist_wmaker_SOURCES)
misc.hack_nf.c: misc.c $(top_srcdir)/script/nested-func-to-macro.sh 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 \ $(srcdir)/misc.c -o $(builddir)/misc.hack_nf.c \
-f "append_string" -f "append_modifier" -f "append_string" -f "append_modifier"
endif endif

7
util/Makefile.am
View File

@@ -80,12 +80,9 @@ wmiv_SOURCES = wmiv.c wmiv.h
CLEANFILES = wmaker.inst CLEANFILES = wmaker.inst
wmaker.inst: $(srcdir)/wmaker.inst.in ./Makefile wmaker.inst: $(srcdir)/wmaker.inst.in ./Makefile
-rm -f wmaker.inst $(AM_V_GEN)sed -e "s|#pkgdatadir#|$(pkgdatadir)|" \
sed -e "s|#pkgdatadir#|$(pkgdatadir)|" \
-e "s|#sysconfdir#|$(sysconfdir)/WindowMaker|" \ -e "s|#sysconfdir#|$(sysconfdir)/WindowMaker|" \
-e "s|#version#|$(VERSION)|" \ -e "s|#version#|$(VERSION)|" \
-e "s|#bindir#|$(bindir)|" \ -e "s|#bindir#|$(bindir)|" \
$(srcdir)/wmaker.inst.in >wmaker.inst $(srcdir)/wmaker.inst.in >wmaker.inst ; \
chmod 755 wmaker.inst chmod 755 wmaker.inst