diff options
| author | Keith Packard <keithp@keithp.com> | 2002-08-19 19:32:05 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2002-08-19 19:32:05 +0000 |
| commit | fa244f3d8807415247c8aeb77145502b1cb9ace8 (patch) | |
| tree | 05936b45de1afce0a6f9bceb3ba4ce538cc78916 /config | |
| parent | 5d43e799197d2758102b699f9bc12b3c116a9b80 (diff) | |
Various config changes plus a couple of optimizations from Owen
Diffstat (limited to 'config')
| -rw-r--r-- | config/Makedefs.in | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/config/Makedefs.in b/config/Makedefs.in index f3603f7..82582cf 100644 --- a/config/Makedefs.in +++ b/config/Makedefs.in @@ -1,5 +1,5 @@ # -# $XFree86: xc/lib/fontconfig/config/Makedefs.in,v 1.2 2002/05/21 17:48:15 keithp Exp $ +# $XFree86: xc/lib/fontconfig/config/Makedefs.in,v 1.3 2002/08/01 15:57:26 keithp Exp $ # # Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. # @@ -32,19 +32,12 @@ bindir=@bindir@ datadir=@datadir@ includedir=@includedir@ sysconfdir=@sysconfdir@ - -CDEBUGFLAGS=@CFLAGS@ -CPPFLAGS=@CPPFLAGS@ -DEFS=@DEFS@ +confdir=@confdir@ DSO_LDOPTS=@DSO_LDOPTS@ DSO_CFLAGS=@DSO_CFLAGS@ DSO_PIC_CFLAGS=@DSO_PIC_CFLAGS@ -INCLUDES=-I$(TOPDIR) -I$(srcdir) - -CFLAGS=$(CDEBUGFLAGS) $(INCLUDES) $(DEFS) $(CPPFLAGS) - INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ INSTALL_SCRIPT=@INSTALL_SCRIPT@ @@ -52,10 +45,6 @@ INSTALL_DATA=@INSTALL_DATA@ MKSHLIB=@MKSHLIB@ LN_S=@LN_S@ -X_FONT_DIR=@X_FONT_DIR@ -FC_DEFAULT_FONTS=@FC_DEFAULT_FONTS@ -FONTCONFIG_PATH=@FONTCONFIG_PATH@ - # shared libraries LIBDIR=$(libdir) # programs @@ -65,6 +54,16 @@ CONFDIR=@CONFDIR@ # include files INCLUDEDIR=$(includedir)/fontconfig +X_FONT_DIR=@X_FONT_DIR@ +FC_DEFAULT_FONTS=@FC_DEFAULT_FONTS@ +FCPATH_DEF=-DFONTCONFIG_PATH=\"$(CONFDIR)\" + +CDEBUGFLAGS=@CFLAGS@ + +INCLUDES=-I$(TOPDIR) -I$(srcdir) @CPPFLAGS@ + +CFLAGS=$(CDEBUGFLAGS) @DEFS@ $(FCPATH_DEF) $(INCLUDES) + LIBBASE=libfontconfig.so LIBFILE=$(LIBBASE).@PACKAGE_MAJOR@.@PACKAGE_MINOR@ LIBMAJOR=$(LIBBASE).@PACKAGE_MAJOR@ |