diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-26 18:12:56 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-26 18:12:56 -0200 |
| commit | 67c87156d9bf8c7f520106c9e2fa786f3d21eaa2 (patch) | |
| tree | 1e3282c429e75da9014a5cb488a6d8a3fe184a23 | |
| parent | ba9fbd14258ab44c794bb1a6dd9af51c5f4c01ff (diff) | |
Correct make distcheck and sparse warnings.
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | xsetroot.c | 20 |
4 files changed, 26 insertions, 16 deletions
@@ -17,4 +17,10 @@ iceauth.1 install-sh missing stamp-h1 +xsetroot +xsetroot.1 *~ +*.o +xsetroot-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 6cbb67e..9863fb9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,7 +35,7 @@ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh +EXTRA_DIST = $(appman_PRE) ChangeLog CLEANFILES = $(appman_DATA) MAINTAINERCLEANFILES = ChangeLog @@ -43,7 +43,7 @@ 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 42a7dab..2ca2ddd 100644 --- a/configure.ac +++ b/configure.ac @@ -26,22 +26,26 @@ AC_INIT(xsetroot,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xo AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -AM_CONFIG_HEADER(config.h) +# Require xorg-macros: XORG_WITH_LINT, 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) -# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.1) +AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_INSTALL +XORG_CWARNFLAGS + # Checks for pkg-config packages PKG_CHECK_MODULES(XSETROOT, xmuu x11 xbitmaps) +XSETROOT_CFLAGS="$CWARNFLAGS $XSETROOT_CFLAGS" AC_SUBST(XSETROOT_CFLAGS) AC_SUBST(XSETROOT_LIBS) XORG_WITH_LINT XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) @@ -45,16 +45,16 @@ in this Software without prior written authorization from The Open Group. #define Dynamic 1 -char *program_name; -Display *dpy; -int screen; -Window root; -char *fore_color = NULL; -char *back_color = NULL; -int reverse = 0; -int save_colors = 0; -int unsave_past = 0; -Pixmap save_pixmap = (Pixmap)None; +static char *program_name; +static Display *dpy; +static int screen; +static Window root; +static char *fore_color = NULL; +static char *back_color = NULL; +static int reverse = 0; +static int save_colors = 0; +static int unsave_past = 0; +static Pixmap save_pixmap = (Pixmap)None; static void usage(void); static void FixupState(void); |