Module Name: src
Committed By: mrg
Date: Sun Nov 21 07:45:36 UTC 2010
Modified Files:
src/external/mit/xorg/lib/fontconfig/src: Makefile
Log Message:
update this for fontconfig 2.8.0. ugh.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/fontconfig/src/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.5 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.6
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.5 Sat Nov 1 21:38:14 2008
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Sun Nov 21 07:45:36 2010
@@ -1,14 +1,32 @@
-# $NetBSD: Makefile,v 1.5 2008/11/01 21:38:14 cube Exp $
+# $NetBSD: Makefile,v 1.6 2010/11/21 07:45:36 mrg Exp $
.include <bsd.own.mk>
LIB= fontconfig
.PATH: ${X11SRCDIR.${LIB}}/src
-SRCS= fcatomic.c fcblanks.c fccache.c fccfg.c fccharset.c fcdbg.c \
- fcdefault.c fcdir.c fcfreetype.c fcfs.c fcinit.c fclang.c \
- fclist.c fcmatch.c fcmatrix.c fcname.c fcpat.c fcserialize.c \
- fcstr.c fcxml.c ftglue.h ftglue.c
+SRCS= fcatomic.c \
+ fcblanks.c \
+ fccache.c \
+ fccfg.c \
+ fccharset.c \
+ fcdbg.c \
+ fcdefault.c \
+ fcdir.c \
+ fcformat.c \
+ fcfreetype.c \
+ fcfs.c \
+ fcinit.c \
+ fclang.c \
+ fclist.c \
+ fcmatch.c \
+ fcmatrix.c \
+ fcname.c \
+ fcpat.c \
+ fcserialize.c \
+ fcstr.c \
+ fcxml.c \
+ ftglue.c
.PATH: ${X11SRCDIR.${LIB}}/doc
MAN= FcAtomicCreate.3 FcAtomicDeleteNew.3 FcAtomicDestroy.3 FcAtomicLock.3 \
@@ -98,5 +116,8 @@
# fontconfig uses VERSION and not PACKAGE_VERSION
PKGCONFIG_VERSION.fontconfig= 2.6.0
+# XXX
+CPPFLAGS.fcxml.c= -Wno-error
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
