aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-04-02 13:46:21 +0000
committermarha <marha@users.sourceforge.net>2010-04-02 13:46:21 +0000
commit0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b (patch)
tree7f9e41630a661eaab39bef9023c2661a7281af96 /xorg-server/Makefile.am
parent8def4a30414ae76e228f285ccab8bba6de083d08 (diff)
downloadvcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.tar.gz
vcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.tar.bz2
vcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.zip
svn merge -r522:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/Makefile.am')
-rw-r--r--xorg-server/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/Makefile.am b/xorg-server/Makefile.am
index 667c0de72..8b7a2c8b4 100644
--- a/xorg-server/Makefile.am
+++ b/xorg-server/Makefile.am
@@ -94,4 +94,4 @@ DIST_SUBDIRS = \
# gross hack
relink: all
- $(MAKE) -C hw relink
+ $(AM_V_at)$(MAKE) -C hw relink