Update to libXft 2.2.0
Tested by ajacoutot@, jasper@, krw@ and on a bulk ports build by landry@
This commit is contained in:
parent
5748f35886
commit
2b655e7a9e
@ -1,3 +1,202 @@
|
||||
commit b9d4a2b5be71ca883f5a876500edb0a1a9add0cf
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Fri Oct 29 16:21:18 2010 -0700
|
||||
|
||||
libXft 2.2.0
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 8751e341bcc29952b4603e18767ab994653c6b01
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Tue Sep 21 22:00:33 2010 -0700
|
||||
|
||||
xft.pc.in: Requires.private entries should not be duplicated in Requires
|
||||
|
||||
Users of libXft don't need to link with fontconfig, freetype and
|
||||
Xrender directly if they don't use them.
|
||||
|
||||
This may cause issues for users of pkg-config versions older than 0.22.
|
||||
Please upgrade to the 2007 version of pkg-config before trying to build
|
||||
the 2010 version of libXft.
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit ca575f9c9cbb11b122e676424a93da3eb0284be5
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Sun Oct 17 20:42:41 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
|
||||
Use the appropriate platform version of sed
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit 6d220e32c1e336292cac125515f04bcbdb65322d
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Wed Mar 31 10:03:03 2010 -0400
|
||||
|
||||
man: build man pages the standard way
|
||||
|
||||
Using macro substitution.
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit f2bd643475a555949558ff6f889c575da33c28a4
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Tue Mar 30 14:01:31 2010 -0400
|
||||
|
||||
config: remove deprecated xft-config script and man page
|
||||
|
||||
This was put in place early 2000 when pkg-config was not used.
|
||||
|
||||
Reviewed-by: Rémi Cardona <remi@gentoo.org>
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit a33850fe1af31cf672e448a3c86ac5afb9fee06c
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Tue Mar 30 09:44:47 2010 -0400
|
||||
|
||||
config: remove the xft-config.in file from EXTRA_DIST
|
||||
|
||||
Automake always includes it in the tarball.
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit b443002c146569077394675c9e784b173d48c6e6
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Mon Mar 29 16:50:34 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 26dc5b0f626615156ca8a317f428ebc7c2d50498
|
||||
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 78ed756a343c37acb38cc230d03c334845553ab6
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Tue Dec 8 11:13:11 2009 -0500
|
||||
|
||||
Xft.h.in: remove comments which prevents Xft.h generation #25104
|
||||
|
||||
With automake prior to 2.62, commnents placed beside a #undef line
|
||||
prevent that statement to be substituted by config.status.
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Tested-by: Adrian Bunk <bunk@stusta.de>
|
||||
|
||||
commit ad762b61d79e1848ef0751d0b970f4f7660a886e
|
||||
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 f6bab0a9abbaf4c2381c790372c830e0c8d78df4
|
||||
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 cf899b63a331b908a2d4027354ce0d7c13528638
|
||||
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 f0f9ad0cb2d66d35f522fa9ec19974500b3955ab
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Mon Oct 26 22:08:43 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 80e41cb93d0100a767aa8d630240440090937712
|
||||
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 cf6372a5dd9dd4086ed243d3f6c7e5fe693594b0
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Wed Oct 21 21:45:46 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 6f756640698b8f7bbada91999b4e30a0851bb6f4
|
||||
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
|
||||
Date: Wed Oct 21 12:47:25 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 906259ecc70dd4d0ef91f4582bd2a035d094831e
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Tue Oct 13 10:31:58 2009 -0700
|
||||
|
||||
Set libtool version-number automatically from package version
|
||||
|
||||
Since we've forgotten to manually update in most libXft releases so far,
|
||||
might as well just automate it.
|
||||
|
||||
Reported by: Paulo Ricardo Zanoni <pzanoni@mandriva.com>
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
commit fc248fb44413d11fed288793d0d8c2af76aeeb40
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Fri Oct 9 16:45:25 2009 -0700
|
||||
|
@ -21,19 +21,17 @@
|
||||
|
||||
SUBDIRS = man src
|
||||
|
||||
bin_SCRIPTS = xft-config
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = xft.pc
|
||||
|
||||
CLEANFILES = xft-config
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
|
||||
EXTRA_DIST = xft-config.in xft.pc.in ChangeLog
|
||||
MAINTAINERCLEANFILES = ChangeLog
|
||||
.PHONY: ChangeLog INSTALL
|
||||
|
||||
.PHONY: ChangeLog
|
||||
INSTALL:
|
||||
$(INSTALL_CMD)
|
||||
|
||||
ChangeLog:
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
dist-hook: ChangeLog INSTALL
|
||||
|
@ -35,7 +35,6 @@
|
||||
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
# PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
@ -60,10 +59,10 @@ build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
||||
$(srcdir)/xft-config.in $(srcdir)/xft.pc.in \
|
||||
$(top_srcdir)/configure $(top_srcdir)/include/X11/Xft/Xft.h.in \
|
||||
AUTHORS COPYING ChangeLog INSTALL NEWS config.guess config.sub \
|
||||
depcomp install-sh ltmain.sh missing
|
||||
$(srcdir)/xft.pc.in $(top_srcdir)/configure \
|
||||
$(top_srcdir)/include/X11/Xft/Xft.h.in AUTHORS COPYING \
|
||||
ChangeLog INSTALL NEWS config.guess config.sub depcomp \
|
||||
install-sh ltmain.sh missing
|
||||
subdir = .
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||
@ -73,10 +72,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
|
||||
configure.lineno configure.status.lineno
|
||||
mkinstalldirs = $(SHELL) $(install_sh) -d
|
||||
CONFIG_HEADER = config.h $(top_builddir)/include/X11/Xft/Xft.h
|
||||
CONFIG_CLEAN_FILES = xft.pc xft-config
|
||||
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"
|
||||
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
|
||||
SCRIPTS = $(bin_SCRIPTS)
|
||||
CONFIG_CLEAN_FILES = xft.pc
|
||||
SOURCES =
|
||||
DIST_SOURCES =
|
||||
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
|
||||
@ -91,6 +87,7 @@ am__vpath_adj = case $$p in \
|
||||
*) f=$$p;; \
|
||||
esac;
|
||||
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
||||
am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
|
||||
pkgconfigDATA_INSTALL = $(INSTALL_DATA)
|
||||
DATA = $(pkgconfig_DATA)
|
||||
ETAGS = etags
|
||||
@ -106,12 +103,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@
|
||||
@ -151,6 +150,7 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
|
||||
FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
|
||||
FREETYPE_LIBS = @FREETYPE_LIBS@
|
||||
GREP = @GREP@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -167,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@
|
||||
@ -185,7 +186,9 @@ SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XFT_LT_VERSION = @XFT_LT_VERSION@
|
||||
XMKMF = @XMKMF@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
XRENDER_CFLAGS = @XRENDER_CFLAGS@
|
||||
XRENDER_LIBS = @XRENDER_LIBS@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
@ -208,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,12 +240,9 @@ sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
SUBDIRS = man src
|
||||
bin_SCRIPTS = xft-config
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = xft.pc
|
||||
CLEANFILES = xft-config
|
||||
EXTRA_DIST = xft-config.in xft.pc.in ChangeLog
|
||||
MAINTAINERCLEANFILES = ChangeLog
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
||||
|
||||
@ -254,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 \
|
||||
@ -310,27 +309,6 @@ distclean-hdr:
|
||||
-rm -f config.h stamp-h1 include/X11/Xft/Xft.h include/X11/Xft/stamp-h2
|
||||
xft.pc: $(top_builddir)/config.status $(srcdir)/xft.pc.in
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $@
|
||||
xft-config: $(top_builddir)/config.status $(srcdir)/xft-config.in
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $@
|
||||
install-binSCRIPTS: $(bin_SCRIPTS)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
|
||||
@list='$(bin_SCRIPTS)'; for p in $$list; do \
|
||||
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
if test -f $$d$$p; then \
|
||||
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
|
||||
echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
|
||||
$(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
|
||||
else :; fi; \
|
||||
done
|
||||
|
||||
uninstall-binSCRIPTS:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@list='$(bin_SCRIPTS)'; for p in $$list; do \
|
||||
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
|
||||
echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
|
||||
rm -f "$(DESTDIR)$(bindir)/$$f"; \
|
||||
done
|
||||
|
||||
mostlyclean-libtool:
|
||||
-rm -f *.lo
|
||||
@ -494,7 +472,7 @@ distclean-tags:
|
||||
distdir: $(DISTFILES)
|
||||
$(am__remove_distdir)
|
||||
mkdir $(distdir)
|
||||
$(mkdir_p) $(distdir)/. $(distdir)/include/X11/Xft $(distdir)/man
|
||||
$(mkdir_p) $(distdir)/. $(distdir)/include/X11/Xft
|
||||
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
||||
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
|
||||
list='$(DISTFILES)'; for file in $$list; do \
|
||||
@ -638,10 +616,10 @@ distcleancheck: distclean
|
||||
exit 1; } >&2
|
||||
check-am: all-am
|
||||
check: check-recursive
|
||||
all-am: Makefile $(SCRIPTS) $(DATA) config.h
|
||||
all-am: Makefile $(DATA) config.h
|
||||
installdirs: installdirs-recursive
|
||||
installdirs-am:
|
||||
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"; do \
|
||||
for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
|
||||
test -z "$$dir" || $(mkdir_p) "$$dir"; \
|
||||
done
|
||||
install: install-recursive
|
||||
@ -661,7 +639,6 @@ install-strip:
|
||||
mostlyclean-generic:
|
||||
|
||||
clean-generic:
|
||||
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
|
||||
|
||||
distclean-generic:
|
||||
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
||||
@ -692,7 +669,7 @@ info-am:
|
||||
|
||||
install-data-am: install-pkgconfigDATA
|
||||
|
||||
install-exec-am: install-binSCRIPTS
|
||||
install-exec-am:
|
||||
|
||||
install-info: install-info-recursive
|
||||
|
||||
@ -718,8 +695,7 @@ ps: ps-recursive
|
||||
|
||||
ps-am:
|
||||
|
||||
uninstall-am: uninstall-binSCRIPTS uninstall-info-am \
|
||||
uninstall-pkgconfigDATA
|
||||
uninstall-am: uninstall-info-am uninstall-pkgconfigDATA
|
||||
|
||||
uninstall-info: uninstall-info-recursive
|
||||
|
||||
@ -730,23 +706,26 @@ uninstall-info: uninstall-info-recursive
|
||||
distclean-generic distclean-hdr distclean-libtool \
|
||||
distclean-recursive distclean-tags distcleancheck distdir \
|
||||
distuninstallcheck dvi dvi-am html html-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-man install-pkgconfigDATA \
|
||||
install-strip installcheck installcheck-am installdirs \
|
||||
installdirs-am maintainer-clean maintainer-clean-generic \
|
||||
maintainer-clean-recursive mostlyclean mostlyclean-generic \
|
||||
mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
|
||||
tags tags-recursive uninstall uninstall-am \
|
||||
uninstall-binSCRIPTS uninstall-info-am uninstall-pkgconfigDATA
|
||||
install install-am install-data install-data-am install-exec \
|
||||
install-exec-am install-info install-info-am install-man \
|
||||
install-pkgconfigDATA install-strip installcheck \
|
||||
installcheck-am installdirs installdirs-am maintainer-clean \
|
||||
maintainer-clean-generic maintainer-clean-recursive \
|
||||
mostlyclean mostlyclean-generic mostlyclean-libtool \
|
||||
mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
|
||||
uninstall uninstall-am uninstall-info-am \
|
||||
uninstall-pkgconfigDATA
|
||||
|
||||
|
||||
.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:
|
||||
|
@ -1,12 +1,16 @@
|
||||
Xft
|
||||
X FreeType library
|
||||
Version 2.1.14
|
||||
2009-10-09
|
||||
Version 2.2.0
|
||||
2010-10-29
|
||||
|
||||
Xft version 2.1 is the first stand alone release of Xft, a library that
|
||||
connects X applications with the FreeType font rasterization library. Xft
|
||||
uses fontconfig to locate fonts so it has no configuration files.
|
||||
|
||||
Version 2.2.0
|
||||
|
||||
Dropped xft-config, now that pkg-config is well established.
|
||||
|
||||
Version 2.1.14
|
||||
|
||||
Added fake bold support (#1579, Novell #38202/223682).
|
||||
|
839
lib/libXft/aclocal.m4
vendored
839
lib/libXft/aclocal.m4
vendored
File diff suppressed because it is too large
Load Diff
3915
lib/libXft/configure
vendored
3915
lib/libXft/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -21,28 +21,31 @@ 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 version number will be substituted into Xft.h
|
||||
dnl Please bump the minor library number at each release as well.
|
||||
dnl
|
||||
AC_INIT(libXft, 2.1.14, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXft)
|
||||
AC_INIT([libXft], [2.2.0],
|
||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXft])
|
||||
AC_CONFIG_AUX_DIR(.)
|
||||
|
||||
AM_INIT_AUTOMAKE([dist-bzip2])
|
||||
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
# Require xorg-macros: XORG_DEFAULT_OPTIONS
|
||||
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.3)
|
||||
# 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
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
# checks for progs
|
||||
AC_PROG_CC
|
||||
AC_PROG_LIBTOOL
|
||||
XORG_DEFAULT_OPTIONS
|
||||
AC_PROG_SED
|
||||
|
||||
# Set library version for Xft.h from package version set in AC_INIT
|
||||
# copied from PACKAGE_VERSION_* settings in XORG_VERSION
|
||||
@ -57,6 +60,9 @@ AC_DEFINE_UNQUOTED([XFT_REVISION],
|
||||
[`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`],
|
||||
[Micro revision of Xft])
|
||||
|
||||
XFT_LT_VERSION=`echo $PACKAGE_VERSION | tr '.' ':'`
|
||||
AC_SUBST([XFT_LT_VERSION])
|
||||
|
||||
#
|
||||
# Check for Xrender
|
||||
#
|
||||
@ -145,8 +151,5 @@ fi
|
||||
|
||||
AC_OUTPUT([Makefile
|
||||
xft.pc
|
||||
xft-config
|
||||
src/Makefile
|
||||
man/Makefile
|
||||
man/xft-config.1
|
||||
man/Xft.3])
|
||||
man/Makefile])
|
||||
|
@ -26,10 +26,10 @@
|
||||
/*
|
||||
* Current Xft version number, set from version in the Xft configure.ac file.
|
||||
*/
|
||||
|
||||
#undef XFT_MAJOR /* Will be substituted by configure */
|
||||
#undef XFT_MINOR /* Will be substituted by configure */
|
||||
#undef XFT_REVISION /* Will be substituted by configure */
|
||||
/* #undef will be substituted by configure */
|
||||
#undef XFT_MAJOR
|
||||
#undef XFT_MINOR
|
||||
#undef XFT_REVISION
|
||||
|
||||
#define XFT_VERSION ((XFT_MAJOR * 10000) + (XFT_MINOR * 100) + (XFT_REVISION))
|
||||
#define XftVersion XFT_VERSION
|
||||
|
@ -1,2 +1,11 @@
|
||||
dist_man_MANS = Xft.3 xft-config.1
|
||||
EXTRA_DIST = xft-config.1.in Xft.3.in
|
||||
libman_PRE = Xft.man
|
||||
libmandir = $(LIB_MAN_DIR)
|
||||
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.$(LIB_MAN_SUFFIX):
|
||||
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|
||||
|
@ -13,6 +13,7 @@
|
||||
# PARTICULAR PURPOSE.
|
||||
|
||||
@SET_MAKE@
|
||||
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
@ -36,9 +37,7 @@ POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
subdir = man
|
||||
DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/Xft.3.in \
|
||||
$(srcdir)/xft-config.1.in
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
@ -46,14 +45,18 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
mkinstalldirs = $(SHELL) $(install_sh) -d
|
||||
CONFIG_HEADER = $(top_builddir)/config.h \
|
||||
$(top_builddir)/include/X11/Xft/Xft.h
|
||||
CONFIG_CLEAN_FILES = xft-config.1 Xft.3
|
||||
CONFIG_CLEAN_FILES =
|
||||
SOURCES =
|
||||
DIST_SOURCES =
|
||||
man1dir = $(mandir)/man1
|
||||
am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)"
|
||||
man3dir = $(mandir)/man3
|
||||
NROFF = nroff
|
||||
MANS = $(dist_man_MANS)
|
||||
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
||||
am__vpath_adj = case $$p in \
|
||||
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
||||
*) f=$$p;; \
|
||||
esac;
|
||||
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
||||
am__installdirs = "$(DESTDIR)$(libmandir)"
|
||||
libmanDATA_INSTALL = $(INSTALL_DATA)
|
||||
DATA = $(libman_DATA)
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
|
||||
@ -61,6 +64,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@
|
||||
@ -100,6 +104,7 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
|
||||
FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
|
||||
FREETYPE_LIBS = @FREETYPE_LIBS@
|
||||
GREP = @GREP@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -116,6 +121,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@
|
||||
@ -134,7 +140,9 @@ SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XFT_LT_VERSION = @XFT_LT_VERSION@
|
||||
XMKMF = @XMKMF@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
XRENDER_CFLAGS = @XRENDER_CFLAGS@
|
||||
XRENDER_LIBS = @XRENDER_LIBS@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
@ -157,7 +165,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@
|
||||
@ -186,11 +193,16 @@ sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
dist_man_MANS = Xft.3 xft-config.1
|
||||
EXTRA_DIST = xft-config.1.in Xft.3.in
|
||||
libman_PRE = Xft.man
|
||||
libmandir = $(LIB_MAN_DIR)
|
||||
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
|
||||
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
|
||||
@for dep in $?; do \
|
||||
case '$(am__configure_deps)' in \
|
||||
@ -200,9 +212,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 \
|
||||
@ -220,10 +232,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||
xft-config.1: $(top_builddir)/config.status $(srcdir)/xft-config.1.in
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
|
||||
Xft.3: $(top_builddir)/config.status $(srcdir)/Xft.3.in
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
|
||||
|
||||
mostlyclean-libtool:
|
||||
-rm -f *.lo
|
||||
@ -234,95 +242,22 @@ clean-libtool:
|
||||
distclean-libtool:
|
||||
-rm -f libtool
|
||||
uninstall-info-am:
|
||||
install-man1: $(man1_MANS) $(man_MANS)
|
||||
install-libmanDATA: $(libman_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(man1dir)" || $(mkdir_p) "$(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"; \
|
||||
test -z "$(libmandir)" || $(mkdir_p) "$(DESTDIR)$(libmandir)"
|
||||
@list='$(libman_DATA)'; for p in $$list; do \
|
||||
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
f=$(am__strip_dir) \
|
||||
echo " $(libmanDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libmandir)/$$f'"; \
|
||||
$(libmanDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libmandir)/$$f"; \
|
||||
done
|
||||
uninstall-man1:
|
||||
|
||||
uninstall-libmanDATA:
|
||||
@$(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
|
||||
install-man3: $(man3_MANS) $(man_MANS)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(man3dir)" || $(mkdir_p) "$(DESTDIR)$(man3dir)"
|
||||
@list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
|
||||
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
|
||||
for i in $$l2; do \
|
||||
case "$$i" in \
|
||||
*.3*) 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 \
|
||||
3*) ;; \
|
||||
*) ext='3' ;; \
|
||||
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)$(man3dir)/$$inst'"; \
|
||||
$(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
|
||||
done
|
||||
uninstall-man3:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
|
||||
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
|
||||
for i in $$l2; do \
|
||||
case "$$i" in \
|
||||
*.3*) list="$$list $$i" ;; \
|
||||
esac; \
|
||||
done; \
|
||||
for i in $$list; do \
|
||||
ext=`echo $$i | sed -e 's/^.*\\.//'`; \
|
||||
case "$$ext" in \
|
||||
3*) ;; \
|
||||
*) ext='3' ;; \
|
||||
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)$(man3dir)/$$inst'"; \
|
||||
rm -f "$(DESTDIR)$(man3dir)/$$inst"; \
|
||||
@list='$(libman_DATA)'; for p in $$list; do \
|
||||
f=$(am__strip_dir) \
|
||||
echo " rm -f '$(DESTDIR)$(libmandir)/$$f'"; \
|
||||
rm -f "$(DESTDIR)$(libmandir)/$$f"; \
|
||||
done
|
||||
tags: TAGS
|
||||
TAGS:
|
||||
@ -360,9 +295,9 @@ distdir: $(DISTFILES)
|
||||
done
|
||||
check-am: all-am
|
||||
check: check-am
|
||||
all-am: Makefile $(MANS)
|
||||
all-am: Makefile $(DATA)
|
||||
installdirs:
|
||||
for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)"; do \
|
||||
for dir in "$(DESTDIR)$(libmandir)"; do \
|
||||
test -z "$$dir" || $(mkdir_p) "$$dir"; \
|
||||
done
|
||||
install: install-am
|
||||
@ -382,6 +317,7 @@ install-strip:
|
||||
mostlyclean-generic:
|
||||
|
||||
clean-generic:
|
||||
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
|
||||
|
||||
distclean-generic:
|
||||
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
||||
@ -407,13 +343,13 @@ info: info-am
|
||||
|
||||
info-am:
|
||||
|
||||
install-data-am: install-man
|
||||
install-data-am: install-libmanDATA
|
||||
|
||||
install-exec-am:
|
||||
|
||||
install-info: install-info-am
|
||||
|
||||
install-man: install-man1 install-man3
|
||||
install-man:
|
||||
|
||||
installcheck-am:
|
||||
|
||||
@ -433,21 +369,22 @@ ps: ps-am
|
||||
|
||||
ps-am:
|
||||
|
||||
uninstall-am: uninstall-info-am uninstall-man
|
||||
|
||||
uninstall-man: uninstall-man1 uninstall-man3
|
||||
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-man install-man1 \
|
||||
install-man3 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-man uninstall-man1 uninstall-man3
|
||||
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
|
||||
|
||||
|
||||
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
|
||||
.man.$(LIB_MAN_SUFFIX):
|
||||
$(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:
|
||||
|
@ -19,7 +19,7 @@
|
||||
.\" TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
.\" PERFORMANCE OF THIS SOFTWARE.
|
||||
.\"
|
||||
.TH Xft 3 "Version @VERSION@" "Xft"
|
||||
.TH Xft __libmansuffix__ __vendorversion__
|
||||
.SH NAME
|
||||
Xft \- X FreeType interface library
|
||||
.SH DESCRIPTION
|
@ -1,120 +0,0 @@
|
||||
.\" 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
|
||||
.\" THE AUTHOR(S) OR COPYRIGHT HOLDER(S) 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 installation \
|
||||
directory information
|
||||
.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).
|
||||
Depending on how it is invoked,
|
||||
.B xft\-config
|
||||
reports the installed version of Xft, the compiler and linker flags
|
||||
that are required to successfully compile and link C (or C-compatible) code
|
||||
that uses the library, and/or the directories used by the GNU Autotools to
|
||||
install its files.
|
||||
Note that if the system's installed version of Xft came from an OS vendor
|
||||
or other third party, the actual location of its files may differ from
|
||||
those reported by
|
||||
.BR xft\-config .
|
||||
The system adminstrator can also relocate Xft's files.
|
||||
.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
|
@ -24,7 +24,7 @@ libXft_la_SOURCES = xftint.h \
|
||||
libXft_la_LIBADD = @FONTCONFIG_LIBS@ @FREETYPE_LIBS@ @XRENDER_LIBS@
|
||||
|
||||
# -version-number requires libtool >= 1.5
|
||||
libXft_la_LDFLAGS = -version-number 2:1:13 -no-undefined
|
||||
libXft_la_LDFLAGS = -version-number $(XFT_LT_VERSION) -no-undefined
|
||||
|
||||
libXftincludedir = $(includedir)/X11/Xft
|
||||
libXftinclude_HEADERS = \
|
||||
|
@ -88,6 +88,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@
|
||||
@ -127,6 +128,7 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
|
||||
FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
|
||||
FREETYPE_LIBS = @FREETYPE_LIBS@
|
||||
GREP = @GREP@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -143,6 +145,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@
|
||||
@ -161,7 +164,9 @@ SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XFT_LT_VERSION = @XFT_LT_VERSION@
|
||||
XMKMF = @XMKMF@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
XRENDER_CFLAGS = @XRENDER_CFLAGS@
|
||||
XRENDER_LIBS = @XRENDER_LIBS@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
@ -184,7 +189,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,7 +242,7 @@ libXft_la_SOURCES = xftint.h \
|
||||
libXft_la_LIBADD = @FONTCONFIG_LIBS@ @FREETYPE_LIBS@ @XRENDER_LIBS@
|
||||
|
||||
# -version-number requires libtool >= 1.5
|
||||
libXft_la_LDFLAGS = -version-number 2:1:13 -no-undefined
|
||||
libXft_la_LDFLAGS = -version-number $(XFT_LT_VERSION) -no-undefined
|
||||
libXftincludedir = $(includedir)/X11/Xft
|
||||
libXftinclude_HEADERS = \
|
||||
$(top_builddir)/include/X11/Xft/Xft.h \
|
||||
@ -257,9 +261,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 \
|
||||
|
@ -1,100 +0,0 @@
|
||||
#! /bin/sh
|
||||
|
||||
prefix="@prefix@"
|
||||
exec_prefix="@exec_prefix@"
|
||||
libdir="@libdir@"
|
||||
includedir="@includedir@"
|
||||
version="@VERSION@"
|
||||
freetypelibs="@FREETYPE_LIBS@"
|
||||
freetypecflags="@FREETYPE_CFLAGS@"
|
||||
fontconfiglibs="@FONTCONFIG_LIBS@"
|
||||
fontconfigcflags="@FONTCONFIG_CFLAGS@"
|
||||
xrenderlibs="@XRENDER_LIBS@"
|
||||
xrendercflags="@XRENDER_CFLAGS@"
|
||||
|
||||
usage()
|
||||
{
|
||||
cat <<EOF
|
||||
Usage: xft-config [OPTIONS] [LIBRARIES]
|
||||
Options:
|
||||
[--prefix[=DIR]]
|
||||
[--exec-prefix[=DIR]]
|
||||
[--version]
|
||||
[--libs]
|
||||
[--cflags]
|
||||
EOF
|
||||
exit $1
|
||||
}
|
||||
|
||||
if test $# -eq 0 ; then
|
||||
usage 1 1>&2
|
||||
fi
|
||||
|
||||
while test $# -gt 0 ; do
|
||||
case "$1" in
|
||||
-*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
|
||||
*) optarg= ;;
|
||||
esac
|
||||
|
||||
case $1 in
|
||||
--prefix=*)
|
||||
prefix=$optarg
|
||||
local_prefix=yes
|
||||
;;
|
||||
--prefix)
|
||||
echo_prefix=yes
|
||||
;;
|
||||
--exec-prefix=*)
|
||||
exec_prefix=$optarg
|
||||
exec_prefix_set=yes
|
||||
local_prefix=yes
|
||||
;;
|
||||
--exec-prefix)
|
||||
echo_exec_prefix=yes
|
||||
;;
|
||||
--version)
|
||||
echo $version
|
||||
exit 0
|
||||
;;
|
||||
--cflags)
|
||||
echo_cflags=yes
|
||||
;;
|
||||
--libs)
|
||||
echo_libs=yes
|
||||
;;
|
||||
*)
|
||||
usage 1 1>&2
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
if test "$local_prefix" = "yes" ; then
|
||||
if test "$exec_prefix_set" != "yes" ; then
|
||||
exec_prefix=$prefix
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$echo_prefix" = "yes" ; then
|
||||
echo $prefix
|
||||
fi
|
||||
|
||||
if test "$echo_exec_prefix" = "yes" ; then
|
||||
echo $exec_prefix
|
||||
fi
|
||||
|
||||
if test "$echo_cflags" = "yes" ; then
|
||||
cflags="-I${includedir} ${freetypecflags} ${fontconfigcflags} ${xrendercflags}"
|
||||
echo $cflags
|
||||
fi
|
||||
|
||||
if test "$echo_libs" = "yes" ; then
|
||||
libs="-lXft -lX11 ${freetypelibs} ${fontconfiglibs} ${xrenderlibs}"
|
||||
if test "${libdir}" != "/usr/lib" ; then
|
||||
echo -L${libdir} $libs
|
||||
else
|
||||
echo $libs
|
||||
fi
|
||||
fi
|
||||
|
||||
# EOF
|
@ -6,7 +6,7 @@ includedir=@includedir@
|
||||
Name: Xft
|
||||
Description: X FreeType library
|
||||
Version: @VERSION@
|
||||
Requires: xproto, xrender, fontconfig, freetype2
|
||||
Requires: xproto
|
||||
Requires.private: xrender, fontconfig, freetype2
|
||||
Cflags: -I${includedir}
|
||||
Libs: -L${libdir} -lXft
|
||||
|
Loading…
Reference in New Issue
Block a user