X Strike Force Xft SVN commit: r118 - in trunk: . debian
Author: branden
Date: 2005-03-31 16:52:51 -0500 (Thu, 31 Mar 2005)
New Revision: 118
Added:
trunk/xft-config.1.in
Modified:
trunk/Makefile.am
trunk/Makefile.in
trunk/configure
trunk/configure.ac
trunk/debian/changelog
trunk/debian/libxft-dev.install
trunk/xft-config.in
Log:
Write and ship manual page for xft-config.
xft-config:
+ Add cross-reference to manual page.
Makefile.am:
+ Add xft-config.1 to man_MANS.
+ Add xft-config.1.in to EXTRA_DIST.
configure.ac:
+ Add xft-config.1 to list of generated files in AC_OUTPUT.
Makefile.in,
configure:
+ Re-run aclocal-1.7, automake-1.7, and autoconf to reflect changes in
Makefile.am and configure.ac.
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2005-03-31 21:08:34 UTC (rev 117)
+++ trunk/Makefile.am 2005-03-31 21:52:51 UTC (rev 118)
@@ -23,7 +23,7 @@
bin_SCRIPTS = xft-config
-man_MANS = Xft.3
+man_MANS = Xft.3 xft-config.1
AM_CFLAGS = $(FONTCONFIG_CFLAGS) $(FREETYPE_CFLAGS) $(XRENDER_CFLAGS) \
$(WARN_CFLAGS)
@@ -61,4 +61,4 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xft.pc
-EXTRA_DIST = xft-config.in xft.pc.in Xft.3.in autogen.sh
+EXTRA_DIST = xft-config.in xft-config.1.in xft.pc.in Xft.3.in autogen.sh
Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in 2005-03-31 21:08:34 UTC (rev 117)
+++ trunk/Makefile.in 2005-03-31 21:52:51 UTC (rev 118)
@@ -167,7 +167,7 @@
bin_SCRIPTS = xft-config
-man_MANS = Xft.3
+man_MANS = Xft.3 xft-config.1
AM_CFLAGS = $(FONTCONFIG_CFLAGS) $(FREETYPE_CFLAGS) $(XRENDER_CFLAGS) \
$(WARN_CFLAGS)
@@ -202,17 +202,17 @@
libXft_la_LDFLAGS = -version-number 2:1:2 -no-undefined
libXftincludedir = $(includedir)/X11/Xft
-libXftinclude_HEADERS = Xft.h XftCompat.h
+libXftinclude_HEADERS = Xft.h XftCompat.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xft.pc
-EXTRA_DIST = xft-config.in xft.pc.in Xft.3.in $(man_MANS) autogen.sh
+EXTRA_DIST = xft-config.in xft-config.1.in xft.pc.in Xft.3.in autogen.sh
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = xft.pc xft-config Xft.3
+CONFIG_CLEAN_FILES = xft.pc xft-config xft-config.1 Xft.3
LTLIBRARIES = $(lib_LTLIBRARIES)
libXft_la_DEPENDENCIES =
@@ -254,7 +254,7 @@
$(srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \
Makefile.am NEWS Xft.3.in aclocal.m4 config.guess config.h.in \
config.sub configure configure.ac depcomp install-sh ltmain.sh \
- missing mkinstalldirs xft-config.in xft.pc.in
+ missing mkinstalldirs xft-config.1.in xft-config.in xft.pc.in
SOURCES = $(libXft_la_SOURCES)
all: config.h
@@ -299,6 +299,8 @@
cd $(top_builddir) && $(SHELL) ./config.status $@
xft-config: $(top_builddir)/config.status xft-config.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+xft-config.1: $(top_builddir)/config.status xft-config.1.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
Xft.3: $(top_builddir)/config.status Xft.3.in
cd $(top_builddir) && $(SHELL) ./config.status $@
libLTLIBRARIES_INSTALL = $(INSTALL)
@@ -418,6 +420,53 @@
-rm -f libtool
uninstall-info-am:
+man1dir = $(mandir)/man1
+install-man1: $(man1_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(man1dir)
+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+ case "$$i" in \
+ *.1*) list="$$list $$i" ;; \
+ esac; \
+ done; \
+ for i in $$list; do \
+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+ else file=$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 1*) ;; \
+ *) ext='1' ;; \
+ esac; \
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+ done
+uninstall-man1:
+ @$(NORMAL_UNINSTALL)
+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+ case "$$i" in \
+ *.1*) list="$$list $$i" ;; \
+ esac; \
+ done; \
+ for i in $$list; do \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 1*) ;; \
+ *) ext='1' ;; \
+ esac; \
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
+ rm -f $(DESTDIR)$(man1dir)/$$inst; \
+ done
+
man3dir = $(mandir)/man3
install-man3: $(man3_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
@@ -678,7 +727,7 @@
config.h
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(man3dir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libXftincludedir)
+ $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(man3dir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libXftincludedir)
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -730,7 +779,7 @@
install-info: install-info-am
-install-man: install-man3
+install-man: install-man1 install-man3
installcheck-am:
@@ -758,7 +807,7 @@
uninstall-libLTLIBRARIES uninstall-libXftincludeHEADERS \
uninstall-man uninstall-pkgconfigDATA
-uninstall-man: uninstall-man3
+uninstall-man: uninstall-man1 uninstall-man3
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libLTLIBRARIES clean-libtool ctags dist dist-all \
@@ -768,15 +817,15 @@
dvi-am info info-am install install-am install-binSCRIPTS \
install-data install-data-am install-exec install-exec-am \
install-info install-info-am install-libLTLIBRARIES \
- install-libXftincludeHEADERS install-man install-man3 \
- install-pkgconfigDATA install-strip installcheck \
+ install-libXftincludeHEADERS install-man install-man1 \
+ install-man3 install-pkgconfigDATA install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-binSCRIPTS \
uninstall-info-am uninstall-libLTLIBRARIES \
- uninstall-libXftincludeHEADERS uninstall-man uninstall-man3 \
- uninstall-pkgconfigDATA
+ uninstall-libXftincludeHEADERS uninstall-man uninstall-man1 \
+ uninstall-man3 uninstall-pkgconfigDATA
# 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.
Modified: trunk/configure
===================================================================
--- trunk/configure 2005-03-31 21:08:34 UTC (rev 117)
+++ trunk/configure 2005-03-31 21:52:51 UTC (rev 118)
@@ -19034,6 +19034,32 @@
+# Debian-maintained Xft package sets AM_MAINTAINER_MODE
+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
+ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+ enableval="$enable_maintainer_mode"
+ USE_MAINTAINER_MODE=$enableval
+else
+ USE_MAINTAINER_MODE=no
+fi;
+ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
+
+
+if test $USE_MAINTAINER_MODE = yes; then
+ MAINTAINER_MODE_TRUE=
+ MAINTAINER_MODE_FALSE='#'
+else
+ MAINTAINER_MODE_TRUE='#'
+ MAINTAINER_MODE_FALSE=
+fi
+
+ MAINT=$MAINTAINER_MODE_TRUE
+
+
+
#
# Check for Xrender
#
@@ -20140,7 +20166,7 @@
fi
- ac_config_files="$ac_config_files Makefile xft.pc xft-config Xft.3"
+ ac_config_files="$ac_config_files Makefile xft.pc xft-config xft-config.1 Xft.3"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -20260,6 +20286,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -20707,6 +20740,7 @@
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"xft.pc" ) CONFIG_FILES="$CONFIG_FILES xft.pc" ;;
"xft-config" ) CONFIG_FILES="$CONFIG_FILES xft-config" ;;
+ "xft-config.1" ) CONFIG_FILES="$CONFIG_FILES xft-config.1" ;;
"Xft.3" ) CONFIG_FILES="$CONFIG_FILES Xft.3" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2005-03-31 21:08:34 UTC (rev 117)
+++ trunk/configure.ac 2005-03-31 21:52:51 UTC (rev 118)
@@ -131,5 +131,6 @@
AC_OUTPUT([Makefile
xft.pc
xft-config
+ xft-config.1
Xft.3])
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-03-31 21:08:34 UTC (rev 117)
+++ trunk/debian/changelog 2005-03-31 21:52:51 UTC (rev 118)
@@ -13,8 +13,10 @@
+ Provide one-sentence summary of the command's purpose.
+ Sort option names in lexicographic order.
- -- Branden Robinson <branden@debian.org> Thu, 31 Mar 2005 15:46:45 -0500
+ * Write and ship manual page for xft-config.
+ -- Branden Robinson <branden@debian.org> Thu, 31 Mar 2005 16:48:09 -0500
+
xft (2.1.2-6) unstable; urgency=low
* Make package compatible with the XFree86 4.3.0 package reorganization.
Modified: trunk/debian/libxft-dev.install
===================================================================
--- trunk/debian/libxft-dev.install 2005-03-31 21:08:34 UTC (rev 117)
+++ trunk/debian/libxft-dev.install 2005-03-31 21:52:51 UTC (rev 118)
@@ -2,4 +2,5 @@
debian/tmp/usr/lib/libXft*.{a,la,so}
debian/tmp/usr/lib/pkgconfig/*.pc
debian/tmp/usr/bin/xft-config
+debian/tmp/usr/share/man/man1/xft-config.1
debian/tmp/usr/share/man/man3/Xft.3
Added: trunk/xft-config.1.in
===================================================================
--- trunk/xft-config.1.in 2005-03-31 21:08:34 UTC (rev 117)
+++ trunk/xft-config.1.in 2005-03-31 21:52:51 UTC (rev 118)
@@ -0,0 +1,111 @@
+.\" Copyright 2005 Branden Robinson
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining a copy
+.\" of this document (the "Document"), to deal in the Document without
+.\" restriction, including without limitation the rights to use, copy, modify,
+.\" merge, publish, distribute, sublicense, and/or sell copies of the Document,
+.\" and to permit persons to whom the Document is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included in
+.\" all copies or substantial portions of the Document.
+.\"
+.\" THE DOCUMENT IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+.\" DOCUMENT IN THE PUBLIC INTEREST, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR
+.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE DOCUMENT OR THE USE OR OTHER
+.\" DEALINGS IN THE DOCUMENT.
+.TH xft-config 1 "Version @VERSION@" "Xft"
+.SH NAME
+xft\-config \- report Xft version, compiler, linker, and/or directory data
+.SH SYNOPSIS
+.B xft\-config
+{
+.BR \-\-exec\-prefix [ =\fIlocal_prefix\fR ]
+|
+.BR \-\-prefix [ =\fIlocal_prefix\fR ]
+|
+.B \-\-cflags
+|
+.B \-\-libs
+} ...
+.PP
+.B xft\-config \-\-version
+.SH DESCRIPTION
+.B xft\-config
+reports information of interest to users and developers about the installed
+version of the X FreeType library,
+.BR Xft (3).
+It can be used to report the installed version of the library as well as
+the compiler and linker flags that are required to successfully compile and
+link C (or C-compatible) code that uses Xft.
+.PP
+If invoked without any arguments,
+.B xft\-config
+will print a usage message on standard error and exit.
+.SH OPTIONS
+.TP
+.B \-\-cflags
+Report the compiler flags that are required to compile code that uses Xft
+symbols.
+.TP
+.BR \-\-exec\-prefix [ =\fIlocal_prefix\fR ]
+If specified without the parameter
+.IR local_prefix ,
+report the file specification prefix that Xft uses for installation of
+executable files.
+If
+.I local_prefix
+is specified, it is used instead of the file specification prefix used for
+installation of executable files by Xft and the value of the option
+argument specified with
+.BR \-\-prefix ,
+if any, when compile and linker flags are reported (with
+.B \-\-cflags
+and
+.BR \-\-libs ,
+respectively).
+.TP
+.B \-\-libs
+Report the linker flags that are required to link code that uses Xft
+symbols.
+.TP
+.BR \-\-prefix [ =\fIlocal_prefix\fR ]
+If specified without the parameter
+.IR local_prefix ,
+report the file specification prefix that Xft uses for installation of
+files.
+If
+.I local_prefix
+is specified, it is used instead of the file specification prefix used for
+installation of files by Xft when compile and linker flags are reported
+(with
+.B \-\-cflags
+and
+.BR \-\-libs ,
+respectively); also see
+.BR \-\-exec\-prefix .
+.TP
+.B \-\-version
+Report the version of the Xft library installed on the system and exit.
+.SH OPERANDS
+.B xft\-config
+does not recognize any non-option arguments.
+At least one option must be specified.
+.SH "EXIT STATUS"
+.TP
+0
+Information was successfully reported.
+.TP
+1
+.B xft\-config
+was invoked with invalid arguments, or no arguments at all.
+.SH AUTHOR
+.B xft\-config
+was written by Keith Packard.
+This manual page was written by Branden Robinson.
+.SH "SEE ALSO"
+.BR Xft (3)
+.\" vim:set et tw=80
Modified: trunk/xft-config.in
===================================================================
--- trunk/xft-config.in 2005-03-31 21:08:34 UTC (rev 117)
+++ trunk/xft-config.in 2005-03-31 21:52:51 UTC (rev 118)
@@ -25,6 +25,8 @@
[--prefix[=DIR]]
[--version]
At least one option must be specified.
+
+See the xft-config(1) manual page for more information.
EOF
exit $1
}
Reply to: