diff options
author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2010-03-17 13:40:41 -0500 |
---|---|---|
committer | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2010-03-22 00:45:55 -0500 |
commit | 0820a6e2fb005b5f856dda25e1644f34fc994129 (patch) | |
tree | 126ea859893d927a312da9b04e81a8e3cb46e392 /hw | |
parent | 9be4157391edf0c5fc4ee36adfb1eb1c3bdb8e3b (diff) |
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>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/dmx/Makefile.am | 2 | ||||
-rw-r--r-- | hw/dmx/config/Makefile.am | 2 | ||||
-rw-r--r-- | hw/kdrive/ephyr/Makefile.am | 4 | ||||
-rw-r--r-- | hw/vfb/Makefile.am | 4 | ||||
-rw-r--r-- | hw/xfree86/doc/man/Makefile.am | 8 | ||||
-rw-r--r-- | hw/xfree86/exa/Makefile.am | 4 | ||||
-rw-r--r-- | hw/xfree86/fbdevhw/Makefile.am | 4 | ||||
-rw-r--r-- | hw/xfree86/utils/gtf/Makefile.am | 4 | ||||
-rw-r--r-- | hw/xnest/Makefile.am | 4 | ||||
-rw-r--r-- | hw/xquartz/doc/Makefile.am | 2 | ||||
-rw-r--r-- | hw/xwin/Makefile.am | 8 |
11 files changed, 23 insertions, 23 deletions
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am index fc9fde7b7..0d0634628 100644 --- a/hw/dmx/Makefile.am +++ b/hw/dmx/Makefile.am @@ -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) diff --git a/hw/dmx/config/Makefile.am b/hw/dmx/config/Makefile.am index 7de745f53..25a814e79 100644 --- a/hw/dmx/config/Makefile.am +++ b/hw/dmx/config/Makefile.am @@ -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) \ diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am index d1dd63078..8646703ad 100644 --- a/hw/kdrive/ephyr/Makefile.am +++ b/hw/kdrive/ephyr/Makefile.am @@ -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 diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am index a183824cb..4ac0c8f89 100644 --- a/hw/vfb/Makefile.am +++ b/hw/vfb/Makefile.am @@ -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 diff --git a/hw/xfree86/doc/man/Makefile.am b/hw/xfree86/doc/man/Makefile.am index d8b2aa73d..737166b51 100644 --- a/hw/xfree86/doc/man/Makefile.am +++ b/hw/xfree86/doc/man/Makefile.am @@ -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 diff --git a/hw/xfree86/exa/Makefile.am b/hw/xfree86/exa/Makefile.am index 9eb2e1797..da9b720d7 100644 --- a/hw/xfree86/exa/Makefile.am +++ b/hw/xfree86/exa/Makefile.am @@ -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 diff --git a/hw/xfree86/fbdevhw/Makefile.am b/hw/xfree86/fbdevhw/Makefile.am index 6a4a6e4e6..066352556 100644 --- a/hw/xfree86/fbdevhw/Makefile.am +++ b/hw/xfree86/fbdevhw/Makefile.am @@ -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 diff --git a/hw/xfree86/utils/gtf/Makefile.am b/hw/xfree86/utils/gtf/Makefile.am index 3ca568d74..d1a6d611c 100644 --- a/hw/xfree86/utils/gtf/Makefile.am +++ b/hw/xfree86/utils/gtf/Makefile.am @@ -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) $< $@ diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am index 877ab8b28..666a0f0e6 100644 --- a/hw/xnest/Makefile.am +++ b/hw/xnest/Makefile.am @@ -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) diff --git a/hw/xquartz/doc/Makefile.am b/hw/xquartz/doc/Makefile.am index b812af1cb..7310de353 100644 --- a/hw/xquartz/doc/Makefile.am +++ b/hw/xquartz/doc/Makefile.am @@ -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 diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am index 41a4515fa..0577300fa 100644 --- a/hw/xwin/Makefile.am +++ b/hw/xwin/Makefile.am @@ -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) |