diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-02-02 14:22:44 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-02-02 14:22:44 -0200 |
| commit | 11ff34f811737514ded5231b73407d63a1baf68d (patch) | |
| tree | 16c6d20d5261e53003206c0f260d684a26ab1cbc | |
| parent | d5bcd25affa9df2d937f57fac914de4b6f740ae6 (diff) | |
Janitor: make distcheck and .gitignore.
| -rw-r--r-- | .gitignore | 12 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | man/.gitignore | 3 | ||||
| -rw-r--r-- | src/.gitignore | 9 |
5 files changed, 20 insertions, 16 deletions
@@ -1,7 +1,11 @@ +.deps +.libs aclocal.m4 autom4te.cache compile config.guess +config.h +config.h.in config.log config.status config.sub @@ -15,5 +19,13 @@ Makefile.in MakeOut missing mkinstalldirs +stamp-h1 xxf86dga.pc *~ +*.3 +*.o +*.la +*.lo +libXxf86dga-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 047d332..ad56a6c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,14 +3,12 @@ SUBDIRS = src man pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xxf86dga.pc -EXTRA_DIST = xxf86dga.pc.in autogen.sh - -EXTRA_DIST += ChangeLog +EXTRA_DIST = xxf86dga.pc.in 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 03939ac..c72affe 100644 --- a/configure.ac +++ b/configure.ac @@ -4,18 +4,24 @@ AC_INIT(libXxf86dga, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product= AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# 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(src/config.h) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL +XORG_CWARNFLAGS # Checks for pkg-config packages PKG_CHECK_MODULES(XXF86DGA, xproto x11 xextproto xext [xf86dgaproto >= 2.0.3]) +XXF86DGA_CFLAGS="$CWARNFLAGS $XXF86DGA_CFLAGS" XORG_CHECK_MALLOC_ZERO XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile diff --git a/man/.gitignore b/man/.gitignore deleted file mode 100644 index 2d0f344..0000000 --- a/man/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -Makefile.in -*.3* diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 3bd1d10..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -config.h -config.h.in -.deps -.libs -libXxf86dga.la -*.lo -Makefile -Makefile.in -stamp-h1 |