fdo-mirrors/xorg-libxcursor
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libxcursor.git synced 2026-05-05 00:38:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Janitor: make distcheck, compiler warnings, extra .gitignore files.

Browse source
This commit is contained in:
Paulo Cesar Pereira de Andrade 2009-01-29 15:34:11 -02:00
parent 04641d3cc3
commit f00ae32322
6 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitignore vendored
View file

@ -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

4
Makefile.am
View file

@ -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

10
configure.ac
View file

@ -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

2
man/.gitignore vendored
View file

@ -1,2 +0,0 @@
Makefile
Makefile.in

6
src/.gitignore vendored
View file

@ -1,6 +0,0 @@
.deps
.libs
libXcursor.la
*.lo
Makefile
Makefile.in

4
src/library.c
View file

@ -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);