diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
| commit | 81f91c615982e50bb62708201569c33a3cd3d973 (patch) | |
| tree | 4f32ecc48a3b7b5e76642f3792338263c53879bd /xorg-server/Makefile.am | |
| parent | b571a562410f565af2bdde52d9f7f9a23ffae04f (diff) | |
| parent | a915739887477b28d924ecc8417ee107d125bd6c (diff) | |
| download | vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.gz vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.bz2 vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/Makefile.am')
| -rw-r--r-- | xorg-server/Makefile.am | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xorg-server/Makefile.am b/xorg-server/Makefile.am index c605e87bc..cf1469ff7 100644 --- a/xorg-server/Makefile.am +++ b/xorg-server/Makefile.am @@ -1,5 +1,5 @@ AUTOMAKE_OPTIONS=dist-bzip2 foreign nostdinc -DISTCHECK_CONFIGURE_FLAGS=--disable-xorgcfg +ACLOCAL_AMFLAGS = -I m4 if COMPOSITE COMPOSITE_DIR=composite @@ -38,7 +38,8 @@ SUBDIRS = \ $(GLX_DIR) \ exa \ config \ - hw + hw \ + test aclocaldir = $(datadir)/aclocal aclocal_DATA = xorg-server.m4 @@ -48,15 +49,13 @@ pkgconfig_DATA = xorg-server.pc EXTRA_DIST = xorg-server.pc.in xorg-server.m4 ChangeLog autogen.sh +DISTCLEANFILES = doltcompile doltlibtool 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) || \ - (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog @@ -81,7 +80,8 @@ DIST_SUBDIRS = \ glx \ exa \ config \ - hw + hw \ + test # gross hack relink: all |