diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-15 18:33:52 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-15 18:33:52 -0200 |
| commit | 4d6dc1290de14f23fe40e61b37d4c9b96e517958 (patch) | |
| tree | a6a32657c692bc1a39d62c5fcc49621bc505e5d2 | |
| parent | 3c13b4d1e7d143149cfb34e1771cb28f903be2e2 (diff) | |
Ansification and compile warning fixes.
This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
make distcheck. There weren't any gcc 4.3 and sparse warnings.
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 8 |
3 files changed, 13 insertions, 1 deletions
@@ -18,3 +18,7 @@ install-sh missing stamp-h1 *~ +*.o +fstobdf-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index d543e74..c91c05e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -72,6 +72,6 @@ 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 ad0103a..94b6c6d 100644 --- a/configure.ac +++ b/configure.ac @@ -26,17 +26,25 @@ AC_INIT(fstobdf,[1.0.3], [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) AC_PROG_CC AC_PROG_INSTALL +XORG_CWARNFLAGS + # Checks for pkg-config packages PKG_CHECK_MODULES(FSTOBDF, x11 libfs) +FSTOBDF_CFLAGS="$CWARNFLAGS $FSTOBDF_CFLAGS" AC_SUBST(FSTOBDF_CFLAGS) AC_SUBST(FSTOBDF_LIBS) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) |