diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-02-02 18:02:43 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-02-02 18:02:43 -0200 |
| commit | 61ad1d4470491bd49484de0b6e4eb65a7a51c799 (patch) | |
| tree | 2f8d5c5d1c960550ab115e6f7217e17120e91436 | |
| parent | 482471e4fe445da6d5307d3a16e53de6afa143e8 (diff) | |
Janitor: Correct make distcheck and minor configure.ac cleanup.
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
4 files changed, 18 insertions, 11 deletions
@@ -27,3 +27,7 @@ libtool ltmain.sh missing stamp-h1 +*.4 +xf86-input-acecad-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index af2effb..6a0325e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,14 +20,12 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man - -EXTRA_DIST = autogen.sh ChangeLog - -CLEANFILES = ChangeLog +EXTRA_DIST = ChangeLog +MAINTAINERCLEANFILES = ChangeLog .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 diff --git a/configure.ac b/configure.ac index 392921e..e87d22c 100644 --- a/configure.ac +++ b/configure.ac @@ -32,15 +32,16 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -DRIVER_NAME=acecad -AC_SUBST([DRIVER_NAME]) - +# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) AM_CONFIG_HEADER([config.h]) # Checks for programs. AC_DISABLE_STATIC AC_PROG_LIBTOOL AC_PROG_CC +XORG_CWARNFLAGS AH_TOP([#include "xorg-server.h"]) @@ -77,9 +78,7 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES) sdkdir=$(pkg-config --variable=sdkdir xorg-server) - -CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' -AC_SUBST([CFLAGS]) +XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS" # Checks for libraries. @@ -94,7 +93,11 @@ if test x$HAVE_LIBSYSFS = xyes; then fi AM_CONDITIONAL(HAVE_LIBSYSFS, test x$HAVE_LIBSYSFS = xyes) +DRIVER_NAME=acecad +AC_SUBST([DRIVER_NAME]) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile man/Makefile]) diff --git a/src/Makefile.am b/src/Makefile.am index 65b449b..fd1a098 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,6 +24,8 @@ # -avoid-version prevents gratuitous .0.0.0 version numbers on the end # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. +AM_CFLAGS = $(XORG_CFLAGS) + @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la @DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version |