frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix .man.N targets for AM_SILENT_RULES 

Add $(AM_V_GEN) for sed-based rules so they appear as expected with
automake silent rules, and $(AM_V_at) to completely hide cp/ln/rm
commands which are not prone to fail.

Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
This commit is contained in:
Yaakov Selkowitz 2010-03-17 13:40:41 -05:00
parent 9be4157391
commit 0820a6e2fb
12 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/Makefile.am
View File

@ -14,9 +14,9 @@ CLEANFILES = $(appman_PROCESSED) $(appman_DATA)
include $(top_srcdir)/cpprules.in
.man.$(APP_MAN_SUFFIX):
cp $< $@
$(AM_V_at)cp $< $@
EXTRAMANDEFS = -D__default_font_path__="`echo $(COMPILEDDEFAULTFONTPATH) | sed -e 's/,/, /g'`"
EXTRAMANDEFS = -D__default_font_path__="`echo $(COMPILEDDEFAULTFONTPATH) | $(SED) -e 's/,/, /g'`"
# Docs about X server internals that we ship with source but don't install
DEVEL_DOCS = smartsched

2
hw/dmx/Makefile.am
View File

@ -109,7 +109,7 @@ MAN_SUBSTS = \
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
$(SED) $(MAN_SUBSTS) < $< > $@
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
EXTRA_DIST = $(appman_PRE)

2
hw/dmx/config/Makefile.am
View File

@ -69,7 +69,7 @@ XORGRELSTRING = @PACKAGE_STRING@
MAN_SUBSTS = -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|'
.man.$(APP_MAN_SUFFIX):
$(SED) $(MAN_SUBSTS) < $< > $@
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
EXTRA_DIST = \
$(appman_PRE) \

4
hw/kdrive/ephyr/Makefile.am
View File

@ -89,8 +89,8 @@ appmandir = $(APP_MAN_DIR)
appman_DATA = Xephyr.$(APP_MAN_SUFFIX)
Xephyr.$(APP_MAN_SUFFIX): Xephyr.man
-rm -f Xephyr.$(APP_MAN_SUFFIX)
$(LN_S) Xephyr.man Xephyr.$(APP_MAN_SUFFIX)
-$(AM_V_at)rm -f Xephyr.$(APP_MAN_SUFFIX)
$(AM_V_at)$(LN_S) Xephyr.man Xephyr.$(APP_MAN_SUFFIX)
include $(top_srcdir)/cpprules.in

4
hw/vfb/Makefile.am
View File

@ -43,8 +43,8 @@ CLEANFILES = $(appman_PRE) $(appman_DATA)
SUFFIXES += .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
-rm -f $@
$(LN_S) $< $@
-$(AM_V_at)rm -f $@
$(AM_V_at)$(LN_S) $< $@
EXTRA_DIST = Xvfb.man.pre

8
hw/xfree86/doc/man/Makefile.am
View File

@ -8,12 +8,12 @@ filemandir = $(FILE_MAN_DIR)
fileman_DATA = xorg.conf.$(FILE_MAN_SUFFIX)
Xorg.$(APP_MAN_SUFFIX): Xorg.man
-rm -f Xorg.$(APP_MAN_SUFFIX)
$(LN_S) Xorg.man Xorg.$(APP_MAN_SUFFIX)
-$(AM_V_at)rm -f Xorg.$(APP_MAN_SUFFIX)
$(AM_V_at)$(LN_S) Xorg.man Xorg.$(APP_MAN_SUFFIX)
xorg.conf.$(FILE_MAN_SUFFIX): xorg.conf.man
-rm -f xorg.conf.$(FILE_MAN_SUFFIX)
$(LN_S) xorg.conf.man xorg.conf.$(FILE_MAN_SUFFIX)
-$(AM_V_at)rm -f xorg.conf.$(FILE_MAN_SUFFIX)
$(AM_V_at)$(LN_S) xorg.conf.man xorg.conf.$(FILE_MAN_SUFFIX)
include $(top_srcdir)/cpprules.in

4
hw/xfree86/exa/Makefile.am
View File

@ -22,7 +22,7 @@ driverman_DATA = exa.$(DRIVER_MAN_SUFFIX)
CLEANFILES = $(driverman_DATA) exa.man
exa.$(DRIVER_MAN_SUFFIX): exa.man
-rm -f exa.$(DRIVER_MAN_SUFFIX)
$(LN_S) exa.man exa.$(DRIVER_MAN_SUFFIX)
-$(AM_V_at)rm -f exa.$(DRIVER_MAN_SUFFIX)
$(AM_V_at)$(LN_S) exa.man exa.$(DRIVER_MAN_SUFFIX)
EXTRA_DIST = exa.man.pre

4
hw/xfree86/fbdevhw/Makefile.am
View File

@ -22,7 +22,7 @@ driverman_DATA = fbdevhw.$(DRIVER_MAN_SUFFIX)
CLEANFILES = $(driverman_DATA) fbdevhw.man
fbdevhw.$(DRIVER_MAN_SUFFIX): fbdevhw.man
-rm -f fbdevhw.$(DRIVER_MAN_SUFFIX)
$(LN_S) fbdevhw.man fbdevhw.$(DRIVER_MAN_SUFFIX)
-$(AM_V_at)rm -f fbdevhw.$(DRIVER_MAN_SUFFIX)
$(AM_V_at)$(LN_S) fbdevhw.man fbdevhw.$(DRIVER_MAN_SUFFIX)
EXTRA_DIST = fbpriv.h fbdevhw.man.pre README

4
hw/xfree86/utils/gtf/Makefile.am
View File

@ -40,5 +40,5 @@ CLEANFILES = $(appman_PRE) $(appman_DATA)
SUFFIXES += .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
-rm -f $@
$(LN_S) $< $@
-$(AM_V_at)rm -f $@
$(AM_V_at)$(LN_S) $< $@

4
hw/xnest/Makefile.am
View File

@ -85,8 +85,8 @@ CLEANFILES = $(appman_PRE) $(appman_DATA)
SUFFIXES += .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
-rm -f $@
$(LN_S) $< $@
-$(AM_V_at)rm -f $@
$(AM_V_at)$(LN_S) $< $@
relink:
$(AM_V_at)rm -f Xnest$(EXEEXT) && $(MAKE) Xnest$(EXEEXT)

2
hw/xquartz/doc/Makefile.am
View File

@ -8,7 +8,7 @@ CLEANFILES = $(appman_PROCESSED) $(appman_DATA)
include $(top_srcdir)/cpprules.in
.man.$(APP_MAN_SUFFIX):
cp $< $@
$(AM_V_at)cp $< $@
EXTRA_DIST = \
Xquartz.man.pre

8
hw/xwin/Makefile.am
View File

@ -180,12 +180,12 @@ filemandir = $(FILE_MAN_DIR)
fileman_DATA = XWinrc.$(FILE_MAN_SUFFIX)
XWin.$(APP_MAN_SUFFIX): XWin.man
-rm -f XWin.$(APP_MAN_SUFFIX)
$(LN_S) XWin.man XWin.$(APP_MAN_SUFFIX)
-$(AM_V_at)rm -f XWin.$(APP_MAN_SUFFIX)
$(AM_V_at)$(LN_S) XWin.man XWin.$(APP_MAN_SUFFIX)
XWinrc.$(FILE_MAN_SUFFIX): XWinrc.man
-rm -f XWinrc.$(FILE_MAN_SUFFIX)
$(LN_S) XWinrc.man XWinrc.$(FILE_MAN_SUFFIX)
-$(AM_V_at)rm -f XWinrc.$(FILE_MAN_SUFFIX)
$(AM_V_at)$(LN_S) XWinrc.man XWinrc.$(FILE_MAN_SUFFIX)
EXTRAMANDEFS = -D__logdir__=$(logdir) -D__sysconfdir__=$(sysconfdir) -D__datadir__=$(datadir)