summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-22 17:47:55 (GMT)
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-22 17:47:55 (GMT)
commit9eeccfd4c9019f8c15ddcf4f6204c82335d4cadd (patch)
treee68b5124e62a3b6b414f8f8085d166fe964b52c4
parente14ae0d017094ce463837c89098e4e07fef5524b (diff)
downloadxlsatoms-9eeccfd4c9019f8c15ddcf4f6204c82335d4cadd.zip
xlsatoms-9eeccfd4c9019f8c15ddcf4f6204c82335d4cadd.tar.gz
xlsatoms-9eeccfd4c9019f8c15ddcf4f6204c82335d4cadd.tar.bz2
Correct make distcheck and sparse warnings.
-rw-r--r--.gitignore4
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac8
-rw-r--r--xlsatoms.c2
4 files changed, 14 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index fca861d..d157345 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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])
diff --git a/xlsatoms.c b/xlsatoms.c
index 5411611..6e09b21 100644
--- a/xlsatoms.c
+++ b/xlsatoms.c
@@ -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 );