From ef616958ab59d5969df40ac4f60f4aab0fa0ea5b Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl@gnu.org>
Date: Wed, 3 Feb 1999 21:11:03 +0000
Subject: [PATCH] Makefile.in (iostream.list): Remove dependency on
 stamp-picdir.

        * Makefile.in (iostream.list): Remove dependency on
        stamp-picdir.
        ($(LIBIOSTREAM_DEP)): Depend on stamp-picdir.
        ($(LIBIO_FILES)): Similarly.
        * config.shared (all): Make $(PICDIR) concurrent.

Co-Authored-By: Jeffrey A Law <law@cygnus.com>

From-SVN: r25012
---
 libio/ChangeLog     | 10 ++++++++++
 libio/Makefile.in   |  6 +++++-
 libio/config.shared |  5 +++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/libio/ChangeLog b/libio/ChangeLog
index bb3722cc4e5..bd136405326 100644
--- a/libio/ChangeLog
+++ b/libio/ChangeLog
@@ -1,3 +1,13 @@
+Wed Feb  3 22:05:41 1999  H.J. Lu  (hjl@gnu.org)
+			  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in (iostream.list): Remove dependency on
+	stamp-picdir.
+	($(LIBIOSTREAM_DEP)): Depend on stamp-picdir.
+	($(LIBIO_FILES)): Similarly.
+
+	* config.shared (all): Make $(PICDIR) concurrent.
+
 1998-11-26  Manfred Hollstein  <manfred@s-direktnet.de>
 
 	* configure.in (compiler_name): Add check to detect if this
diff --git a/libio/Makefile.in b/libio/Makefile.in
index 724372a0b8b..2ac472bceef 100644
--- a/libio/Makefile.in
+++ b/libio/Makefile.in
@@ -88,9 +88,13 @@ test: test.o libio.a
 tpipe: tpipe.o libio.a
 	$(CC) $(CFLAGS) -o tpipe tpipe.o libio.a
 
-iostream.list: stamp-picdir $(_G_CONFIG_H) $(LIBIOSTREAM_DEP)
+iostream.list: $(_G_CONFIG_H) $(LIBIOSTREAM_DEP)
 	@echo "$(LIBIOSTREAM_USE)"> iostream.list
 
+# The "pic" subdir must be created before we can put any object
+# files into it.
+$(LIBIOSTREAM_DEP) $(LIBIO_OBJECTS): stamp-picdir
+
 stmp-stdio:
 	@rootme=`pwd`/ ; export rootme; cd stdio ; \
 	  $(MAKE) $(FLAGS_TO_PASS) stdio.list
diff --git a/libio/config.shared b/libio/config.shared
index ea78a1e33a3..6cda566eb7b 100644
--- a/libio/config.shared
+++ b/libio/config.shared
@@ -181,13 +181,14 @@ if [ -z "${ALL}" ] ; then
   fi
 fi
 
-ALL='$(PICDIR)'" ${ALL}"
-
 echo >&2 "all: ${ALL} multi-all"
 if [ "${SUBDIRS}" != "" ] ; then
   echo >&2 '	@rootme=`pwd`/; export rootme; \'
   echo >&2 '	$(MAKE) "DODIRS=$(SUBDIRS)" DO=all $(FLAGS_TO_PASS) subdir_do'
 fi
+if [ "${LIBDIR}" = "yes" ]; then
+  echo >&2 "${ALL} "'multi-all: $(PICDIR)'
+fi
 echo >&2 '.PHONY: all'
 echo >&2 ''