* elf/Makefile (subdir_lib): Change this target to lib-noranlib.

	(lib-noranlib): Depend on on $(extra-objs).

	* errno.h: Move __END_DECLS out of #ifdef's so it matches
	__BEGIN_DECLS.

3 files changed, 14 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index c26031a4a3..35d089dc5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 Tue Jun  4 02:25:44 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 
+	* elf/Makefile (subdir_lib): Change this target to lib-noranlib.
+	(lib-noranlib): Depend on on $(extra-objs).
+
+	* errno.h: Move __END_DECLS out of #ifdef's so it matches
+	__BEGIN_DECLS.
+
 	* stdio-common/vfprintf.c [USE_IN_LIBIO] (size_t): Don't define as
 	macro.  _IO_size_t is just an alias for the real size_t anyway.
 
diff --git a/elf/Makefile b/elf/Makefile
index 354fbbcc70..9909476fcc 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -43,14 +43,14 @@ generated	= librtld.so dl-allobjs.so
 install-others	= $(slibdir)/$(rtld-installed-name)
 install-bin	= ldd
 
-# Make sure this is built in the `make lib' pass so it can be used
+# Make sure these things is built in the `make lib' pass so it can be used
 # to run programs during the `make others' pass.
-subdir_lib: $(objpfx)ld.so
+lib-noranlib: $(objpfx)ld.so $(addprefix $(objpfx),$(extra-objs))
 
 ifneq (,$(filter linux%,$(config-os)))
 extra-objs	+= linux-compat.so
 install-others	+= $(slibdir)/ld-linux.so.1
-subdir_lib: $(objpfx)ld-linux.so.1
+lib-noranlib: $(objpfx)ld-linux.so.1
 endif
 endif
 
diff --git a/errno.h b/errno.h
index f1fbd5e082..a9c9acdff2 100644
--- a/errno.h
+++ b/errno.h
@@ -37,6 +37,7 @@ __BEGIN_DECLS
 #undef	__need_Emath
 
 #ifdef	_ERRNO_H
+
 /* Declare the `errno' variable, unless it's defined as a macro by
    errnos.h.  This is the case in GNU, where it is a per-thread variable.
    This redeclaration using the macro still works, but it will be a
@@ -59,9 +60,10 @@ typedef int error_t;
    invoked.  These variables are set up automatically at startup based on
    the value of ARGV[0] (this works only if you use GNU ld).  */
 extern char *program_invocation_name, *program_invocation_short_name;
-#endif
+#endif	/* Use GNU.  */
+
+#endif	/* errno.h included */
 
 __END_DECLS
-#endif
 
-#endif /* errno.h	*/
+#endif /* errno.h */