diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-03-24 17:25:56 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-03-24 19:52:15 -0700 |
| commit | e3bc51e4ea2dce1901c4f7ce43df2f456ececdcf (patch) | |
| tree | a1d98585821e5fa3108a44cb594e4062e8ae054f | |
| parent | cc3112b6d0434d8e7ecbe3832a5aa48cd0f5185d (diff) | |
Use XORG_CHANGELOG, XORG_CWARNFLAGS, and XORG_WITH_LINT macros
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 17 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index d01b5ee..1282d15 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,6 +15,7 @@ makedepend_SOURCES = include.c \ imakemdep.h AM_CPPFLAGS = -DOBJSUFFIX=\".${OBJEXT}\" -DINCLUDEDIR=\"/usr/include\" +AM_CFLAGS = $(CWARNFLAGS) EXTRA_DIST = autogen.sh makedepend.man @@ -57,6 +58,14 @@ 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 + +if LINT +ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) + +lint: + $(LINT) $(ALL_LINT_FLAGS) $(makedepend_SOURCES) +endif LINT diff --git a/configure.ac b/configure.ac index f9cbd07..6a82b03 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,16 @@ -dnl $XdotOrg: $ AC_PREREQ([2.57]) AC_INIT([makedepend], [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_CONFIG_HEADER([makedepend-config.h]) +# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) + dnl Checks for programs. AC_PROG_CC +XORG_CWARNFLAGS +XORG_WITH_LINT dnl Replacement for Imake SIGNAL_DEFINES AC_TYPE_SIGNAL @@ -22,5 +27,6 @@ AC_SUBST(X_CFLAGS) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) |