libxcursor: Changes to 'upstream-unstable'
.gitignore | 72 +++++++++--
INSTALL | 229 -----------------------------------
Makefile.am | 11 -
configure.ac | 23 +--
man/Makefile.am | 102 ++++++---------
man/XcursorCursorsCreate.man | 1
man/XcursorCursorsDestroy.man | 1
man/XcursorFilenameLoad.man | 1
man/XcursorFilenameLoadAllImages.man | 1
man/XcursorFilenameLoadCursor.man | 1
man/XcursorFilenameLoadImage.man | 1
man/XcursorFilenameLoadImages.man | 1
man/XcursorFilenameSave.man | 1
man/XcursorFilenameSaveImages.man | 1
man/XcursorGetDefaultSize.man | 1
man/XcursorGetTheme.man | 1
man/XcursorImageCreate.man | 1
man/XcursorImageDestroy.man | 1
man/XcursorImagesCreate.man | 1
man/XcursorImagesDestroy.man | 1
man/XcursorLibraryLoadCursor.man | 1
man/XcursorLibraryLoadCursors.man | 1
man/XcursorLibraryLoadImage.man | 1
man/XcursorLibraryLoadImages.man | 1
man/XcursorSetDefaultSize.man | 1
man/XcursorSetTheme.man | 1
man/XcursorShapeLoadCursor.man | 1
man/XcursorShapeLoadCursors.man | 1
man/XcursorShapeLoadImage.man | 1
man/XcursorShapeLoadImages.man | 1
man/XcursorSupportsARGB.man | 1
man/XcursorXcFileLoad.man | 1
man/XcursorXcFileLoadAllImages.man | 1
man/XcursorXcFileLoadImage.man | 1
man/XcursorXcFileLoadImages.man | 1
man/XcursorXcFileSave.man | 1
src/Makefile.am | 7 -
37 files changed, 151 insertions(+), 324 deletions(-)
New commits:
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>
diff --git a/configure.ac b/configure.ac
index b4f4bbd..185303f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,8 @@ 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])
+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
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>
diff --git a/man/Makefile.am b/man/Makefile.am
index 1a102ed..0be4444 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,39 +1,40 @@
libmandir = $(LIB_MAN_DIR)
-libman_PRE = Xcursor.man \
+libman_PRE = \
+ Xcursor.man \
$(Xcursor_shadows:=.man)
-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 \
+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@)
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>
diff --git a/man/Makefile.am b/man/Makefile.am
index c7d55fe..1a102ed 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -3,19 +3,6 @@ libmandir = $(LIB_MAN_DIR)
libman_PRE = Xcursor.man \
$(Xcursor_shadows:=.man)
-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
-
-EXTRA_DIST = $(libman_PRE)
-CLEANFILES = $(libman_DATA)
-
-SUFFIXES = .$(LIB_MAN_SUFFIX) .man
-
-# 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):
- $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
Xcursor_shadows = \
XcursorImageCreate \
XcursorImageDestroy \
@@ -49,3 +36,15 @@ Xcursor_shadows = \
XcursorSetTheme \
XcursorGetTheme
+libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
+
+EXTRA_DIST = $(libman_PRE)
+CLEANFILES = $(libman_DATA)
+
+SUFFIXES = .$(LIB_MAN_SUFFIX) .man
+
+# 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):
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
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>
diff --git a/man/Makefile.am b/man/Makefile.am
index b306de2..c7d55fe 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,31 +1,21 @@
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)
+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@
-
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-MAN_SUBSTS = -e 's|__XCURSORPATH__|$(XCURSORPATH_LIST)|g'
+MAN_SUBSTS += -e 's|__XCURSORPATH__|$(XCURSORPATH_LIST)|g'
.man.$(LIB_MAN_SUFFIX):
$(AM_V_GEN)$(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 \
@@ -59,8 +49,3 @@ Xcursor_shadows = \
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)
diff --git a/man/XcursorCursorsCreate.man b/man/XcursorCursorsCreate.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorCursorsCreate.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorCursorsDestroy.man b/man/XcursorCursorsDestroy.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorCursorsDestroy.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorFilenameLoad.man b/man/XcursorFilenameLoad.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorFilenameLoad.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorFilenameLoadAllImages.man b/man/XcursorFilenameLoadAllImages.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorFilenameLoadAllImages.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorFilenameLoadCursor.man b/man/XcursorFilenameLoadCursor.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorFilenameLoadCursor.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorFilenameLoadImage.man b/man/XcursorFilenameLoadImage.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorFilenameLoadImage.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorFilenameLoadImages.man b/man/XcursorFilenameLoadImages.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorFilenameLoadImages.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorFilenameSave.man b/man/XcursorFilenameSave.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorFilenameSave.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorFilenameSaveImages.man b/man/XcursorFilenameSaveImages.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorFilenameSaveImages.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorGetDefaultSize.man b/man/XcursorGetDefaultSize.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorGetDefaultSize.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorGetTheme.man b/man/XcursorGetTheme.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorGetTheme.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorImageCreate.man b/man/XcursorImageCreate.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorImageCreate.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorImageDestroy.man b/man/XcursorImageDestroy.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorImageDestroy.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorImagesCreate.man b/man/XcursorImagesCreate.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorImagesCreate.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorImagesDestroy.man b/man/XcursorImagesDestroy.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorImagesDestroy.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorLibraryLoadCursor.man b/man/XcursorLibraryLoadCursor.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorLibraryLoadCursor.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorLibraryLoadCursors.man b/man/XcursorLibraryLoadCursors.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorLibraryLoadCursors.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorLibraryLoadImage.man b/man/XcursorLibraryLoadImage.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorLibraryLoadImage.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorLibraryLoadImages.man b/man/XcursorLibraryLoadImages.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorLibraryLoadImages.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorSetDefaultSize.man b/man/XcursorSetDefaultSize.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorSetDefaultSize.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorSetTheme.man b/man/XcursorSetTheme.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorSetTheme.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorShapeLoadCursor.man b/man/XcursorShapeLoadCursor.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorShapeLoadCursor.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorShapeLoadCursors.man b/man/XcursorShapeLoadCursors.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorShapeLoadCursors.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorShapeLoadImage.man b/man/XcursorShapeLoadImage.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorShapeLoadImage.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorShapeLoadImages.man b/man/XcursorShapeLoadImages.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorShapeLoadImages.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorSupportsARGB.man b/man/XcursorSupportsARGB.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorSupportsARGB.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorXcFileLoad.man b/man/XcursorXcFileLoad.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorXcFileLoad.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorXcFileLoadAllImages.man b/man/XcursorXcFileLoadAllImages.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorXcFileLoadAllImages.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorXcFileLoadImage.man b/man/XcursorXcFileLoadImage.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorXcFileLoadImage.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorXcFileLoadImages.man b/man/XcursorXcFileLoadImages.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorXcFileLoadImages.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
diff --git a/man/XcursorXcFileSave.man b/man/XcursorXcFileSave.man
new file mode 100644
index 0000000..690dab2
--- /dev/null
+++ b/man/XcursorXcFileSave.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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>
diff --git a/configure.ac b/configure.ac
index 7fe7864..b4f4bbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +34,10 @@ AC_CONFIG_SRCDIR([Makefile.am])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# 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.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [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
diff --git a/man/Makefile.am b/man/Makefile.am
index abb555d..b306de2 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -13,18 +13,11 @@ 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) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
# Generate man page shadow files
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>
diff --git a/configure.ac b/configure.ac
index 9d88411..7fe7864 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ 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
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>
diff --git a/Makefile.am b/Makefile.am
index 7d5bb99..976151e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,6 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xcursor.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = xcursor.pc.in
if LINT
lint:
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>
diff --git a/configure.ac b/configure.ac
index cda2349..9d88411 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,10 +69,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)
-
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
diff --git a/src/Makefile.am b/src/Makefile.am
index a8734f3..a55b8d6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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
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.
diff --git a/Makefile.am b/Makefile.am
index 4381661..7d5bb99 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,7 @@ AM_CFLAGS = $(XRENDER_CFLAGS) $(XFIXES_CFLAGS) $(X_CFLAGS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xcursor.pc
+MAINTAINERCLEANFILES = ChangeLog INSTALL
EXTRA_DIST = xcursor.pc.in
if LINT
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.
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 54caf7c..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,229 +0,0 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
-
- This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
- These are generic installation instructions.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-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
-disabled by default to prevent problems with accidental use of stale
-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
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-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'.
-
-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.
-
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-Compilers and Options
-=====================
-
- Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. Run `./configure --help'
-for details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
- You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
- By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
- Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-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.
-
-Specifying the System Type
-==========================
-
- There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on. Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
- Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-will cause the specified gcc to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-`configure' Invocation
-======================
-
- `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
- Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
-
diff --git a/Makefile.am b/Makefile.am
index e3ea72b..4381661 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,9 +34,12 @@ lint:
endif LINT
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29..0000000
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.
diff --git a/configure.ac b/configure.ac
index f0ef580..cda2349 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,14 +34,15 @@ 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 xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
AC_ARG_WITH(icondir,
AC_HELP_STRING([--with-icondir=<path>],
@@ -72,9 +73,6 @@ 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
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.
diff --git a/Makefile.am b/Makefile.am
index 545fa16..e3ea72b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,8 +33,6 @@ lint:
(cd src && $(MAKE) $(MFLAGS) lint)
endif LINT
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
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
Reply to: