diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-29 16:33:40 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-29 16:33:40 -0200 |
| commit | a2e8bc500dfad18ab161b3a7be44cf6fa15f140f (patch) | |
| tree | 73097e8c91ca82068779128fbfa3c649e465100d | |
| parent | f467d17ae5a89aa1a2b8c7260334f41e8ee2d08c (diff) | |
Janitor: Correct make distcheck and compiler warnings.
| -rw-r--r-- | .gitignore | 10 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | man/.gitignore | 3 | ||||
| -rw-r--r-- | src/.gitignore | 6 | ||||
| -rw-r--r-- | src/XMultibuf.c | 2 |
6 files changed, 19 insertions, 16 deletions
@@ -1,3 +1,5 @@ +.deps +.libs aclocal.m4 autom4te.cache compile @@ -17,6 +19,14 @@ Makefile.in MakeOut missing mkinstalldirs +shadows.DONE stamp-h1 xext.pc *~ +*.o +*.la +*.lo +*.3* +libXext-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 611f6b3..bdcd5e2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,13 +3,13 @@ SUBDIRS = man src pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xext.pc -EXTRA_DIST=xext.pc.in ChangeLog autogen.sh +EXTRA_DIST=xext.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 383c0ee..a308ddd 100644 --- a/configure.ac +++ b/configure.ac @@ -12,12 +12,11 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT +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]) -# 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) - # Determine .so library version per platform # based on SharedXextRev in monolith xc/config/cf/*Lib.tmpl AC_CANONICAL_HOST @@ -33,9 +32,11 @@ AC_SUBST(XEXT_SOREV) # Checks for programs. AC_PROG_LIBTOOL AC_PROG_CC +XORG_CWARNFLAGS # Checks for pkg-config packages PKG_CHECK_MODULES(XEXT, [xproto >= 7.0.13] [x11 >= 1.1.99.1] [xextproto >= 7.0.3] xau) +XEXT_CFLAGS="$CWARNFLAGS $XEXT_CFLAGS" AC_SUBST(XEXT_CFLAGS) AC_SUBST(XEXT_LIBS) @@ -46,6 +47,7 @@ AC_HEADER_STDC XORG_CHECK_MALLOC_ZERO XORG_RELEASE_VERSION +XORG_CHANGELOG # Man page processing requirements XORG_PROG_RAWCPP diff --git a/man/.gitignore b/man/.gitignore deleted file mode 100644 index 2d0f344..0000000 --- a/man/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -Makefile.in -*.3* diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 3c22f6d..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -libXext.la -*.lo -Makefile -Makefile.in diff --git a/src/XMultibuf.c b/src/XMultibuf.c index 106f2c4..a8cb295 100644 --- a/src/XMultibuf.c +++ b/src/XMultibuf.c @@ -634,7 +634,7 @@ Window XmbufCreateStereoWindow ( req->borderWidth = border_width; req->depth = depth; req->class = class; - if (visual == CopyFromParent) + if (visual == (Visual *)CopyFromParent) req->visual = CopyFromParent; else req->visual = visual->visualid; |