diff options
| author | jlam <jlam@pkgsrc.org> | 2002-09-11 10:12:38 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-09-11 10:12:38 +0000 |
| commit | 32f916b07a81f4f6c214df624da7f1a975684887 (patch) | |
| tree | ed03e3606430ef0d310af665882ea6ef129c40ca /graphics | |
| parent | 166e62e8329197c2a54a8b24c85046396276da36 (diff) | |
| download | pkgsrc-32f916b07a81f4f6c214df624da7f1a975684887.tar.gz | |
Move the USE_BUILDLINK2 definition to the common Makefile as we need to
include buildlink2.mk files from there.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/gdk-pixbuf-gnome/Makefile | 8 | ||||
| -rw-r--r-- | graphics/gdk-pixbuf/Makefile | 8 | ||||
| -rw-r--r-- | graphics/gdk-pixbuf/Makefile.common | 3 |
3 files changed, 9 insertions, 10 deletions
diff --git a/graphics/gdk-pixbuf-gnome/Makefile b/graphics/gdk-pixbuf-gnome/Makefile index 7a5aecbf8a6..264510440c7 100644 --- a/graphics/gdk-pixbuf-gnome/Makefile +++ b/graphics/gdk-pixbuf-gnome/Makefile @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.17 2002/08/28 15:49:06 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2002/09/11 10:12:38 jlam Exp $ + +.include "../gdk-pixbuf/Makefile.common" PKGNAME= ${DISTNAME:S/gdk-pixbuf-/gdk-pixbuf-gnome-/} COMMENT= the GNOME image loading library GNOME canvas support add-on CONFLICTS+= gdk-pixbuf<0.10.1 -USE_X11= # defined -USE_BUILDLINK2= # defined BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.11.0nb1 -.include "../gdk-pixbuf/Makefile.common" +USE_X11= # defined do-install: ${INSTALL_DATA} ${WRKSRC}/gdk-pixbuf/gnome-canvas-pixbuf.h \ diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile index 0c0a95abdb9..9f03d4abbd2 100644 --- a/graphics/gdk-pixbuf/Makefile +++ b/graphics/gdk-pixbuf/Makefile @@ -1,13 +1,11 @@ -# $NetBSD: Makefile,v 1.23 2002/09/02 13:10:08 drochner Exp $ +# $NetBSD: Makefile,v 1.24 2002/09/11 10:12:38 jlam Exp $ # +.include "Makefile.common" + PKGNAME= ${DISTNAME} COMMENT= the GNOME image loading library -USE_BUILDLINK2= # defined - -.include "Makefile.common" - # XXX hopefully there is no x.gnome-config.x in PATH post-patch: ${SED} -e 's/gnome-config/x.gnome-config.x/g' \ diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common index df904f08353..f6bbf7dc93d 100644 --- a/graphics/gdk-pixbuf/Makefile.common +++ b/graphics/gdk-pixbuf/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.26 2002/09/02 13:10:08 drochner Exp $ +# $NetBSD: Makefile.common,v 1.27 2002/09/11 10:12:38 jlam Exp $ # DISTNAME= gdk-pixbuf-0.18.0 @@ -11,6 +11,7 @@ HOMEPAGE= http://www.gnome.org/ BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf BUILD_DEPENDS+= automake>=1.4:../../devel/automake +USE_BUILDLINK2= YES USE_GMAKE= YES USE_X11BASE= YES USE_LIBTOOL= YES |