diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-26 16:48:20 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-26 16:48:20 -0200 |
| commit | 7fd999e0a872bd931f5a156ed87e4849f81c575b (patch) | |
| tree | e657384b2401ae9656ccf9c990765cee131abedb | |
| parent | 4511de27ac11c62fc9f5cedce1bfffcdbe73e8f7 (diff) | |
Correct make distcheck and sparse warnings.
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | xrefresh.c | 6 |
4 files changed, 16 insertions, 5 deletions
@@ -18,3 +18,7 @@ stamp-h1 xrefresh xrefresh.1 *~ +*.o +xrefresh-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 2857de3..d172e64 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = xrefresh -xrefresh_CFLAGS = $(XREFRESH_CFLAGS) +AM_CFLAGS = $(XREFRESH_CFLAGS) xrefresh_LDADD = $(XREFRESH_LIBS) xrefresh_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 df67f14..a01c74b 100644 --- a/configure.ac +++ b/configure.ac @@ -26,17 +26,24 @@ AC_INIT(xrefresh,[1.0.2], [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(XREFRESH, x11) +XREFRESH_CFLAGS="$CWARNFLAGS $XREFRESH_CFLAGS" AC_SUBST(XREFRESH_CFLAGS) AC_SUBST(XREFRESH_LIBS) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) @@ -62,9 +62,9 @@ SOFTWARE. #include <ctype.h> #include <stdlib.h> -Window win; +static Window win; -char *ProgramName; +static char *ProgramName; static void Syntax(void) @@ -142,7 +142,7 @@ isabbreviation(char *arg, char *s, int minslen) enum e_action {doDefault, doBlack, doWhite, doSolid, doNone, doRoot}; -struct s_pair { +static struct s_pair { char *resource_name; enum e_action action; } pair_table[] = { |