Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add freetype2/freetype to the include path.

This commit is contained in:
mrg 2018-05-09 08:39:54 +00:00
parent 633cf7552f
commit a071c7d55b
14 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
external/mit/xorg/bin/fonttosfnt/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2011/08/11 23:15:35 joerg Exp $
# $NetBSD: Makefile,v 1.3 2018/05/09 08:39:55 mrg Exp $
.include <bsd.own.mk>
@ -7,10 +7,10 @@ SRCS= fonttosfnt.c read.c write.c struct.c util.c
# XXX XVENDORNAME and XVENDORNAMESHORT should live in a common location
CPPFLAGS+= -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2 \
-I${DESTDIR}${X11INCDIR}/freetype2/freetype \
-DXVENDORNAMESHORT=${XVENDORNAMESHORT} \
-DXVENDORNAME=${XVENDORNAME}
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/fonts \
-I${X11SRCDIR.xc}/extras/freetype2/include
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/fonts
LDADD+= -lfreetype -lfontenc -lz -lm

3
external/mit/xorg/bin/mkfontscale/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2015/07/20 23:50:23 mrg Exp $
# $NetBSD: Makefile,v 1.6 2018/05/09 08:39:55 mrg Exp $
.include <bsd.own.mk>
@ -6,6 +6,7 @@ PROG= mkfontscale
SRCS= mkfontscale.c list.c hash.c ident.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
LDADD+= -lfontenc -lfreetype -lz -lbz2
DPADD+= ${LIBFONTENC} ${LIBFREETYPE} ${LIBZ} ${LIBBZ2}

3
external/mit/xorg/bin/x11perf/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2011/11/20 21:02:23 dholland Exp $
# $NetBSD: Makefile,v 1.4 2018/05/09 08:39:55 mrg Exp $
.include <bsd.own.mk>
@ -9,6 +9,7 @@ SRCS= x11perf.c bitmaps.c do_tests.c do_simple.c do_rects.c do_valgc.c \
CPPFLAGS+= -DMITSHM -DXRENDER
CPPFLAGS+= -DXFT -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
MAN= Xmark.1 x11perf.1 x11perfcomp.1

3
external/mit/xorg/bin/xclock/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2013/05/31 06:24:05 mrg Exp $
# $NetBSD: Makefile,v 1.4 2018/05/09 08:39:55 mrg Exp $
.include <bsd.own.mk>
@ -6,6 +6,7 @@ PROG= xclock
SRCS= xclock.c Clock.c
CPPFLAGS+=-DXRENDER -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+=-I${DESTDIR}${X11INCDIR}/freetype2/freetype
APPDEFS=XClock XClock-color

3
external/mit/xorg/bin/xditview/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2013/05/31 06:50:45 mrg Exp $
# $NetBSD: Makefile,v 1.4 2018/05/09 08:39:55 mrg Exp $
.include <bsd.own.mk>
@ -8,6 +8,7 @@ SRCS= xditview.c Dvi.c draw.c font.c lex.c page.c parse.c \
CPPFLAGS+= -DHAS_MKSTEMP
CPPFLAGS+= -DUSE_XFT -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
APPDEFS=Xditview Xditview-chrtr

3
external/mit/xorg/bin/xdm/Makefile.xdm vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.xdm,v 1.8 2013/06/05 00:01:16 mrg Exp $
# $NetBSD: Makefile.xdm,v 1.9 2018/05/09 08:39:55 mrg Exp $
XDMVARDIR= /var/db/xdm
XDMDIR= ${X11ETCDIR}/xdm
@ -33,6 +33,7 @@ CPPFLAGS+= -DBINDIR=\"${X11BINDIR}\" -DXDMDIR=\"${XDMDIR}\" \
-I${X11SRCDIR.xdm} \
-I${X11SRCDIR.xdm}/include \
-I${DESTDIR}${X11INCDIR}/freetype2 \
-I${DESTDIR}${X11INCDIR}/freetype2/freetype \
${X11FLAGS.VERSION}
LDFLAGS+= -Wl,--export-dynamic

3
external/mit/xorg/bin/xfd/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2013/05/31 07:22:21 mrg Exp $
# $NetBSD: Makefile,v 1.4 2018/05/09 08:39:55 mrg Exp $
.include <bsd.own.mk>
@ -6,6 +6,7 @@ PROG= xfd
SRCS= xfd.c grid.c
CPPFLAGS+= -DXRENDER -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
APPDEFS=Xfd

3
external/mit/xorg/bin/xlogo/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2013/05/31 08:01:59 mrg Exp $
# $NetBSD: Makefile,v 1.4 2018/05/09 08:39:55 mrg Exp $
.include <bsd.own.mk>
@ -6,6 +6,7 @@ PROG= xlogo
SRCS= xlogo.c Logo.c RenderLogo.c
CPPFLAGS+= -DXRENDER -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
APPDEFS=XLogo XLogo-color

3
external/mit/xorg/bin/xterm/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.16 2018/03/14 06:06:40 mrg Exp $
# $NetBSD: Makefile,v 1.17 2018/05/09 08:39:55 mrg Exp $
.include <bsd.own.mk>
@ -16,6 +16,7 @@ CPPFLAGS+= -I. \
-I${X11SRCDIR.${PROG}} \
-I${X11SRCDIR.${PROG}}/../include \
-I${DESTDIR}${X11INCDIR}/freetype2 \
-I${DESTDIR}${X11INCDIR}/freetype2/freetype \
-DPROJECTROOT=${X11ROOTDIR} \
-DHAVE_CONFIG_H \
-D_REENTRANT \

3
external/mit/xorg/lib/fontconfig/src/Makefile.fcarch vendored
View File

@ -1,8 +1,9 @@
# $NetBSD: Makefile.fcarch,v 1.3 2013/06/03 06:46:54 mrg Exp $
# $NetBSD: Makefile.fcarch,v 1.4 2018/05/09 08:39:54 mrg Exp $
.ifndef _FONTCONFIG_FCARCH_MK_
_FONTCONFIG_FCARCH_MK_=1
CPPFLAGS+= -DFC_ARCHITECTURE="\"${MACHINE_ARCH}\""
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
.endif

3
external/mit/xorg/lib/libXdmGreet/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 2013/09/12 04:42:49 dholland Exp $
# $NetBSD: Makefile,v 1.5 2018/05/09 08:39:54 mrg Exp $
.include <bsd.own.mk>
@ -15,6 +15,7 @@ CPPFLAGS+= -I${X11SRCDIR.xdm}/include -DRETSIGTYPE=void
# be elided, causes xdm to fail to accept password input and
# then crash at login "failure".
#CPPFLAGS+= -DGREET_LIB
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
LIBDPLIBS=\
Xext ${.CURDIR}/../libXext \

3
external/mit/xorg/lib/libXfont/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.10 2015/02/25 20:01:39 snj Exp $
# $NetBSD: Makefile,v 1.11 2018/05/09 08:39:54 mrg Exp $
.include <bsd.own.mk>
@ -45,6 +45,7 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/fonts
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+= -I${XFONTDIR}/src/stubs
CPPFLAGS+= -I${XFONTDIR}/../include
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
LIBDPLIBS=\
Xt ${.CURDIR}/../libXt \

3
external/mit/xorg/lib/libXfont2/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2018/03/13 02:23:28 mrg Exp $
# $NetBSD: Makefile,v 1.4 2018/05/09 08:39:54 mrg Exp $
.include <bsd.own.mk>
@ -109,6 +109,7 @@ CPPFLAGS+= -I${XFONT2DIR}/../include
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/fonts
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
LIBDPLIBS=\
Xt ${.CURDIR}/../libXt \

3
external/mit/xorg/lib/libXft/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.8 2018/02/02 01:02:40 mrg Exp $
# $NetBSD: Makefile,v 1.9 2018/05/09 08:39:54 mrg Exp $
.include <bsd.own.mk>
@ -19,6 +19,7 @@ MAN= Xft.3
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= -DFREETYPE2 -I${DESTDIR}${X11INCDIR}/freetype2 -DXFREE86_FT2
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/Xft
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
LIBDPLIBS= X11 ${.CURDIR}/../libX11/dynamic \
fontconfig ${.CURDIR}/../fontconfig/src \