aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 19:39:46 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 19:39:46 +0000
commit4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (patch)
treec1e02b9d3509aa97703aa4b540d4cd22ec4600ed /xorg-server/Makefile.am
parentdc3c299dd0995549e2a6973ca0f25b254afd38a5 (diff)
downloadvcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.tar.gz
vcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.tar.bz2
vcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.zip
Added xorg-server-1.6.2.tar.gz
Diffstat (limited to 'xorg-server/Makefile.am')
-rw-r--r--xorg-server/Makefile.am31
1 files changed, 3 insertions, 28 deletions
diff --git a/xorg-server/Makefile.am b/xorg-server/Makefile.am
index 86b5c9c64..c605e87bc 100644
--- a/xorg-server/Makefile.am
+++ b/xorg-server/Makefile.am
@@ -5,23 +5,6 @@ if COMPOSITE
COMPOSITE_DIR=composite
endif
-if XTRAP
-XTRAP_DIR=XTrap
-endif
-
-if CFB
-CFB_DIR=cfb
-CFB32_DIR=cfb32
-endif
-
-if AFB
-AFB_DIR=afb
-endif
-
-if MFB
-MFB_DIR=mfb
-endif
-
if GLX
GLX_DIR=glx
endif
@@ -48,14 +31,9 @@ SUBDIRS = \
Xi \
xkb \
$(DBE_DIR) \
- $(MFB_DIR) \
- $(AFB_DIR) \
- $(CFB_DIR) \
- $(CFB32_DIR) \
$(RECORD_DIR) \
xfixes \
damageext \
- $(XTRAP_DIR) \
$(COMPOSITE_DIR) \
$(GLX_DIR) \
exa \
@@ -72,10 +50,12 @@ EXTRA_DIST = xorg-server.pc.in xorg-server.m4 ChangeLog autogen.sh
MAINTAINERCLEANFILES=ChangeLog
+DISTCLEANFILES = doltlibtool doltcompile
+
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || \
+ (GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || \
(touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
dist-hook: ChangeLog
@@ -94,14 +74,9 @@ DIST_SUBDIRS = \
Xi \
xkb \
dbe \
- mfb \
- afb \
- cfb \
- cfb32 \
record \
xfixes \
damageext \
- XTrap \
composite \
glx \
exa \