link against bz2 where necessary.

This commit is contained in:
mrg 2011-07-23 23:42:02 +00:00
parent 186dba1af5
commit 5ddc88b9ab
3 changed files with 14 additions and 6 deletions

View File

@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
# $NetBSD: Makefile,v 1.2 2011/07/23 23:42:02 mrg Exp $
.include <bsd.own.mk>
PROG= bdftopcf
LDADD+= -lXfont -lfontenc -lfreetype -lm -lz
DPADD+= ${LIBXFONT} ${LIBFONTENC} ${LIBFREETYPE} ${LIBM} ${LIBZ}
LDADD+= -lXfont -lfontenc -lfreetype -lm -lz -lbz2
DPADD+= ${LIBXFONT} ${LIBFONTENC} ${LIBFREETYPE} ${LIBM} ${LIBZ} ${LIBBZ2}
.PATH: ${X11SRCDIR.${PROG}}

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2008/09/13 21:37:07 hubertf Exp $
# $NetBSD: Makefile,v 1.4 2011/07/23 23:42:02 mrg Exp $
NOMAN= 1
@ -39,6 +39,9 @@ SRCS.freetype+= type1cid.c
.PATH: ${FREETYPE}/src/gzip
SRCS.freetype+= ftgzip.c
.PATH: ${FREETYPE}/src/bzip2
SRCS.freetype+= ftbzip2.c
.PATH: ${FREETYPE}/src/lzw
SRCS.freetype+= ftlzw.c
@ -102,6 +105,8 @@ HOST_CPPFLAGS+= -I${FONTCONFIG} -I${FREETYPE} \
-I${FONTCONFIG}/../include \
-I${DESTDIR}${X11INCDIR} -I.
LDADD= -lz -lbz2
FCARCH_DEPFILE= fc-cache.c
.include "../../lib/fontconfig/src/Makefile.fcarch"

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2008/09/13 21:37:07 hubertf Exp $
# $NetBSD: Makefile,v 1.3 2011/07/23 23:42:02 mrg Exp $
NOMAN= 1
@ -31,6 +31,9 @@ SRCS.freetype+= type1cid.c
.PATH: ${FREETYPE}/src/gzip
SRCS.freetype+= ftgzip.c
.PATH: ${FREETYPE}/src/bzip2
SRCS.freetype+= ftbzip2.c
.PATH: ${FREETYPE}/src/lzw
SRCS.freetype+= ftlzw.c
@ -75,7 +78,7 @@ SRCS.fontenc= fontenc.c encparse.c
SRCS+= ${SRCS.mkfontscale} ${SRCS.freetype} ${SRCS.fontenc}
LDADD= -lz
LDADD= -lz -lbz2
HOST_CPPFLAGS= -DFONTENC_NO_LIBFONT -DXFREE86_FT2 -DFONTENC_NO_LIBFONT \
-DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON \