diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-29 15:53:25 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-29 15:53:25 -0200 |
| commit | d85ec4590ae344f8944b8ee02aa086c3d33edc12 (patch) | |
| tree | 13c3d665b896f0f1c583326e381ccabd73fadcd5 | |
| parent | 85dfcde3b46083a1d71c8520afa611e04d8754c1 (diff) | |
Janitor: make distcheck, remove extra .gitignore files.
| -rw-r--r-- | .gitignore | 10 | ||||
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | man/.gitignore | 4 | ||||
| -rw-r--r-- | src/.gitignore | 6 |
5 files changed, 18 insertions, 16 deletions
@@ -1,3 +1,5 @@ +.deps +.libs aclocal.m4 autom4te.cache compile @@ -21,3 +23,11 @@ mkinstalldirs stamp-h1 xevie.pc *~ +*.o +*.la +*.lo +*.3 +*.3x +libXevie-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 1fd180a..51643ac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,18 +1,14 @@ -AM_CFLAGS = $(XEVIE_CFLAGS) $(X_CFLAGS) - SUBDIRS = src man pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xevie.pc -EXTRA_DIST = xevie.pc.in autogen.sh - -EXTRA_DIST += ChangeLog +EXTRA_DIST = xevie.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 07856ec..c6e6283 100644 --- a/configure.ac +++ b/configure.ac @@ -6,20 +6,26 @@ AC_INIT(libXevie, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xor AM_INIT_AUTOMAKE([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(config.h) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL +XORG_CWARNFLAGS # Checks for pkg-config packages PKG_CHECK_MODULES(XEVIE, xproto x11 xextproto xext evieproto) +XEVIE_CFLAGS="$CWARNFLAGS $XEVIE_CFLAGS" AC_SUBST(XEVIE_CFLAGS) AC_SUBST(XEVIE_LIBS) 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 5b1becf..0000000 --- a/man/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -*.3 -*.3x diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 32286c0..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -libXevie.la -*.lo -Makefile -Makefile.in |