diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-22 15:52:43 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-22 15:52:43 -0200 |
| commit | bc6a081e2d51bf41c9c4e2f02b82601a7bd4a33e (patch) | |
| tree | 6d3409706e8d0f13493622471c83f11f262047e5 | |
| parent | e5161d278fcfbf7ec3c4a73b6580993ad563e7ea (diff) | |
Correct make distcheck and sparse warnings.
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | xlsclients.c | 2 |
4 files changed, 14 insertions, 2 deletions
@@ -18,3 +18,7 @@ stamp-h1 xlsclients xlsclients.1 *~ +*.o +xlsclients-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index acfcc54..c467aca 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 ea00927..4e9164a 100644 --- a/configure.ac +++ b/configure.ac @@ -26,17 +26,25 @@ AC_INIT(xlsclients,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product= 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(XLSCLIENTS, x11 xmuu) +XLSCLIENTS_CFLAGS="$CWARNFLAGS $XLSCLIENTS_CFLAGS" AC_SUBST(XLSCLIENTS_CFLAGS) AC_SUBST(XLSCLIENTS_LIBS) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) diff --git a/xlsclients.c b/xlsclients.c index 3effbf4..0b6fc15 100644 --- a/xlsclients.c +++ b/xlsclients.c @@ -37,7 +37,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xutil.h> #include <X11/Xmu/WinUtil.h> -char *ProgramName; +static char *ProgramName; static void lookat ( Display *dpy, Window root, Bool verbose, int maxcmdlen ); static void print_client_properties ( Display *dpy, Window w, |