Rework build to use buildlink.mk files so that it won't pick up installed
headers and libraries during a "make build".
This commit is contained in:
parent
3fff674009
commit
88a22cb3bd
3 changed files with 16 additions and 21 deletions
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.4 2001/03/16 13:28:38 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.5 2001/05/28 03:16:44 jlam Exp $
|
||||
|
||||
PKGNAME= freetype-lib-${FT_VERS}
|
||||
|
||||
|
@ -9,13 +9,4 @@ CONFIGURE_ARGS+= --without-x
|
|||
ALL_TARGET= ttlib ttpo
|
||||
INSTALL_TARGET= install-ttlib install-ttpo
|
||||
|
||||
pre-build:
|
||||
@if ${PKG_INFO} -qe 'freetype-lib<${FT_VERS}'; then \
|
||||
${ECHO} "**** An older version of freetype-lib is installed"; \
|
||||
${ECHO} "**** ${PKGNAME} cannot be built with it installed."; \
|
||||
${ECHO} "**** Please delete it before building"; \
|
||||
${ECHO} "**** or use \"${MAKE} update\"."; \
|
||||
${FALSE}; \
|
||||
fi
|
||||
|
||||
.include "../../graphics/freetype-lib/Makefile.common"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile.common,v 1.10 2001/05/03 04:28:25 jlam Exp $
|
||||
# $NetBSD: Makefile.common,v 1.11 2001/05/28 03:16:44 jlam Exp $
|
||||
|
||||
DISTNAME= freetype-${FT_VERS}
|
||||
FT_VERS= 1.3.1
|
||||
|
@ -11,19 +11,25 @@ MAINTAINER= jlam@netbsd.org
|
|||
HOMEPAGE= http://www.freetype.org/
|
||||
|
||||
BUILD_USES_MSGFMT= # defined
|
||||
USE_LIBINTL= # defined
|
||||
|
||||
USE_LIBTOOL= # defined
|
||||
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
|
||||
|
||||
GNU_CONFIGURE= # defined
|
||||
CONFIGURE_ARGS+= --with-locale-dir=${PREFIX}/${PKGLOCALEDIR}/locale
|
||||
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
|
||||
|
||||
CFLAGS+= -I${LOCALBASE}/include
|
||||
CPPFLAGS+= -I${LOCALBASE}/include
|
||||
|
||||
DISTINFO_FILE= ${.CURDIR}/../../graphics/freetype-lib/distinfo
|
||||
PATCHDIR= ${.CURDIR}/../../graphics/freetype-lib/patches
|
||||
|
||||
.include "../../devel/gettext-lib/buildlink.mk"
|
||||
|
||||
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
|
||||
CONFIGURE_ENV+= LIBS="${LIBS}"
|
||||
|
||||
CPPFLAGS+= -I${BUILDLINK_INCDIR}
|
||||
CFLAGS+= -I${BUILDLINK_INCDIR}
|
||||
LDFLAGS+= -L${BUILDLINK_LIBDIR}
|
||||
|
||||
pre-configure: ${BUILDLINK_TARGETS}
|
||||
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
# $NetBSD: Makefile,v 1.2 2001/02/16 15:22:19 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.3 2001/05/28 03:16:44 jlam Exp $
|
||||
|
||||
PKGNAME= freetype-utils-${FT_VERS}
|
||||
|
||||
COMMENT= Utilities for manipulating TrueType fonts
|
||||
|
||||
DEPENDS+= freetype-lib-${FT_VERS}:../../graphics/freetype-lib
|
||||
FREETYPE_REQD= ${FT_VERS}
|
||||
|
||||
USE_X11= # defined
|
||||
CONFIGURE_ARGS+= --with-x
|
||||
|
@ -12,7 +12,5 @@ CONFIGURE_ARGS+= --with-x
|
|||
ALL_TARGET= tttest
|
||||
INSTALL_TARGET= install-tttest
|
||||
|
||||
pre-build:
|
||||
${TOUCH} ${WRKSRC}/lib/libttf.la
|
||||
|
||||
.include "../../graphics/freetype-lib/buildlink.mk"
|
||||
.include "../../graphics/freetype-lib/Makefile.common"
|
||||
|
|
Loading…
Reference in a new issue