diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | xlsatoms.c | 2 |
4 files changed, 14 insertions, 2 deletions
@@ -18,3 +18,7 @@ stamp-h1 xlsatoms xlsatoms.1 *~ +*.o +xlsatoms-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 95b755d..ce4ef71 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 12c053a..a7262df 100644 --- a/configure.ac +++ b/configure.ac @@ -26,17 +26,25 @@ AC_INIT(xlsatoms,[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(XLSATOMS, x11 xmuu) +XLSATOMS_CFLAGS="$CWARNFLAGS $XLSATOMS_CFLAGS" AC_SUBST(XLSATOMS_CFLAGS) AC_SUBST(XLSATOMS_LIBS) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) @@ -34,7 +34,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xproto.h> #include <X11/Xmu/Error.h> -char *ProgramName; +static char *ProgramName; static void do_name ( Display *dpy, char *format, char *name ); static int parse_range ( char *range, long *lowp, long *highp ); |