aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/Makefile.in
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-04-02 12:30:48 +0000
committermarha <marha@users.sourceforge.net>2010-04-02 12:30:48 +0000
commit1d59691fe77c20ecb010ea8589a940c4ea6ac356 (patch)
treed1ee8df3981303c35e46905c9df26203bb232973 /xorg-server/hw/xfree86/Makefile.in
parent0be07f8b067afad77df8cac086b43f6d213fbe20 (diff)
downloadvcxsrv-1d59691fe77c20ecb010ea8589a940c4ea6ac356.tar.gz
vcxsrv-1d59691fe77c20ecb010ea8589a940c4ea6ac356.tar.bz2
vcxsrv-1d59691fe77c20ecb010ea8589a940c4ea6ac356.zip
Updated to following packages:
pixman-0.18.0 xorg-server-1.8.0
Diffstat (limited to 'xorg-server/hw/xfree86/Makefile.in')
-rw-r--r--xorg-server/hw/xfree86/Makefile.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/Makefile.in b/xorg-server/hw/xfree86/Makefile.in
index ca37434b7..42573c897 100644
--- a/xorg-server/hw/xfree86/Makefile.in
+++ b/xorg-server/hw/xfree86/Makefile.in
@@ -160,6 +160,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@
@@ -315,7 +316,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@
@@ -347,6 +348,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@
@@ -1023,7 +1025,7 @@ install-exec-local: install-binPROGRAMS
@INSTALL_SETUID_TRUE@ chmod u+s $(DESTDIR)$(bindir)/Xorg
relink:
- rm -f Xorg && $(MAKE) Xorg
+ $(AM_V_at)rm -f Xorg && $(MAKE) Xorg
xorg.conf.example.pre: xorgconf.cpp
cp $(srcdir)/xorgconf.cpp $@