summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2012-08-17 16:22:27 +0000
committerjoerg <joerg@NetBSD.org>2012-08-17 16:22:27 +0000
commit9d7b27031ae8595260c33ff00cbacf31c44bd179 (patch)
treea07f082de92495849fe027d275f7d28aba6dc108 /compat
parenta8abfbac359918f02ecc7e223aab0d936347d679 (diff)
Implement build_install in src/lib/Makefile, which traverses the
subdirectories and invokes dependall/install. Do this in groups delimited by .WAIT to ensure that depending libraries can use the installed versions and don't need to know the locations in the source tree. Use this new target in src/Makefile to replace most of the adhoc library logic with two special cases, src/lib and src/compat. Adjust sys/Makefile to include the module directory when building them. Add some necessary .WAITs in src/lib/Makefile to reflect the dependencies from src/Makefile and also add the rump libraries here.
Diffstat (limited to 'compat')
-rw-r--r--compat/Makefile4
-rw-r--r--compat/compatsubdir.mk4
-rw-r--r--compat/dirshack/Makefile4
3 files changed, 9 insertions, 3 deletions
diff --git a/compat/Makefile b/compat/Makefile
index 9e4cf34471b..294926c6440 100644
--- a/compat/Makefile
+++ b/compat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/12/13 09:27:13 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2012/08/17 16:22:27 joerg Exp $
# Build multi-abi libaries
@@ -14,4 +14,6 @@ SUBDIR= dirshack .WAIT ${ARCHDIR_SUBDIR}
.endif
.endif
+TARGETS+= build_install
+
.include <bsd.subdir.mk>
diff --git a/compat/compatsubdir.mk b/compat/compatsubdir.mk
index 8ad5d6bb7f4..1e35c2df5af 100644
--- a/compat/compatsubdir.mk
+++ b/compat/compatsubdir.mk
@@ -1,9 +1,11 @@
-# $NetBSD: compatsubdir.mk,v 1.7 2011/01/31 10:58:14 matt Exp $
+# $NetBSD: compatsubdir.mk,v 1.8 2012/08/17 16:22:27 joerg Exp $
# Build netbsd libraries.
.include <bsd.own.mk>
+TARGETS+= build_install
+
.if ${MKCOMPAT} != "no"
.if !make(includes)
diff --git a/compat/dirshack/Makefile b/compat/dirshack/Makefile
index b169394e60d..d88f75c32f3 100644
--- a/compat/dirshack/Makefile
+++ b/compat/dirshack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/04/17 01:29:06 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2012/08/17 16:22:27 joerg Exp $
# hacky method to get compat multilib base objdirs created before
# make tries to go create the subdirs used for builds.
@@ -15,6 +15,8 @@
.include <bsd.own.mk>
+TARGETS+= build_install
+
.if ${MKCOMPAT} != "no"
.if make(obj)