diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-04-09 17:41:59 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-04-09 17:41:59 -0700 |
| commit | 8ce50a587505b6aa03ad6cde8a958b0a0040073d (patch) | |
| tree | 82f6c4434c36ccc3b2db614de43d5fa7c0a730f5 | |
| parent | fbaa81a026aaaf8029487c4e960ef4b8bf58d055 (diff) | |
Use XORG_CWARNFLAGS instead of hardcoding -Wall in Makefile.am
Also switch changelog generation rule to XORG_CHANGELOG
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 93edbf3..c9c2ccd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = doc -AM_CFLAGS = @XLIB_CFLAGS@ -Wall +AM_CFLAGS = @XLIB_CFLAGS@ $(CWARNFLAGS) sbin_PROGRAMS = mkcomposecache EXTRA_DIST = ChangeLog mkallcomposecaches.sh @@ -14,7 +14,7 @@ MAINTAINERCLEANFILES = Makefile.in configure aclocal.m4 config.h.in depcomp inst .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 d93d690..d992d63 100644 --- a/configure.ac +++ b/configure.ac @@ -8,8 +8,12 @@ AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros 1.2 for 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) AC_PROG_CC +XORG_CWARNFLAGS AC_PROG_INSTALL PKG_CHECK_MODULES(XLIB, x11) @@ -18,8 +22,9 @@ AC_CHECK_HEADERS([stdio.h stdlib.h string.h unistd.h locale.h], , [AC_MSG_FAILUR AC_CHECK_FUNCS([setlocale], , [AC_MSG_FAILURE("cannot find essential function")]) AC_CHECK_FUNCS([unsetenv]) - AC_SUBST(XLIB_CFLAGS) AC_SUBST(XLIB_LIBS) +XORG_CHANGELOG + AC_OUTPUT([Makefile doc/Makefile]) |