Track information in a new variable BUILDLINK_ORDER that informs us

of the order in which buildlink3.mk files are (recursively) included
by a package Makefile.

8 files changed, 16 insertions, 8 deletions

diff --git a/comms/gnome-pilot/buildlink3.mk b/comms/gnome-pilot/buildlink3.mk
index b4e7863a76e..f0bbe9b9d1a 100644
--- a/comms/gnome-pilot/buildlink3.mk
+++ b/comms/gnome-pilot/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/04/17 13:46:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 22:39:03 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_PILOT_BUILDLINK3_MK:=	${GNOME_PILOT_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	gnome-pilot
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-pilot}
 BUILDLINK_PACKAGES+=	gnome-pilot
+BUILDLINK_ORDER+=	gnome-pilot
 
 .if !empty(GNOME_PILOT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnome-pilot?=		gnome-pilot>=2.0.12nb2
diff --git a/comms/jpilot/buildlink3.mk b/comms/jpilot/buildlink3.mk
index 04d095ca390..f5c510f2125 100644
--- a/comms/jpilot/buildlink3.mk
+++ b/comms/jpilot/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/04/17 13:46:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 22:39:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 JPILOT_BUILDLINK3_MK:=	${JPILOT_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	jpilot
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Njpilot}
 BUILDLINK_PACKAGES+=	jpilot
+BUILDLINK_ORDER+=	jpilot
 
 .if !empty(JPILOT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.jpilot+=	jpilot>=0.99.5nb4
diff --git a/comms/libmal/buildlink3.mk b/comms/libmal/buildlink3.mk
index cc91f574af6..a680661478a 100644
--- a/comms/libmal/buildlink3.mk
+++ b/comms/libmal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:03 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:03 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBMAL_BUILDLINK3_MK:=	${LIBMAL_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	libmal
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmal}
 BUILDLINK_PACKAGES+=	libmal
+BUILDLINK_ORDER+=	libmal
 
 .if !empty(LIBMAL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libmal+=	libmal>=0.40
diff --git a/comms/openobex/buildlink3.mk b/comms/openobex/buildlink3.mk
index f8362c3b291..d852c3b510a 100644
--- a/comms/openobex/buildlink3.mk
+++ b/comms/openobex/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:03 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:03 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 OPENOBEX_BUILDLINK3_MK:=	${OPENOBEX_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	openobex
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenobex}
 BUILDLINK_PACKAGES+=	openobex
+BUILDLINK_ORDER+=	openobex
 
 .if !empty(OPENOBEX_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.openobex+=	openobex>=1.0.1
diff --git a/comms/pilot-link-libs/buildlink3.mk b/comms/pilot-link-libs/buildlink3.mk
index 236189e6d4f..1b523293b8c 100644
--- a/comms/pilot-link-libs/buildlink3.mk
+++ b/comms/pilot-link-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:03 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 22:39:03 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PILOT_LINK_LIBS_BUILDLINK3_MK:=	${PILOT_LINK_LIBS_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	pilot-link-libs
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npilot-link-libs}
 BUILDLINK_PACKAGES+=	pilot-link-libs
+BUILDLINK_ORDER+=	pilot-link-libs
 
 .if !empty(PILOT_LINK_LIBS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pilot-link-libs+=	pilot-link-libs>=0.11.7nb1
diff --git a/comms/synce-librapi2/buildlink3.mk b/comms/synce-librapi2/buildlink3.mk
index 14c920f9d0e..78082977351 100644
--- a/comms/synce-librapi2/buildlink3.mk
+++ b/comms/synce-librapi2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/04/12 10:27:03 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:03 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SYNCE_LIBRAPI2_BUILDLINK3_MK:=	${SYNCE_LIBRAPI2_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	synce-librapi2
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsynce-librapi2}
 BUILDLINK_PACKAGES+=	synce-librapi2
+BUILDLINK_ORDER+=	synce-librapi2
 
 .if !empty(SYNCE_LIBRAPI2_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.synce-librapi2+=	synce-librapi2>=0.9.1
diff --git a/comms/synce-libsynce/buildlink3.mk b/comms/synce-libsynce/buildlink3.mk
index 63a3dd06da9..6d274351cb4 100644
--- a/comms/synce-libsynce/buildlink3.mk
+++ b/comms/synce-libsynce/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/04/12 10:27:03 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 22:39:03 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SYNCE_LIBSYNCE_BUILDLINK3_MK:=	${SYNCE_LIBSYNCE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	synce-libsynce
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsynce-libsynce}
 BUILDLINK_PACKAGES+=	synce-libsynce
+BUILDLINK_ORDER+=	synce-libsynce
 
 .if !empty(SYNCE_LIBSYNCE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.synce-libsynce+=	synce-libsynce>=0.9.1
diff --git a/comms/zaptel-netbsd/buildlink3.mk b/comms/zaptel-netbsd/buildlink3.mk
index 6b404679c9b..c9f63a419f0 100644
--- a/comms/zaptel-netbsd/buildlink3.mk
+++ b/comms/zaptel-netbsd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:03 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 22:39:03 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 ZAPTEL_NETBSD_BUILDLINK3_MK:=	${ZAPTEL_NETBSD_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	zaptel-netbsd
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nzaptel-netbsd}
 BUILDLINK_PACKAGES+=	zaptel-netbsd
+BUILDLINK_ORDER+=	zaptel-netbsd
 
 .if !empty(ZAPTEL_NETBSD_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.zaptel-netbsd+=	zaptel-netbsd>=20050314