diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 14 |
3 files changed, 18 insertions, 6 deletions
@@ -18,3 +18,7 @@ stamp-h1 xmodmap xmodmap.1 *~ +*.o +xmodmap-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 6c43dd3..905e023 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,8 +21,8 @@ bin_PROGRAMS = xmodmap -AM_CFLAGS = $(DEP_CFLAGS) -xmodmap_LDADD = $(DEP_LIBS) +AM_CFLAGS = $(XMODMAP_CFLAGS) +xmodmap_LDADD = $(XMODMAP_LIBS) xmodmap_SOURCES = \ exec.c \ @@ -76,7 +76,7 @@ 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 1b567d7..6f8dca5 100644 --- a/configure.ac +++ b/configure.ac @@ -26,22 +26,30 @@ AC_INIT(xmodmap,[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 + AC_CHECK_FUNCS([strncasecmp]) # Checks for pkg-config packages -PKG_CHECK_MODULES(DEP, x11) -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +PKG_CHECK_MODULES(XMODMAP, x11) +XMODMAP_CFLAGS="$CWARNFLAGS $XMODMAP_CFLAGS" +AC_SUBST(XMODMAP_CFLAGS) +AC_SUBST(XMODMAP_LIBS) dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) |