diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-29 15:41:23 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-29 15:41:23 -0200 |
| commit | 0a48e5c663bf2ec3f6870bf9e9cfa90dfddd6fe6 (patch) | |
| tree | 0628ce1bf4b8d8a3174838d82a05800987588756 | |
| parent | 0ca7d78aeb8035ef52c1415170e1257493d789fd (diff) | |
Janitor: Correct make distcheck and compiler warnings.
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/Xdamage.c | 3 |
4 files changed, 15 insertions, 8 deletions
@@ -19,3 +19,9 @@ mkinstalldirs stamp-h1 xdamage.pc *~ +*.o +*.la +*.lo +libXdamage-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 358e7f5..035894a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,8 +21,6 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -AM_CFLAGS = $(XDAMAGE_CFLAGS) $(X_CFLAGS) - SUBDIRS = src INCLUDES = $(top_srcdir)/include/ @@ -30,7 +28,7 @@ INCLUDES = $(top_srcdir)/include/ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xdamage.pc -EXTRA_DIST = xdamage.pc.in autogen.sh +EXTRA_DIST = xdamage.pc.in EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog @@ -38,6 +36,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 040eda2..e83c4c0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,4 @@ dnl -dnl $Id$ -dnl dnl Copyright © 2003 Keith Packard, Noah Levitt dnl dnl Permission to use, copy, modify, distribute, and sell this software and its @@ -36,11 +34,15 @@ AC_INIT(libXdamage, 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=x 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 X PKG_CHECK_MODULES(X, x11, @@ -87,9 +89,11 @@ fi DAMAGEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] AC_SUBST(DAMAGEEXT_VERSION) PKG_CHECK_MODULES(XDAMAGE, [damageproto >= $DAMAGEEXT_VERSION] xfixes fixesproto xextproto) +XDAMAGE_CFLAGS="$CWARNFLAGS $XDAMAGE_CFLAGS" AC_SUBST(XDAMAGE_CFLAGS) XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile diff --git a/src/Xdamage.c b/src/Xdamage.c index a3966d6..174bb09 100644 --- a/src/Xdamage.c +++ b/src/Xdamage.c @@ -89,7 +89,7 @@ XDamageExtAddDisplay (XDamageExtInfo *extinfo, UnlockDisplay (dpy); SyncHandle (); Xfree(info); - return 0; + return NULL; } info->major_version = rep.majorVersion; info->minor_version = rep.minorVersion; @@ -372,7 +372,6 @@ XDamageAdd (Display *dpy, Drawable drawable, XserverRegion region) { XDamageExtDisplayInfo *info = XDamageFindDisplay (dpy); xDamageAddReq *req; - int len; XDamageSimpleCheckExtension (dpy, info); LockDisplay (dpy); |