diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-30 16:18:13 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-30 16:18:13 -0200 |
| commit | 01d3c39088a7caa90fdd1ad75c44d1f4464ee809 (patch) | |
| tree | ae49f9bdea6b0469a7f01671419d44180a249b67 | |
| parent | 51703b6050ee1e7b88a3eead1e2737ffc2dda924 (diff) | |
Janitor: ansification, make distcheck, compiler warnings.
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | include/X11/.gitignore | 1 | ||||
| -rw-r--r-- | src/.gitignore | 6 | ||||
| -rw-r--r-- | src/xpapputil.c | 1 |
6 files changed, 16 insertions, 14 deletions
@@ -1,3 +1,5 @@ +.deps +.libs aclocal.m4 autom4te.cache compile @@ -19,3 +21,9 @@ mkinstalldirs stamp-h1 xprintapputil.pc *~ +*.o +*.la +*.lo +libXprintAppUtil-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 9112ac2..b28ef20 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,15 +24,12 @@ SUBDIRS = src pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xprintapputil.pc -EXTRA_DIST = xprintapputil.pc.in autogen.sh - - -EXTRA_DIST += ChangeLog +EXTRA_DIST = xprintapputil.pc.in ChangeLog 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 20f854d..e6e9751 100644 --- a/configure.ac +++ b/configure.ac @@ -27,19 +27,24 @@ AC_INIT(libXprintAppUtil, 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?pro 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) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL +XORG_CWARNFLAGS # Check for dependencies PKG_CHECK_MODULES(XPRINTAPPUTIL, x11 xp xprintutil printproto xau) - +XPRINTAPPUTIL_CFLAGS="$CWARNFLAGS $XPRINTAPPUTIL_CFLAGS" AC_SUBST(XPRINTAPPUTIL_CFLAGS) AC_SUBST(XPRINTAPPUTIL_LIBS) XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile diff --git a/include/X11/.gitignore b/include/X11/.gitignore deleted file mode 100644 index 44389c5..0000000 --- a/include/X11/.gitignore +++ /dev/null @@ -1 +0,0 @@ -XprintAppUtil diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 0d5f4dd..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -libXprintAppUtil.la -*.lo -Makefile -Makefile.in diff --git a/src/xpapputil.c b/src/xpapputil.c index aaf918c..c873877 100644 --- a/src/xpapputil.c +++ b/src/xpapputil.c @@ -376,7 +376,6 @@ XpauSetPageValues( XpauContext *context, XpauFlags valuemask, XpauPageValues *pa XpAuErrorValue XpauStartJob( XpauContext *context, const char *printerfile ) { - void *handle; XpAuErrorValue result = XpAuError_unspecified_error; XPAU_RETURN_IF_FAIL(context->inJob == False, XpAuError_inside_job); |