aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/exa
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/hw/xfree86/exa
parent8def4a30414ae76e228f285ccab8bba6de083d08 (diff)
downloadvcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.tar.gz
vcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.tar.bz2
vcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.zip
svn merge -r522:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/exa')
-rw-r--r--xorg-server/hw/xfree86/exa/Makefile.am4
-rw-r--r--xorg-server/hw/xfree86/exa/Makefile.in8
2 files changed, 7 insertions, 5 deletions
diff --git a/xorg-server/hw/xfree86/exa/Makefile.am b/xorg-server/hw/xfree86/exa/Makefile.am
index 9eb2e1797..da9b720d7 100644
--- a/xorg-server/hw/xfree86/exa/Makefile.am
+++ b/xorg-server/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/xorg-server/hw/xfree86/exa/Makefile.in b/xorg-server/hw/xfree86/exa/Makefile.in
index 22c176a08..b9ef15a49 100644
--- a/xorg-server/hw/xfree86/exa/Makefile.in
+++ b/xorg-server/hw/xfree86/exa/Makefile.in
@@ -132,6 +132,7 @@ APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
+ARM_BACKTRACE_CFLAGS = @ARM_BACKTRACE_CFLAGS@
AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -287,7 +288,7 @@ PS2PDF = @PS2PDF@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
-SED = sed
+SED = @SED@
SELINUX_CFLAGS = @SELINUX_CFLAGS@
SELINUX_LIBS = @SELINUX_LIBS@
SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@
@@ -319,6 +320,7 @@ XDMX_SYS_LIBS = @XDMX_SYS_LIBS@
XEPHYR_CFLAGS = @XEPHYR_CFLAGS@
XEPHYR_INCS = @XEPHYR_INCS@
XEPHYR_LIBS = @XEPHYR_LIBS@
+XF86CONFIGDIR = @XF86CONFIGDIR@
XF86CONFIGFILE = @XF86CONFIGFILE@
XF86VIDMODE_CFLAGS = @XF86VIDMODE_CFLAGS@
XF86VIDMODE_LIBS = @XF86VIDMODE_LIBS@
@@ -819,8 +821,8 @@ uninstall-am: uninstall-drivermanDATA uninstall-moduleLTLIBRARIES
$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
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)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.