diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-07-27 19:02:39 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-07-27 19:02:39 +0000 |
| commit | 269d40cbcc43b41f621ca6d91c182952f60ec48e (patch) | |
| tree | 872f2fddd3f2207e57a28595e73886713ce4a77a /xserver/Makefile.am | |
| parent | 917a2249b787451cad3f9697872aeccfd0da3324 (diff) | |
Update to xserver 1.8. Tested by many. Ok oga@, todd@.
Diffstat (limited to 'xserver/Makefile.am')
| -rw-r--r-- | xserver/Makefile.am | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/xserver/Makefile.am b/xserver/Makefile.am index c605e87bc..8b7a2c8b4 100644 --- a/xserver/Makefile.am +++ b/xserver/Makefile.am @@ -1,5 +1,5 @@ -AUTOMAKE_OPTIONS=dist-bzip2 foreign nostdinc -DISTCHECK_CONFIGURE_FLAGS=--disable-xorgcfg +AUTOMAKE_OPTIONS=nostdinc +ACLOCAL_AMFLAGS = -I m4 if COMPOSITE COMPOSITE_DIR=composite @@ -38,27 +38,35 @@ SUBDIRS = \ $(GLX_DIR) \ exa \ config \ - hw + hw \ + test +if XORG aclocaldir = $(datadir)/aclocal aclocal_DATA = xorg-server.m4 pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xorg-server.pc +endif + +EXTRA_DIST = xorg-server.pc.in xorg-server.m4 autogen.sh -EXTRA_DIST = xorg-server.pc.in xorg-server.m4 ChangeLog autogen.sh +DISTCHECK_CONFIGURE_FLAGS=\ + --with-xkb-path=$(XKB_BASE_DIRECTORY) \ + --with-xkb-bin-directory=$(XKB_BIN_DIRECTORY) \ + --with-xkb-output='$${datadir}/X11/xkb/compiled' -MAINTAINERCLEANFILES=ChangeLog +DISTCLEANFILES = doltcompile doltlibtool -DISTCLEANFILES = doltlibtool doltcompile +.PHONY: ChangeLog INSTALL -.PHONY: ChangeLog +INSTALL: + $(INSTALL_CMD) 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 +dist-hook: ChangeLog INSTALL DIST_SUBDIRS = \ doc \ @@ -81,8 +89,9 @@ DIST_SUBDIRS = \ glx \ exa \ config \ - hw + hw \ + test # gross hack relink: all - $(MAKE) -C hw relink + $(AM_V_at)$(MAKE) -C hw relink |