From ea9a943426ae849f8671eeb8718e501bfeadb315 Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 24 May 2001 08:53:54 +0000 Subject: Standardize name of file to include for build-links to be "buildlink.mk". Use BUILDLINK_INCDIR, BUILDLINK_LIBDIR for locations of linked headers and libraries. Create a variable BUILDLINK_TARGETS whose value is the list of build-link targets to execute. --- www/cadaver/Makefile | 12 ++++++------ www/sitecopy/Makefile | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'www') diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile index 0d0822e3bec..4e2ec537a92 100644 --- a/www/cadaver/Makefile +++ b/www/cadaver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/05/22 16:09:14 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2001/05/24 08:53:58 jlam Exp $ DISTNAME= cadaver-0.17.0 CATEGORIES= www @@ -21,18 +21,18 @@ CONFIGURA_ARGS+= --with-include-neon CONFIGURE_ARGS+= --enable-libxml CONFIGURE_ARGS+= --enable-netrc -.include "../../devel/libgetopt/Makefile.getopt" -.include "../../devel/readline/Makefile.readline" +.include "../../devel/libgetopt/buildlink.mk" +.include "../../devel/readline/buildlink.mk" CONFIGURE_ENV+= LIBS="${LIBS}" CONFIGURE_ENV+= ac_cv_lib_curses_tputs=no CONFIGURE_ENV+= ac_cv_lib_ncurses_tputs=no -CFLAGS+= -I${WRKINCDIR} ${CPPFLAGS} -LDFLAGS+= -L${WRKLIBDIR} +CFLAGS+= -I${BUILDLINK_INCDIR} ${CPPFLAGS} +LDFLAGS+= -L${BUILDLINK_LIBDIR} LIBS+= -ltermcap -pre-configure: link-getopt-headers link-readline-headers link-readline-libs +pre-configure: ${BUILDLINK_TARGETS} # The build process doesn't correctly find some headers for utility functions # which are provided in ${WRKSRC}/lib. Help the compiler by linking the diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile index 6954f145a44..deee6bc4c9d 100644 --- a/www/sitecopy/Makefile +++ b/www/sitecopy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/05/22 16:09:14 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2001/05/24 08:53:58 jlam Exp $ DISTNAME= sitecopy-0.10.15 CATEGORIES= www @@ -19,11 +19,11 @@ CONFIGURE_ARGS+= --with-ssl=${SSLBASE} CONFIGURE_ARGS+= --with-included-neon CONFIGURE_ARGS+= --enable-libxml -.include "../../devel/libgetopt/Makefile.getopt" +.include "../../devel/libgetopt/buildlink.mk" -CFLAGS+= -I${WRKINCDIR} ${CPPFLAGS} +CFLAGS+= -I${BUILDLINK_INCDIR} ${CPPFLAGS} -pre-configure: link-getopt-headers +pre-configure: ${BUILDLINK_TARGETS} # The build process doesn't correctly find the header for GNU fnmatch, which # is provided in ${WRKSRC}/lib. Help the compiler by linking the header -- cgit v1.2.3