[PATCH 3/5] Fix relink targets for silent rules
Yaakov (Cygwin/X)
yselkowitz at users.sourceforge.net
Wed Mar 17 13:11:08 PDT 2010
From: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Add $(AM_V_at) to all relink make targets to silence them when automake
silent rules are in use.
Signed-off-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
---
Makefile.am | 2 +-
hw/Makefile.am | 2 +-
hw/dmx/Makefile.am | 2 +-
hw/kdrive/Makefile.am | 2 +-
hw/kdrive/ephyr/Makefile.am | 2 +-
hw/kdrive/fake/Makefile.am | 2 +-
hw/kdrive/fbdev/Makefile.am | 2 +-
hw/vfb/Makefile.am | 2 +-
hw/xfree86/Makefile.am | 2 +-
hw/xnest/Makefile.am | 2 +-
hw/xwin/Makefile.am | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 667c0de..8b7a2c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -94,4 +94,4 @@ DIST_SUBDIRS = \
# gross hack
relink: all
- $(MAKE) -C hw relink
+ $(AM_V_at)$(MAKE) -C hw relink
diff --git a/hw/Makefile.am b/hw/Makefile.am
index 7409906..92b007a 100644
--- a/hw/Makefile.am
+++ b/hw/Makefile.am
@@ -38,4 +38,4 @@ SUBDIRS = \
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
relink:
- for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink ; done
+ $(AM_V_at)for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink ; done
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index 1e3e5da..cdee586 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -114,4 +114,4 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
EXTRA_DIST = $(appman_PRE)
relink:
- rm -f Xdmx$(EXEEXT) && $(MAKE) Xdmx$(EXEEXT)
+ $(AM_V_at)rm -f Xdmx$(EXEEXT) && $(MAKE) Xdmx$(EXEEXT)
diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am
index 9e6c18e..55d940f 100644
--- a/hw/kdrive/Makefile.am
+++ b/hw/kdrive/Makefile.am
@@ -27,4 +27,4 @@ SUBDIRS = \
DIST_SUBDIRS = fbdev ephyr src linux fake
relink:
- @for i in $(SERVER_SUBDIRS) ; do $(MAKE) -C $$i relink ; done
+ $(AM_V_at)for i in $(SERVER_SUBDIRS) ; do $(MAKE) -C $$i relink ; done
diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am
index bd74791..d1dd630 100644
--- a/hw/kdrive/ephyr/Makefile.am
+++ b/hw/kdrive/ephyr/Makefile.am
@@ -81,7 +81,7 @@ Xephyr_DEPENDENCIES = \
Xephyr_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
relink:
- rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS)
+ $(AM_V_at)rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS)
MAN_SRCS = Xephyr.man.pre
diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am
index 6a5cedf..6d3ed05 100644
--- a/hw/kdrive/fake/Makefile.am
+++ b/hw/kdrive/fake/Makefile.am
@@ -27,4 +27,4 @@ Xfake_DEPENDENCIES = \
@KDRIVE_LOCAL_LIBS@
relink:
- rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS)
+ $(AM_V_at)rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS)
diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am
index a1664ec..ec9df95 100644
--- a/hw/kdrive/fbdev/Makefile.am
+++ b/hw/kdrive/fbdev/Makefile.am
@@ -25,5 +25,5 @@ Xfbdev_DEPENDENCIES = \
Xfbdev_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
relink:
- rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS)
+ $(AM_V_at)rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS)
endif
diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am
index c6601c2..a183824 100644
--- a/hw/vfb/Makefile.am
+++ b/hw/vfb/Makefile.am
@@ -49,4 +49,4 @@ SUFFIXES += .$(APP_MAN_SUFFIX) .man
EXTRA_DIST = Xvfb.man.pre
relink:
- rm -f Xvfb$(EXEEXT) && $(MAKE) Xvfb$(EXEEXT)
+ $(AM_V_at)rm -f Xvfb$(EXEEXT) && $(MAKE) Xvfb$(EXEEXT)
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 914e11f..116113b 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -114,7 +114,7 @@ CPP_FILES_FLAGS = \
-DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"
relink:
- rm -f Xorg && $(MAKE) Xorg
+ $(AM_V_at)rm -f Xorg && $(MAKE) Xorg
xorg.conf.example.pre: xorgconf.cpp
cp $(srcdir)/xorgconf.cpp $@
diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am
index 3e97490..877ab8b 100644
--- a/hw/xnest/Makefile.am
+++ b/hw/xnest/Makefile.am
@@ -89,4 +89,4 @@ SUFFIXES += .$(APP_MAN_SUFFIX) .man
$(LN_S) $< $@
relink:
- rm -f Xnest$(EXEEXT) && $(MAKE) Xnest$(EXEEXT)
+ $(AM_V_at)rm -f Xnest$(EXEEXT) && $(MAKE) Xnest$(EXEEXT)
diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
index 6d8f823..88bbf8b 100644
--- a/hw/xwin/Makefile.am
+++ b/hw/xwin/Makefile.am
@@ -224,4 +224,4 @@ EXTRA_DIST = \
xlaunch/window/wizard.h
relink:
- rm -f XWin$(EXEEXT) && $(MAKE) XWin$(EXEEXT)
+ $(AM_V_at)rm -f XWin$(EXEEXT) && $(MAKE) XWin$(EXEEXT)
--
1.6.6.1
More information about the xorg-devel
mailing list