summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-21 18:52:49 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-21 18:52:49 -0200
commite2632d4fbde443d1127055267b8772e2cc82f73d (patch)
tree7e1760595eac78b224b0f8a83754cda277941e62
parentfd48b87c3694d037fc8c1b9f3056677e57fd17ab (diff)
Correct make distcheck and sparse warnings.
-rw-r--r--.gitignore4
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac8
-rw-r--r--xgamma.c6
4 files changed, 16 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index e5cde4d..7aad431 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,7 @@ stamp-h1
xgamma
xgamma.1
*~
+*.o
+xgamma-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 5a0b40f..bd6c420 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 a6b0f59..dd51d09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,17 +26,25 @@ AC_INIT(xgamma,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
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(XGAMMA, x11 xxf86vm)
+XGAMMA_CFLAGS="$CWARNFLAGS $XGAMMA_CFLAGS"
AC_SUBST(XGAMMA_CFLAGS)
AC_SUBST(XGAMMA_LIBS)
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile])
diff --git a/xgamma.c b/xgamma.c
index ac210a0..aa28d01 100644
--- a/xgamma.c
+++ b/xgamma.c
@@ -32,9 +32,9 @@
#include <ctype.h>
#include <stdlib.h>
-char *ProgramName;
-int MajorVersion, MinorVersion;
-int EventBase, ErrorBase;
+static char *ProgramName;
+static int MajorVersion, MinorVersion;
+static int EventBase, ErrorBase;
/* Minimum extension version required */
#define MINMAJOR 2