qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to libXcursor 1.1.11. No functional change.

Browse Source
This commit is contained in:
matthieu 2010-10-31 14:01:48 +00:00
parent 0023d90dd4
commit 883558059e
42 changed files with 3581 additions and 1463 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
lib/libXcursor/ChangeLog
View File

@ -1,3 +1,162 @@
commit 731e84d79e83b59d022d0f453b245696b4d2750f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Oct 27 22:48:19 2010 -0700
libXcursor 1.1.11
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 42b7717c32b3c7097180667a9ba2f62e40fc6506
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Aug 16 19:28:57 2010 -0400
man: whitespace management
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 862bc06d58152e74e85fc29db7eaec06af20e00b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Aug 16 19:25:25 2010 -0400
man: reorder makefile statements
No functional change. Shadows are part of libman_PRE.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit b18568dd5b5a11ae49cad66a54ec50465c6ffa77
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Aug 16 19:17:21 2010 -0400
man: store shadow man pages in git rather than generating them
Simplify the build process and the makefile.
Local fix in CVS for bug 5628 is not required
as the problem has been fixed in
util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 68d830bcf67632b474c8996b6a2c9bcde8e27f97
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Aug 16 19:05:35 2010 -0400
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 0caadca51ca56a2ae2cfe67cbd2b29e89b6a68d8
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 16:50:33 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit b511b260ddcec34035c1d97285f27f3182663a6a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 14:53:48 2010 -0400
config: remove the pkgconfig pc.in file from EXTRA_DIST
Automake always includes it in the tarball.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit a3e03bb23bf7a92bf20d51eebe692e0a4f667065
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Feb 16 10:37:21 2010 -0500
config: move CWARNFLAGS from configure.ac to Makefile.am
Compiler warning flags should be explicitly set in the makefile
rather than being merged with other packages compiler flags.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 8198d1490959d49573790405e205a471ac7a5b98
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Nov 27 20:56:04 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
commit ecddb70049a1e79b88d4d647f7e944237055fa2e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:10 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
commit 02cd3d7a617c71dbc13023f91f41b896dc260c50
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Oct 27 15:07:25 2009 -0400
Deploy the new XORG_DEFAULT_OPTIONS #24242
This macro aggregate a number of existing macros that sets commmon
X.Org components configuration options. It shields the configuration file from
future changes.
commit 1ca6aefa6690930b336490525f5ed515ddad26ac
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 26 22:08:42 2009 -0400
Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
ChangeLog filename is known to Automake and requires no further
coding in the makefile.
commit 1c158db62ad2c7584d88e840f3c7fe151de84150
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Oct 22 12:34:19 2009 -0400
.gitignore: use common defaults with custom section # 24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
commit 5e14cd9bd8a8f9266ecaa69d58c15d8e298d8a78
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Oct 21 12:47:24 2009 -0700
This is not a GNU project, so declare it foreign.
On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
> On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
> > I noticed an INSTALL file in xlsclients and libXvMC today, and it
> > was quite annoying to work around since 'autoreconf -fvi' replaces
> > it and git wants to commit it. Should these files even be in git?
> > Can I nuke them for the betterment of humanity and since they get
> > created by autoreconf anyways?
>
> See https://bugs.freedesktop.org/show_bug.cgi?id=24206
As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
of the INSTALL file. It is also part of the 24206 solution.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit fbf229879370a96a070ebf087426f6f6c0dbe5a2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 28 14:49:15 2009 +1000

65
lib/libXcursor/INSTALL
View File

@ -23,9 +23,9 @@ debugging `configure').
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
the results of its tests to speed up reconfiguring. (Caching is
the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
cache files.)
cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@ -35,20 +35,17 @@ some point `config.cache' contains results you don't want to keep, you
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
`configure' by a program called `autoconf'. You only need
`configure.ac' if you want to change it or regenerate `configure' using
a newer version of `autoconf'.
`configure' by a program called `autoconf'. You need `configure.ac' if
you want to change it or regenerate `configure' using a newer version
of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system. If you're
using `csh' on an old version of System V, you might need to type
`sh ./configure' instead to prevent `csh' from trying to execute
`configure' itself.
`./configure' to configure the package for your system.
Running `configure' takes awhile. While running, it prints some
messages telling which features it is checking for.
Running `configure' might take a while. While running, it prints
some messages telling which features it is checking for.
2. Type `make' to compile the package.
@ -67,6 +64,9 @@ The simplest way to compile this package is:
all sorts of other programs in order to regenerate files that came
with the distribution.
6. Often, you can also type `make uninstall' to remove the installed
files again.
Compilers and Options
=====================
@ -78,7 +78,7 @@ details on some of the pertinent environment variables.
by setting variables in the command line or in the environment. Here
is an example:
./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
@ -137,6 +137,28 @@ find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Particular systems
==================
On HP-UX, the default C compiler is not ANSI C compatible. If GNU
CC is not installed, it is recommended to use the following options in
order to use an ANSI C compiler:
./configure CC="cc -Ae"
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
a workaround. If GNU CC is not installed, it is therefore recommended
to try
./configure CC="cc"
and if that doesn't work, try
./configure CC="cc -nodtk"
Specifying the System Type
==========================
@ -204,7 +226,14 @@ configuration-related scripts to be executed by `/bin/bash'.
`--help'
`-h'
Print a summary of the options to `configure', and exit.
Print a summary of all of the options to `configure', and exit.
`--help=short'
`--help=recursive'
Print a summary of the options unique to this package's
`configure', and exit. The `short' variant lists options used
only in the top level, while the `recursive' variant lists options
also present in any nested packages.
`--version'
`-V'
@ -231,6 +260,16 @@ configuration-related scripts to be executed by `/bin/bash'.
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
`--prefix=DIR'
Use DIR as the installation prefix. *Note Installation Names::
for more details, including other options available for fine-tuning
the installation locations.
`--no-create'
`-n'
Run the configure checks, but stop before creating any output
files.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.

11
lib/libXcursor/Makefile.am
View File

@ -26,19 +26,20 @@ AM_CFLAGS = $(XRENDER_CFLAGS) $(XFIXES_CFLAGS) $(X_CFLAGS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xcursor.pc
EXTRA_DIST = xcursor.pc.in
MAINTAINERCLEANFILES = ChangeLog INSTALL
if LINT
lint:
(cd src && $(MAKE) $(MFLAGS) lint)
endif LINT
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
.PHONY: ChangeLog INSTALL
INSTALL:
$(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog
dist-hook: ChangeLog INSTALL

24
lib/libXcursor/Makefile.in
View File

@ -102,12 +102,14 @@ am__remove_distdir = \
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
@ -144,6 +146,7 @@ FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
ICONDIR = @ICONDIR@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -164,6 +167,7 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
@ -186,6 +190,7 @@ XCURSORPATH = @XCURSORPATH@
XCURSORPATH_LIST = @XCURSORPATH_LIST@
XCURSOR_CFLAGS = @XCURSOR_CFLAGS@
XCURSOR_LIBS = @XCURSOR_LIBS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
@ -206,7 +211,6 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
@ -238,8 +242,7 @@ SUBDIRS = src man
AM_CFLAGS = $(XRENDER_CFLAGS) $(XFIXES_CFLAGS) $(X_CFLAGS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xcursor.pc
EXTRA_DIST = xcursor.pc.in ChangeLog
MAINTAINERCLEANFILES = ChangeLog
MAINTAINERCLEANFILES = ChangeLog INSTALL
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@ -250,15 +253,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
cd $(srcdir) && $(AUTOMAKE) --gnu \
echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
cd $(srcdir) && $(AUTOMAKE) --foreign \
&& exit 0; \
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu Makefile
$(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@ -707,12 +710,15 @@ uninstall-info: uninstall-info-recursive
@LINT_TRUE@lint:
@LINT_TRUE@ (cd src && $(MAKE) $(MFLAGS) lint)
.PHONY: ChangeLog
.PHONY: ChangeLog INSTALL
INSTALL:
$(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog
dist-hook: ChangeLog INSTALL
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

843
lib/libXcursor/aclocal.m4 vendored
View File

File diff suppressed because it is too large Load Diff

3622
lib/libXcursor/configure vendored
View File

File diff suppressed because it is too large Load Diff

23
lib/libXcursor/configure.ac
View File

@ -21,27 +21,29 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_PREREQ([2.60])
dnl
dnl This is the package version number, not the shared library
dnl version. This same version number must appear in Xcursor.h
dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's
dnl not possible to extract the version number here from Xcursor.h
dnl
AC_INIT([libXcursor],1.1.10,[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],[libXcursor])
AM_INIT_AUTOMAKE([dist-bzip2])
AC_INIT([libXcursor], [1.1.11],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],[libXcursor])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AC_CONFIG_SRCDIR([Makefile.am])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
# 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)
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
XORG_CWARNFLAGS
AC_ARG_WITH(icondir,
AC_HELP_STRING([--with-icondir=<path>],
@ -68,13 +70,6 @@ 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

102
lib/libXcursor/man/Makefile.am
View File

@ -1,73 +1,51 @@
libmandir = $(LIB_MAN_DIR)
libman_PRE = Xcursor.man
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
libman_PRE = \
Xcursor.man \
$(Xcursor_shadows:=.man)
all-local: $(libman_DATA)
Xcursor_shadows = \
XcursorImageCreate \
XcursorImageDestroy \
XcursorImagesCreate \
XcursorImagesDestroy \
XcursorCursorsCreate \
XcursorCursorsDestroy \
XcursorXcFileLoadImage \
XcursorXcFileLoadImages \
XcursorXcFileLoadAllImages \
XcursorXcFileLoad \
XcursorXcFileSave \
XcursorFilenameLoadImage \
XcursorFilenameLoadImages \
XcursorFilenameLoadAllImages \
XcursorFilenameLoad \
XcursorFilenameSaveImages \
XcursorFilenameSave \
XcursorLibraryLoadImage \
XcursorLibraryLoadImages \
XcursorFilenameLoadCursor \
XcursorLibraryLoadCursor \
XcursorLibraryLoadCursors \
XcursorShapeLoadImage \
XcursorShapeLoadImages \
XcursorShapeLoadCursor \
XcursorShapeLoadCursors \
XcursorSupportsARGB \
XcursorSetDefaultSize \
XcursorGetDefaultSize \
XcursorSetTheme \
XcursorGetTheme
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA)
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
MAN_SUBSTS = \
-e 's|__xorgversion__|"$(XORGRELSTRING)"|' \
-e 's|__XCURSORPATH__|$(XCURSORPATH_LIST)|g' \
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
MAN_SUBSTS += -e 's|__XCURSORPATH__|$(XCURSORPATH_LIST)|g'
.man.$(LIB_MAN_SUFFIX):
-rm -f $@
sed $(MAN_SUBSTS) < $< > $@
# Generate man page shadow files
LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
libman_DATA += $(Xcursor_shadows:=.@LIB_MAN_SUFFIX@)
BUILT_SOURCES = shadows.DONE
CLEANFILES += shadows.DONE
Xcursor_shadows = \
XcursorImageCreate \
XcursorImageDestroy \
XcursorImagesCreate \
XcursorImagesDestroy \
XcursorCursorsCreate \
XcursorCursorsDestroy \
XcursorXcFileLoadImage \
XcursorXcFileLoadImages \
XcursorXcFileLoadAllImages \
XcursorXcFileLoad \
XcursorXcFileSave \
XcursorFilenameLoadImage \
XcursorFilenameLoadImages \
XcursorFilenameLoadAllImages \
XcursorFilenameLoad \
XcursorFilenameSaveImages \
XcursorFilenameSave \
XcursorLibraryLoadImage \
XcursorLibraryLoadImages \
XcursorFilenameLoadCursor \
XcursorLibraryLoadCursor \
XcursorLibraryLoadCursors \
XcursorShapeLoadImage \
XcursorShapeLoadImages \
XcursorShapeLoadCursor \
XcursorShapeLoadCursors \
XcursorSupportsARGB \
XcursorSetDefaultSize \
XcursorGetDefaultSize \
XcursorSetTheme \
XcursorGetTheme
shadows.DONE:
-rm -f $(Xcursor_shadows:=.@LIB_MAN_SUFFIX@)
(for i in $(Xcursor_shadows:=.@LIB_MAN_SUFFIX@) ; do \
echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcursor.$(LIB_MAN_SUFFIX) > $$i; \
done)
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@

141
lib/libXcursor/man/Makefile.in
View File

@ -63,6 +63,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
@ -99,6 +100,7 @@ FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
ICONDIR = @ICONDIR@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -119,6 +121,9 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
MAN_SUBSTS = @MAN_SUBSTS@ -e 's|__XCURSORPATH__|$(XCURSORPATH_LIST)|g'
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
@ -141,6 +146,7 @@ XCURSORPATH = @XCURSORPATH@
XCURSORPATH_LIST = @XCURSORPATH_LIST@
XCURSOR_CFLAGS = @XCURSOR_CFLAGS@
XCURSOR_LIBS = @XCURSOR_LIBS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
@ -161,7 +167,6 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
@ -190,63 +195,48 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
libmandir = $(LIB_MAN_DIR)
libman_PRE = Xcursor.man
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
$(Xcursor_shadows:=.@LIB_MAN_SUFFIX@)
EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA) shadows.DONE
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
libman_PRE = \
Xcursor.man \
$(Xcursor_shadows:=.man)
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
MAN_SUBSTS = \
-e 's|__xorgversion__|"$(XORGRELSTRING)"|' \
-e 's|__XCURSORPATH__|$(XCURSORPATH_LIST)|g' \
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
# Generate man page shadow files
LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
BUILT_SOURCES = shadows.DONE
Xcursor_shadows = \
XcursorImageCreate \
XcursorImageDestroy \
XcursorImagesCreate \
XcursorImagesDestroy \
XcursorCursorsCreate \
XcursorCursorsDestroy \
XcursorXcFileLoadImage \
XcursorXcFileLoadImages \
XcursorXcFileLoadAllImages \
XcursorXcFileLoad \
XcursorXcFileSave \
XcursorFilenameLoadImage \
XcursorFilenameLoadImages \
XcursorFilenameLoadAllImages \
XcursorFilenameLoad \
XcursorFilenameSaveImages \
XcursorFilenameSave \
XcursorLibraryLoadImage \
XcursorLibraryLoadImages \
XcursorFilenameLoadCursor \
XcursorLibraryLoadCursor \
XcursorLibraryLoadCursors \
XcursorShapeLoadImage \
XcursorShapeLoadImages \
XcursorShapeLoadCursor \
XcursorShapeLoadCursors \
XcursorSupportsARGB \
XcursorSetDefaultSize \
XcursorGetDefaultSize \
XcursorSetTheme \
XcursorImageCreate \
XcursorImageDestroy \
XcursorImagesCreate \
XcursorImagesDestroy \
XcursorCursorsCreate \
XcursorCursorsDestroy \
XcursorXcFileLoadImage \
XcursorXcFileLoadImages \
XcursorXcFileLoadAllImages \
XcursorXcFileLoad \
XcursorXcFileSave \
XcursorFilenameLoadImage \
XcursorFilenameLoadImages \
XcursorFilenameLoadAllImages \
XcursorFilenameLoad \
XcursorFilenameSaveImages \
XcursorFilenameSave \
XcursorLibraryLoadImage \
XcursorLibraryLoadImages \
XcursorFilenameLoadCursor \
XcursorLibraryLoadCursor \
XcursorLibraryLoadCursors \
XcursorShapeLoadImage \
XcursorShapeLoadImages \
XcursorShapeLoadCursor \
XcursorShapeLoadCursors \
XcursorSupportsARGB \
XcursorSetDefaultSize \
XcursorGetDefaultSize \
XcursorSetTheme \
XcursorGetTheme
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA)
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
all: all-am
.SUFFIXES:
.SUFFIXES: .$(LIB_MAN_SUFFIX) .man
@ -259,9 +249,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu man/Makefile
$(AUTOMAKE) --foreign man/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@ -341,15 +331,13 @@ distdir: $(DISTFILES)
fi; \
done
check-am: all-am
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(DATA) all-local
check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(libmandir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-am
install: install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
@ -374,7 +362,6 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
clean: clean-am
clean-am: clean-generic clean-libtool mostlyclean-am
@ -421,29 +408,19 @@ ps-am:
uninstall-am: uninstall-info-am uninstall-libmanDATA
.PHONY: all all-am all-local check check-am clean clean-generic \
clean-libtool distclean distclean-generic distclean-libtool \
distdir dvi dvi-am html html-am info info-am install \
install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am \
install-libmanDATA install-man install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
uninstall-info-am uninstall-libmanDATA
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-exec install-exec-am \
install-info install-info-am install-libmanDATA install-man \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
uninstall uninstall-am uninstall-info-am uninstall-libmanDATA
all-local: $(libman_DATA)
.man.$(LIB_MAN_SUFFIX):
-rm -f $@
sed $(MAN_SUBSTS) < $< > $@
shadows.DONE:
-rm -f $(Xcursor_shadows:=.@LIB_MAN_SUFFIX@)
(for i in $(Xcursor_shadows:=.@LIB_MAN_SUFFIX@) ; do \
echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcursor.$(LIB_MAN_SUFFIX) > $$i; \
done)
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

1
lib/libXcursor/man/XcursorCursorsCreate.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorCursorsDestroy.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorFilenameLoad.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorFilenameLoadAllImages.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorFilenameLoadCursor.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorFilenameLoadImage.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorFilenameLoadImages.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorFilenameSave.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorFilenameSaveImages.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorGetDefaultSize.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorGetTheme.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorImageCreate.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorImageDestroy.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorImagesCreate.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorImagesDestroy.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorLibraryLoadCursor.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorLibraryLoadCursors.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorLibraryLoadImage.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorLibraryLoadImages.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorSetDefaultSize.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorSetTheme.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorShapeLoadCursor.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorShapeLoadCursors.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorShapeLoadImage.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorShapeLoadImages.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorSupportsARGB.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorXcFileLoad.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorXcFileLoadAllImages.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorXcFileLoadImage.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorXcFileLoadImages.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

1
lib/libXcursor/man/XcursorXcFileSave.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/Xcursor.__libmansuffix__

7
lib/libXcursor/src/Makefile.am
View File

@ -6,8 +6,11 @@ ICONDIR=@ICONDIR@
XCURSORPATH=@XCURSORPATH@
libXcursor_la_LIBADD = $(XCURSOR_LIBS)
AM_CFLAGS = $(XCURSOR_CFLAGS) \
-DICONDIR=\"$(ICONDIR)\" -DXCURSORPATH=\"$(XCURSORPATH)\"
AM_CFLAGS = \
$(XCURSOR_CFLAGS) \
$(CWARNFLAGS)\
-DICONDIR=\"$(ICONDIR)\" \
-DXCURSORPATH=\"$(XCURSORPATH)\"
INCLUDES = -I$(top_srcdir)/include/X11/Xcursor

16
lib/libXcursor/src/Makefile.in
View File

@ -86,6 +86,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
@ -122,6 +123,7 @@ FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
ICONDIR = @ICONDIR@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -142,6 +144,7 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
@ -164,6 +167,7 @@ XCURSORPATH = @XCURSORPATH@
XCURSORPATH_LIST = @XCURSORPATH_LIST@
XCURSOR_CFLAGS = @XCURSOR_CFLAGS@
XCURSOR_LIBS = @XCURSOR_LIBS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
@ -184,7 +188,6 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
@ -215,8 +218,11 @@ target_alias = @target_alias@
lib_LTLIBRARIES = libXcursor.la
libXcursor_la_SOURCES = xcursorint.h cursor.c display.c file.c library.c xlib.c
libXcursor_la_LIBADD = $(XCURSOR_LIBS)
AM_CFLAGS = $(XCURSOR_CFLAGS) \
-DICONDIR=\"$(ICONDIR)\" -DXCURSORPATH=\"$(XCURSORPATH)\"
AM_CFLAGS = \
$(XCURSOR_CFLAGS) \
$(CWARNFLAGS)\
-DICONDIR=\"$(ICONDIR)\" \
-DXCURSORPATH=\"$(XCURSORPATH)\"
INCLUDES = -I$(top_srcdir)/include/X11/Xcursor
@ -242,9 +248,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu src/Makefile
$(AUTOMAKE) --foreign src/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \