diff options
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | man/.gitignore | 2 | ||||
| -rw-r--r-- | src/.gitignore | 6 | ||||
| -rw-r--r-- | src/library.c | 4 |
6 files changed, 18 insertions, 16 deletions
@@ -1,3 +1,5 @@ +.deps +.libs aclocal.m4 autom4te.cache compile @@ -20,3 +22,9 @@ stamp-h1 xcursor.pc *~ *.o +*.3 +*.la +*.lo +libXcursor-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index c3cd863..545fa16 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,7 @@ AM_CFLAGS = $(XRENDER_CFLAGS) $(XFIXES_CFLAGS) $(X_CFLAGS) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xcursor.pc -EXTRA_DIST = xcursor.pc.in autogen.sh +EXTRA_DIST = xcursor.pc.in if LINT lint: @@ -39,6 +39,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 7cd2cd1..7ce8c04 100644 --- a/configure.ac +++ b/configure.ac @@ -34,13 +34,14 @@ AC_CONFIG_SRCDIR([Makefile.am]) 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 AC_ARG_WITH(icondir, AC_HELP_STRING([--with-icondir=<path>], @@ -67,12 +68,13 @@ AC_SUBST([XCURSORPATH_LIST]) # Check for X PKG_CHECK_MODULES(XCURSOR, xrender >= 0.8.2 xfixes x11 fixesproto) AC_DEFINE(HAVE_XFIXES, 1, [Define to 1 if you have Xfixes]) - +XCURSOR_CFLAGS="$CWARNFLAGS $XCURSOR_CFLAGS" AC_SUBST(XCURSOR_CFLAGS) AC_SUBST(XCURSOR_LIBS) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT diff --git a/man/.gitignore b/man/.gitignore deleted file mode 100644 index 282522d..0000000 --- a/man/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 5fa7496..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -libXcursor.la -*.lo -Makefile -Makefile.in diff --git a/src/library.c b/src/library.c index c5aeef4..86f2d76 100644 --- a/src/library.c +++ b/src/library.c @@ -232,7 +232,7 @@ XcursorScanTheme (const char *theme, const char *name) * Scan this theme */ for (path = XcursorLibraryPath (); - path && f == 0; + path && f == NULL; path = _XcursorNextPath (path)) { dir = _XcursorBuildThemeDir (path, theme); @@ -259,7 +259,7 @@ XcursorScanTheme (const char *theme, const char *name) /* * Recurse to scan inherited themes */ - for (i = inherits; i && f == 0; i = _XcursorNextPath (i)) + for (i = inherits; i && f == NULL; i = _XcursorNextPath (i)) f = XcursorScanTheme (i, name); if (inherits != NULL) free (inherits); |