Module Name: src Committed By: cjep Date: Mon Jun 7 09:45:55 UTC 2021
Modified Files: src/share/mk [cjep_sun2x]: bsd.x11.mk Log Message: font library combinations To generate a diff of this commit: cvs rdiff -u -r1.138.4.3 -r1.138.4.4 src/share/mk/bsd.x11.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/share/mk/bsd.x11.mk diff -u src/share/mk/bsd.x11.mk:1.138.4.3 src/share/mk/bsd.x11.mk:1.138.4.4 --- src/share/mk/bsd.x11.mk:1.138.4.3 Sun Jun 6 20:30:49 2021 +++ src/share/mk/bsd.x11.mk Mon Jun 7 09:45:55 2021 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.x11.mk,v 1.138.4.3 2021/06/06 20:30:49 cjep Exp $ +# $NetBSD: bsd.x11.mk,v 1.138.4.4 2021/06/07 09:45:55 cjep Exp $ .include <bsd.init.mk> @@ -177,6 +177,9 @@ LDFLAGS+= -Wl,-rpath,${X11USRLIBDIR} -L XLIBLDADD_XAU= -lXau XLIBDPADD_XAU= ${LIBXAU} +XLIBLDADD_FNT= -lfreetype -lfontenc -lz +XLIBDPADD_FNT= ${LIBFREETYPE} ${LIBFONTENC} ${LIBZ} + XLIBLDADD_FC= -lfontconfig -lfreetype -lexpat -lz -lbz2 XLIBDPADD_FC= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} \ ${LIBZ} ${LIBBZ2}