More updates from Mesa:

As with the Makefiles, only include Mesa's buildlink when necessary,
otherwise include MesaLib's and/or glu's buildlink.

9 files changed, 24 insertions, 18 deletions

diff --git a/devel/SDL/buildlink2.mk b/devel/SDL/buildlink2.mk
index 8c9e1de0e0a..a3a26671fd4 100644
--- a/devel/SDL/buildlink2.mk
+++ b/devel/SDL/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/11/04 14:51:16 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/03/12 22:07:27 jschauma Exp $
 
 .if !defined(SDL_BUILDLINK2_MK)
 SDL_BUILDLINK2_MK=	# defined
@@ -23,7 +23,8 @@ PTHREAD_OPTS+=		require
 .  include "../../audio/nas/buildlink2.mk"
 .endif
 .include "../../audio/esound/buildlink2.mk"
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glut/buildlink2.mk"
 .include "../../graphics/aalib-x11/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
 
diff --git a/graphics/clanlib/buildlink2.mk b/graphics/clanlib/buildlink2.mk
index c00d8149487..3be2d8b68dc 100644
--- a/graphics/clanlib/buildlink2.mk
+++ b/graphics/clanlib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/01/19 08:48:48 tron Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/03/12 22:07:28 jschauma Exp $
 
 .if !defined(CLANLIB_BUILDLINK2_MK)
 CLANLIB_BUILDLINK2_MK=	# defined
@@ -23,7 +23,8 @@ BUILDLINK_FILES.ClanLib+=	include/ClanLib/MikMod/*
 BUILDLINK_FILES.ClanLib+=	include/ClanLib/png/*
 
 .include "../../mk/pthread.buildlink2.mk"
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
 .include "../../graphics/hermes/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
 
diff --git a/graphics/gtkglext/buildlink2.mk b/graphics/gtkglext/buildlink2.mk
index 7f7b6ac5773..5d28aea68de 100644
--- a/graphics/gtkglext/buildlink2.mk
+++ b/graphics/gtkglext/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/01/14 05:35:53 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/03/12 22:07:28 jschauma Exp $
 #
 # This Makefile fragment is included by packages that use gtkglext.
 #
@@ -28,7 +28,7 @@ BUILDLINK_FILES.gtkglext+=	lib/pkgconfig/gtkglext-x11-1.0.pc
 
 .include "../../textproc/gtk-doc/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
 .include "../../x11/gtk2/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	gtkglext-buildlink
diff --git a/graphics/lib3ds/buildlink2.mk b/graphics/lib3ds/buildlink2.mk
index 04b4b497253..e2e1f93d3ac 100644
--- a/graphics/lib3ds/buildlink2.mk
+++ b/graphics/lib3ds/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/09/06 00:52:29 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/03/12 22:07:28 jschauma Exp $
 #
 # This Makefile fragment is included by packages that use lib3ds.
 #
@@ -37,7 +37,6 @@ BUILDLINK_FILES.lib3ds+=	include/lib3ds/viewport.h
 BUILDLINK_FILES.lib3ds+=	lib/lib3ds.*
 
 .include "../../graphics/Mesa/buildlink2.mk"
-.include "../../graphics/glut/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	lib3ds-buildlink
 
diff --git a/x11/fltk/buildlink2.mk b/x11/fltk/buildlink2.mk
index 957983c63f2..dd3971db3f2 100644
--- a/x11/fltk/buildlink2.mk
+++ b/x11/fltk/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/11/25 18:21:02 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/03/12 22:07:29 jschauma Exp $
 
 .if !defined(FLTK_BUILDLINK2_MK)
 FLTK_BUILDLINK2_MK=	# defined
@@ -13,7 +13,8 @@ BUILDLINK_FILES.fltk=	include/FL/*
 BUILDLINK_FILES.fltk+=	include/Fl/*
 BUILDLINK_FILES.fltk+=	lib/libfltk.*
 
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	fltk-buildlink
 
diff --git a/x11/gtkglarea/buildlink2.mk b/x11/gtkglarea/buildlink2.mk
index 4bd6796b593..a8f12e03603 100644
--- a/x11/gtkglarea/buildlink2.mk
+++ b/x11/gtkglarea/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/12/30 15:39:30 tron Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/03/12 22:07:29 jschauma Exp $
 
 .if !defined(GTKGLAREA_BUILDLINK2_MK)
 GTKGLAREA_BUILDLINK2_MK=	# defined
@@ -12,7 +12,8 @@ BUILDLINK_PREFIX.gtkglarea_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.gtkglarea+=	include/gtkgl/*
 BUILDLINK_FILES.gtkglarea+=	lib/libgtkgl.*
 
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	gtkglarea-buildlink
diff --git a/x11/kdebase/buildlink2.mk b/x11/kdebase/buildlink2.mk
index 72ec8e5986d..e479018be33 100644
--- a/x11/kdebase/buildlink2.mk
+++ b/x11/kdebase/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/10/21 15:26:58 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/03/12 22:07:29 jschauma Exp $
 #
 
 .if !defined(KDEBASE_BUILDLINK2_MK)
@@ -148,7 +148,8 @@ BUILDLINK_FILES.kdebase+=	lib/libmediatool.*
 
 .include "../../devel/ncurses/buildlink2.mk"
 .include "../../graphics/libungif/buildlink2.mk"
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
 .include "../../x11/kdelibs/buildlink2.mk"
 
diff --git a/x11/qt2-libs/buildlink2.mk b/x11/qt2-libs/buildlink2.mk
index 13a949ead8d..6fcde7b7568 100644
--- a/x11/qt2-libs/buildlink2.mk
+++ b/x11/qt2-libs/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/09/22 10:06:01 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/03/12 22:07:30 jschauma Exp $
 
 .if !defined(QT2_LIBS_BUILDLINK2_MK)
 QT2_LIBS_BUILDLINK2_MK=	# defined
@@ -18,7 +18,8 @@ BUILDLINK_CPPFLAGS.qt2-libs=	-I${QTDIR}/include
 BUILDLINK_LDFLAGS.qt2-libs=	-L${QTDIR}/lib -Wl,-R${QTDIR}/lib
 
 .include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/mng/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
diff --git a/x11/qt3-libs/buildlink2.mk b/x11/qt3-libs/buildlink2.mk
index 4fed07b6a95..0ebd8f6efde 100644
--- a/x11/qt3-libs/buildlink2.mk
+++ b/x11/qt3-libs/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.9 2003/03/11 13:02:07 markd Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2003/03/12 22:07:30 jschauma Exp $
 
 .if !defined(QT3_LIBS_BUILDLINK2_MK)
 QT3_LIBS_BUILDLINK2_MK=	# defined
@@ -21,7 +21,8 @@ BUILDLINK_LDFLAGS.qt3-libs=	-L${QTDIR}/lib -Wl,-R${QTDIR}/lib
 PTHREAD_OPTS+=	require
 
 .include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/mng/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"