Current-Users archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
remove external/lib/Makefile and crypto/external/lib/Makefile
Hi,
currently the make system builds 'external' libraries using a separate
target do-external-libs, SUBDIRing into external/lib/Makefile and
crypto/external/lib/Makefile before SUBDIR again to the build directory..
the patch attached cleans that up and just SUBDIRs directly from
lib/Makefile. It also means that some ordering constraints can be more
obviously handled, perhaps we can reduce the number of .WAITs there..
I have tested this building with -j1 and -j2 and -j4 from scratch on a
dual core i386, any objections before I commit?
iain
Index: Makefile
===================================================================
RCS file: /cvsroot/src/Makefile,v
retrieving revision 1.278
diff -u -r1.278 Makefile
--- Makefile 6 Jul 2010 05:59:50 -0000 1.278
+++ Makefile 2 Nov 2010 19:17:28 -0000
@@ -91,7 +91,6 @@
# do-lib-libc: builds and installs prerequisites from lib/libc.
# do-lib: builds and installs prerequisites from lib.
# do-gnu-lib: builds and installs prerequisites from gnu/lib.
-# do-external-lib: builds and installs prerequisites from external/lib.
# do-sys-rump-dev-lib: builds and installs prerequisites from
sys/rump/dev/lib
# do-sys-rump-fs-lib: builds and installs prerequisites from sys/rump/fs/lib
# do-sys-rump-kern-lib: builds and installs prereq. from sys/rump/kern/lib
@@ -239,7 +238,7 @@
BUILDTARGET+= do-libpcc
.endif
BUILDTARGETS+= do-lib-libc
-BUILDTARGETS+= do-lib do-gnu-lib do-external-lib
+BUILDTARGETS+= do-lib do-gnu-lib
.if (${MACHINE} != "evbppc") && ${MKKMOD} != "no"
BUILDTARGETS+= do-sys-modules
.endif
@@ -416,7 +415,7 @@
BUILD_CC_LIB+= external/bsd/pcc/libpcc
.endif
-.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib/libdes lib
gnu/lib external/lib crypto/external/lib sys/rump/dev/lib sys/rump/fs/lib
sys/rump/kern/lib sys/rump/net/lib sys/modules
+.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib/libdes lib
gnu/lib sys/rump/dev/lib sys/rump/fs/lib sys/rump/kern/lib sys/rump/net/lib
sys/modules
do-${dir:S/\//-/g}: .PHONY .MAKE
.for targ in dependall install
${MAKEDIRTARGET} ${dir} ${targ}
Index: crypto/external/lib/Makefile
===================================================================
RCS file: crypto/external/lib/Makefile
diff -N crypto/external/lib/Makefile
--- crypto/external/lib/Makefile 20 Mar 2010 02:07:33 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2010/03/20 02:07:33 uwe Exp $
-
-#
-# This Makefile exists to provide a single point to build
-# all crypto libraries provided by external packages that may
-# be used by other applications in the system.
-#
-
-.include <bsd.own.mk>
-
-.if (${MKCRYPTO} != "no")
-SUBDIR+= ../bsd/openssl/lib
-SUBDIR+= .WAIT
-SUBDIR+= ../bsd/netpgp/lib
-SUBDIR+= ../bsd/openssh/lib
-.endif
-
-.include <bsd.subdir.mk>
Index: external/Makefile
===================================================================
RCS file: /cvsroot/src/external/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- external/Makefile 2 Nov 2010 16:34:35 -0000 1.13
+++ external/Makefile 2 Nov 2010 19:18:09 -0000
@@ -1,7 +1,5 @@
# $NetBSD: Makefile,v 1.13 2010/11/02 16:34:35 joerg Exp $
-SUBDIR+= lib .WAIT
-
SUBDIR+= apache2 bsd intel-fw-eula intel-fw-public gpl2 gpl3 historical
SUBDIR+= ibm-public intel-public public-domain cddl mit
Index: external/bsd/libdwarf/prepare-import.sh
===================================================================
RCS file: /cvsroot/src/external/bsd/libdwarf/prepare-import.sh,v
retrieving revision 1.1
diff -u -r1.1 prepare-import.sh
--- external/bsd/libdwarf/prepare-import.sh 23 Dec 2009 00:06:53 -0000
1.1
+++ external/bsd/libdwarf/prepare-import.sh 2 Nov 2010 19:18:30 -0000
@@ -4,7 +4,7 @@
# Copy the FreeBSD src/lib/libdwarf directory contents to dist. Run
# this script and you're done.
#
-# lib/ is built as SUBDIR from external/lib/Makefile.
+# lib/ is built as SUBDIR from lib/Makefile.
#
# Use the following template to import
# cvs import src/external/bsd/libdwarf/dist FreeBSD FreeBSD-X-Y-Z
Index: external/bsd/libelf/prepare-import.sh
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/prepare-import.sh,v
retrieving revision 1.2
diff -u -r1.2 prepare-import.sh
--- external/bsd/libelf/prepare-import.sh 29 Dec 2009 16:56:25 -0000
1.2
+++ external/bsd/libelf/prepare-import.sh 2 Nov 2010 19:18:30 -0000
@@ -4,7 +4,7 @@
# Copy the FreeBSD src/lib/libelf directory contents to dist. Run
# this script and you're done.
#
-# lib/ is built as SUBDIR from external/lib/Makefile.
+# lib/ is built as SUBDIR from lib/Makefile.
#
# Use the following template to import
# cvs import src/external/bsd/libelf/dist FreeBSD FreeBSD-X-Y-Z
Index: external/bsd/libevent/prepare-import.sh
===================================================================
RCS file: /cvsroot/src/external/bsd/libevent/prepare-import.sh,v
retrieving revision 1.1
diff -u -r1.1 prepare-import.sh
--- external/bsd/libevent/prepare-import.sh 2 Nov 2009 10:03:56 -0000
1.1
+++ external/bsd/libevent/prepare-import.sh 2 Nov 2010 19:18:30 -0000
@@ -5,7 +5,7 @@
# to dist. Run this script and check for additional files and
# directories to prune, only relevant content is included.
#
-# lib/ is built as SUBDIR from external/lib/Makefile, and
+# lib/ is built as SUBDIR from lib/Makefile, and
# the regression tests are used from tests/lib/libevent
#
# Use the following template to import
Index: external/lib/Makefile
===================================================================
RCS file: external/lib/Makefile
diff -N external/lib/Makefile
--- external/lib/Makefile 2 Nov 2010 16:34:35 -0000 1.17
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2010/11/02 16:34:35 joerg Exp $
-
-#
-# This Makefile exists to provide a single point to build
-# all libraries provided by external packages that may
-# be used by other applications in the system.
-#
-
-.include <bsd.own.mk>
-
-.if (${MKATF} != "no")
-SUBDIR+= ../bsd/atf/lib
-.endif
-
-.if (${MKMDNS} != "no")
-SUBDIR+= ../apache2/mDNSResponder/lib
-.endif
-
-.if (${MKCRYPTO} != "no")
-SUBDIR+= ../../crypto/external/lib .WAIT
-.endif
-
-.if (${MKLDAP} != "no")
-SUBDIR+= ../bsd/openldap/lib
-.endif
-
-.if (${MKISCSI} != "no")
-SUBDIR+= ../bsd/iscsi/lib # depends on libpthread
-.endif
-
-SUBDIR+= ../public-domain/xz/lib .WAIT
-
-SUBDIR+= ../bsd/fetch/lib
-SUBDIR+= ../bsd/libarchive/lib
-SUBDIR+= ../bsd/libevent/lib
-SUBDIR+= ../bsd/libelf/lib
-SUBDIR+= ../bsd/libdwarf/lib
-SUBDIR+= ../bsd/am-utils/lib
-SUBDIR+= ../bsd/bind/lib
-SUBDIR+= ../bsd/file/lib
-
-.include <bsd.subdir.mk>
Index: lib/Makefile
===================================================================
RCS file: /cvsroot/src/lib/Makefile,v
retrieving revision 1.152
diff -u -r1.152 Makefile
--- lib/Makefile 31 Oct 2010 11:52:50 -0000 1.152
+++ lib/Makefile 2 Nov 2010 19:22:14 -0000
@@ -11,8 +11,23 @@
libpthread_dbg libpuffs libresolv librmt librpcsvc librt \
libterminfo libusbhid libutil libwrap liby libz
-SUBDIR+=../external/bsd/flex/lib
-SUBDIR+=../external/mit/lua/lib
+SUBDIR+= ../external/bsd/file/lib
+SUBDIR+= ../external/bsd/flex/lib
+SUBDIR+= ../external/bsd/libdwarf/lib
+SUBDIR+= ../external/bsd/libelf/lib
+SUBDIR+= ../external/bsd/libevent/lib
+
+SUBDIR+= ../external/public-domain/xz/lib
+
+SUBDIR+= ../external/mit/lua/lib
+
+.if (${MKATF} != "no")
+SUBDIR+= ../external/bsd/atf/lib
+.endif
+
+.if (${MKMDNS} != "no")
+SUBDIR+= ../external/apache2/mDNSResponder/lib
+.endif
# libcurses needs libtermlib
SUBDIR+= .WAIT libcurses
@@ -57,6 +72,17 @@
SUBDIR+= libradius # depends on libcrypto - only if ${MKCRYPTO}
+SUBDIR+= ../external/bsd/am-utils/lib # depends on libssl
+
+SUBDIR+= ../external/bsd/bind/lib # depends on libcrypto
+
+SUBDIR+= ../external/bsd/fetch/lib # depends on libssl
+
+SUBDIR+= ../external/bsd/libarchive/lib # depends on libxz
+
+.if (${MKLDAP} != "no")
+SUBDIR+= ../external/bsd/openldap/lib # depends on libcrypto
+.endif
.if (${MKKERBEROS} != "no")
SUBDIR+= libkrb5 # depends on libcrypto and more
@@ -65,6 +91,10 @@
SUBDIR+= librefuse # depends on libpuffs
SUBDIR+= librumpuser # depends on libpthread
+.if (${MKISCSI} != "no")
+SUBDIR+= ../external/bsd/iscsi/lib # depends on libpthread
+.endif
+
.if (${MKCRYPTO} != "no")
# these depend on libcrypto*, libz and libbz2
SUBDIR+= ../crypto/external/bsd/openssh/lib
Home |
Main Index |
Thread Index |
Old Index