diff options
author | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-06-27 16:09:14 +0000 |
---|---|---|
committer | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-06-27 16:09:14 +0000 |
commit | bcdcaebcd2127f4e7e1c368f341a781b4cf8af6b (patch) | |
tree | 256f1eb281aee121eecadf24cab1af4fdc5960c9 | |
parent | e80fd1617092d128d54a9400a4974ffafbb3083e (diff) |
- Remove fontenc from Xfont
- Add a dependency from Xfont on libfontenc
- Add build system for lib/fontenc
- xc/lib/font: Change #include "fontenc.h" to #include
<X11/fonts/fontenc.h> in some places.
- Remove dpsinfo and dpsexec from the app section of symlink.sh
- Fix xp.pc.in to add XPRINT_LIBS/CFLAGS instead of X_LIBS/CFLAGS
-rw-r--r-- | AUTHORS | 0 | ||||
-rw-r--r-- | COPYING | 0 | ||||
-rw-r--r-- | ChangeLog | 0 | ||||
-rw-r--r-- | INSTALL | 0 | ||||
-rw-r--r-- | Makefile.am | 28 | ||||
-rw-r--r-- | NEWS | 0 | ||||
-rw-r--r-- | README | 0 | ||||
-rwxr-xr-x | autogen.sh | 12 | ||||
-rw-r--r-- | configure.ac | 44 | ||||
-rw-r--r-- | fontenc.pc.in | 11 | ||||
-rw-r--r-- | src/Makefile.am | 21 |
11 files changed, 116 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/ChangeLog diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..ad9f262 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,28 @@ +# +# Copyright 2005 Red Hat, Inc. +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of Red Hat not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. Red Hat makes no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +SUBDIRS = src + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = fontenc.pc + +EXTRA_DIST = fontenc.pc.in autogen.sh + diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..904cd67 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..4e4bf13 --- /dev/null +++ b/configure.ac @@ -0,0 +1,44 @@ + +dnl Copyright 2005 Red Hat, Inc. +dnl +dnl Permission to use, copy, modify, distribute, and sell this software and its +dnl documentation for any purpose is hereby granted without fee, provided that +dnl the above copyright notice appear in all copies and that both that +dnl copyright notice and this permission notice appear in supporting +dnl documentation, and that the name of Red Hat not be used in +dnl advertising or publicity pertaining to distribution of the software without +dnl specific, written prior permission. Red Hat makes no +dnl representations about the suitability of this software for any purpose. It +dnl is provided "as is" without express or implied warranty. +dnl +dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR +dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +dnl PERFORMANCE OF THIS SOFTWARE. +dnl +dnl Process this file with autoconf to create configure. + +AC_PREREQ([2.57]) + +AC_INIT(libfontenc, 7.0.0, [sandmann@redhat.com], libfontenc) +AM_INIT_AUTOMAKE([dist-bzip2]) +AM_MAINTAINER_MODE + +AM_CONFIG_HEADER(config.h) + +# Check for progs +AC_PROG_CC +AC_PROG_LIBTOOL + +# Check for dependencies +PKG_CHECK_MODULES(DEP, x11) + +AC_SUBST(DEP_CFLAGS) +AC_SUBST(DEP_LIBS) + +AC_OUTPUT([Makefile + src/Makefile + fontenc.pc]) diff --git a/fontenc.pc.in b/fontenc.pc.in new file mode 100644 index 0000000..c5c149d --- /dev/null +++ b/fontenc.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: fontenc +Description: The fontenc Library +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} @DEP_CFLAGS@ +Libs: -L${libdir} -lfontenc @DEP_LIBS@ + diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..343b7cd --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,21 @@ +lib_LTLIBRARIES = libfontenc.la + +libfontenc_la_SOURCES = \ + encparse.c \ + fontenc.c + +FONTDIR=${libdir}/X11/fonts +FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTDIR)/encodings/encodings.dir\" + +INCLUDES = -I$(top_srcdir)/include/X11/fonts -DFONTENC_NO_LIBFONT $(FONTENCDEFS) + + +libfontenc_la_LIBADD = @DEP_LIBS@ + +libfontenc_la_LDFLAGS = -version-info 7:0:0 -no-undefined + + +libfontencincludedir = $(includedir)/X11/fonts +libfontencinclude_HEADERS = \ + $(top_srcdir)/include/X11/fonts/fontenc.h + |