summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac6
3 files changed, 12 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 850c435..249516d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,7 @@ stamp-h1
xstdcmap
xstdcmap.1
*~
+*.o
+xstdcmap-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index e94f275..7446db7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = xstdcmap
-xstdcmap_CFLAGS = $(XSTDCMAP_CFLAGS) -D_BSD_SOURCE
+AM_CFLAGS = $(XSTDCMAP_CFLAGS) -D_BSD_SOURCE
xstdcmap_LDADD = $(XSTDCMAP_LIBS)
xstdcmap_SOURCES = \
@@ -68,6 +68,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 f5c57e7..8e8f45a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,17 +26,23 @@ AC_INIT(xstdcmap,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xo
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(XSTDCMAP, xmu x11)
+XSTDCMAP_CFLAGS="$CWARNFLAGS $XSTDCMAP_CFLAGS"
AC_SUBST(XSTDCMAP_CFLAGS)
AC_SUBST(XSTDCMAP_LIBS)
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile])