diff options
| -rw-r--r-- | .gitignore | 9 | ||||
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | man/.gitignore | 3 | ||||
| -rw-r--r-- | src/.gitignore | 7 | ||||
| -rw-r--r-- | src/XScrnSaver.c | 2 |
6 files changed, 19 insertions, 19 deletions
@@ -1,3 +1,5 @@ +.deps +.libs aclocal.m4 autom4te.cache config.guess @@ -19,3 +21,10 @@ mkinstalldirs stamp-h1 xscrnsaver.pc *~ +*.3 +*.o +*.la +*.lo +libXScrnSaver-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 725a8e7..21196b9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,14 +24,13 @@ SUBDIRS = src man pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xscrnsaver.pc -EXTRA_DIST = xscrnsaver.pc.in autogen.sh ChangeLog - -CLEANFILES = ChangeLog +EXTRA_DIST = xscrnsaver.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 69cf670..3775c3a 100644 --- a/configure.ac +++ b/configure.ac @@ -29,17 +29,18 @@ AM_MAINTAINER_MODE 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) +# 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) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL +XORG_CWARNFLAGS # Check for dependencies PKG_CHECK_MODULES(XSCRNSAVER, x11 xext xextproto [scrnsaverproto >= 1.1]) - +XSCRNSAVER_CFLAGS="$CWARNFLAGS $XSCRNSAVER_CFLAGS" AC_SUBST(XSCRNSAVER_CFLAGS) AC_SUBST(XSCRNSAVER_LIBS) @@ -50,6 +51,7 @@ XORG_LINT_LIBRARY([Xss]) XORG_CHECK_MALLOC_ZERO XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile 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 d0f3e44..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -.deps -.libs -libXScrnSaver.la -*.la -*.lo -Makefile -Makefile.in diff --git a/src/XScrnSaver.c b/src/XScrnSaver.c index 1e3fe70..0bbdc60 100644 --- a/src/XScrnSaver.c +++ b/src/XScrnSaver.c @@ -351,7 +351,7 @@ void XScreenSaverSetAttributes ( req->borderWidth = border_width; req->c_class = class; req->depth = depth; - if (visual == CopyFromParent) + if (visual == (Visual *)CopyFromParent) req->visualID = CopyFromParent; else req->visualID = visual->visualid; |