aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-10-24 21:45:10 +0000
committerRoland McGrath <roland@gnu.org>1995-10-24 21:45:10 +0000
commite97ec51d01087c2f8468a1bf83cfdb26b7040c30 (patch)
tree3e7deb1a463613c2b6e0ddd32864e509fd46d1e0
parent21ee716616e7d55f19ce8643f12954145769d588 (diff)
downloadglibc-e97ec51d01087c2f8468a1bf83cfdb26b7040c30.tar
glibc-e97ec51d01087c2f8468a1bf83cfdb26b7040c30.tar.gz
glibc-e97ec51d01087c2f8468a1bf83cfdb26b7040c30.tar.bz2
glibc-e97ec51d01087c2f8468a1bf83cfdb26b7040c30.zip
* sunrpc/Makefile (librpcsvc-no-lib-dep): New variable.
* extra-lib.mk: If $(lib)-no-lib-dep is defined and MAKELEVEL>0, make `others' rather than `lib-noranlib' depend on the libraries.
-rw-r--r--ChangeLog4
-rw-r--r--extra-lib.mk8
-rw-r--r--sunrpc/Makefile4
3 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0fdd815b57..8780e6f9f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
Tue Oct 24 15:22:58 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
+ * sunrpc/Makefile (librpcsvc-no-lib-dep): New variable.
+ * extra-lib.mk: If $(lib)-no-lib-dep is defined and MAKELEVEL>0,
+ make `others' rather than `lib-noranlib' depend on the libraries.
+
* sysdeps/unix/configure.in: Check for fchdir syscall.
Improve sed script to allow / on rhs without / on lhs.
diff --git a/extra-lib.mk b/extra-lib.mk
index c62450a06f..44db007421 100644
--- a/extra-lib.mk
+++ b/extra-lib.mk
@@ -11,7 +11,7 @@ extra-libs-left := $(filter-out $(lib),$(extra-libs-left))
object-suffixes-$(lib) := $(filter-out $($(lib)-inhibit-o),$(object-suffixes))
# Make sure these are simply-expanded variables before we append to them,
-# since we want the expressions we we append to be expanded right now.
+# since we want the expressions we append to be expanded right now.
install-lib := $(install-lib)
extra-objs := $(extra-objs)
@@ -25,7 +25,13 @@ ifneq (,$(filter .so,$(object-suffixes-$(lib))))
alltypes-$(lib) += $(objpfx)$(lib).so
endif
+ifneq (0,$(MAKELEVEL))
+ifndef $(lib)-no-lib-dep
lib-noranlib: $(alltypes-$(lib))
+else
+others: $(alltypes-$(lib))
+endif
+endif
# Use o-iterator.mk to generate a rule for each flavor of library.
define o-iterator-doit
diff --git a/sunrpc/Makefile b/sunrpc/Makefile
index 40026fecd4..073c19e10a 100644
--- a/sunrpc/Makefile
+++ b/sunrpc/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1994 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -77,7 +77,7 @@ extra-libs := librpcsvc
librpcsvc-routines = $(rpcsvc:%.x=x%)
librpcsvc-inhibit-o = .so # Build no shared rpcsvc library.
omit-deps = $(librpcsvc-routines)
-
+librpcsvc-no-lib-dep = t # Don't depend on this in `make lib' pass.
# Sun's code is not too clean.
override +gccwarn := -w