Makefile.in: Do not include SUBDIRS in objlist.

2001-10-20  David Edelsohn  <dje@watson.ibm.com>

	* Makefile.in: Do not include SUBDIRS in objlist.  Create
	libg2c.so from F2CEXT and SUBDIRS archives.
	* libF77/Makefile.in: Create archive.
	* libI77/Makefile.in: Same.
	* libU77/Makefile.in: Same.

From-SVN: r46384

5 files changed, 30 insertions, 15 deletions

diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog
index 64a0ec6..f6becd5 100644
--- a/libf2c/ChangeLog
+++ b/libf2c/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-20  David Edelsohn  <dje@watson.ibm.com>
+
+	* Makefile.in: Do not include SUBDIRS in objlist.  Create
+	libg2c.so from F2CEXT and SUBDIRS archives.
+	* libF77/Makefile.in: Create archive.
+	* libI77/Makefile.in: Same.
+	* libU77/Makefile.in: Same.
+
 2001-10-05  Toon Moene  <toon@moene.indiv.nluug.nl>
 
 	* Makefile.in: Move libg2c.so and libg2c.{l}a to
diff --git a/libf2c/Makefile.in b/libf2c/Makefile.in
index c9a7753..18b3a8d 100644
--- a/libf2c/Makefile.in
+++ b/libf2c/Makefile.in
@@ -142,16 +142,11 @@ $(LIBG2C): s-libi77 s-libf77 s-libu77 s-libe77
 	set -e; \
 	rm -f objlist ;\
 	touch objlist ;\
-	for i in $(SUBDIRS) ;\
-	do \
-	  (cd $$i && $(MAKE) $(FLAGS_TO_PASS) objlist) ;\
-	done ;\
-	objs="`cat objlist`" ;\
 	for i in $(F2CEXT); do objs="$$objs libE77/L$$i.lo"; done ;\
 	echo -n $$objs > objlist 
 	$(LIBTOOL) --mode=link $(CC) -o $@ \
 	  -version-info $(VERSION_MAJOR):$(VERSION_MINOR):$(VERSION_SUB) \
-	  -rpath $(prefix)/lib `cat objlist` -lc -lm
+	  -rpath $(prefix)/lib `cat objlist` libF77.la libI77.la libU77.la -lc -lm
 
 i77:
 	cd libI77; $(MAKE) $(FLAGS_TO_PASS) all
diff --git a/libf2c/libF77/Makefile.in b/libf2c/libF77/Makefile.in
index 794e996..bdb31a8 100644
--- a/libf2c/libF77/Makefile.in
+++ b/libf2c/libF77/Makefile.in
@@ -52,6 +52,8 @@ ALL_CFLAGS = -I. -I$(srcdir) -I$(G2C_H_DIR) -I$(F2C_H_DIR) $(CPPFLAGS) $(DEFS) $
 .c.lo:
 	@LIBTOOL@ --mode=compile $(CC) -c -DSkip_f2c_Undefs $(ALL_CFLAGS) $<
 
+LINK = @LIBTOOL@ --mode=link $(CC) $(ALL_CFLAGS) -o $@
+
 MISC =	F77_aloc.lo VersionF.lo s_rnge.lo abort_.lo getarg_.lo iargc_.lo\
 	getenv_.lo signal_.lo s_stop.lo s_paus.lo system_.lo cabs.lo\
 	derf_.lo derfc_.lo erf_.lo erfc_.lo sig_die.lo exit_.lo setarg.lo setsig.lo
@@ -80,13 +82,15 @@ OBJS = $(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) \
 
 all: ../s-libf77 ../libfrtbegin.a
 
-../s-libf77: $(OBJS)
+../s-libf77: ../libF77.la
 	echo timestamp > ../s-libf77
 
+../libF77.la: $(OBJS)
+	$(LINK) $(OBJS)
+
 objlist:
 	objs="`cat ../objlist`" ; for i in $(OBJS) ; do \
-	   x=`echo $$i` ;\
-	   objs="$$objs libF77/$$x" ;\
+	   objs="$$objs libF77/$$i" ;\
 	done ; \
 	echo -n $$objs > ../objlist
 
diff --git a/libf2c/libI77/Makefile.in b/libf2c/libI77/Makefile.in
index b89d8f9..125368d 100644
--- a/libf2c/libI77/Makefile.in
+++ b/libf2c/libI77/Makefile.in
@@ -51,6 +51,8 @@ ALL_CFLAGS = -I. -I$(srcdir) -I$(G2C_H_DIR) -I$(F2C_H_DIR) $(CPPFLAGS) \
 .c.lo:
 	@LIBTOOL@ --mode=compile $(CC) -c -DSkip_f2c_Undefs -DAllow_TYQUAD $(ALL_CFLAGS) $<
 
+LINK = @LIBTOOL@ --mode=link $(CC) $(ALL_CFLAGS) -o $@
+
 OBJS =	VersionI.lo backspace.lo close.lo dfe.lo dolio.lo due.lo endfile.lo err.lo \
 	fmt.lo fmtlib.lo iio.lo ilnw.lo inquire.lo lread.lo lwrite.lo open.lo \
 	rdfmt.lo rewind.lo rsfe.lo rsli.lo rsne.lo sfe.lo sue.lo typesize.lo uio.lo \
@@ -59,13 +61,15 @@ OBJS =	VersionI.lo backspace.lo close.lo dfe.lo dolio.lo due.lo endfile.lo err.l
 
 all: ../s-libi77
 
-../s-libi77: $(OBJS)
+../s-libi77: ../libI77.la
 	echo timestamp > ../s-libi77
 
+../libI77.la: $(OBJS)
+	$(LINK) $(OBJS)
+
 objlist:
 	objs="`cat ../objlist`" ; for i in $(OBJS) ; do \
-	   x=`echo $$i` ;\
-	   objs="$$objs libI77/$$x" ;\
+	   objs="$$objs libI77/$$i" ;\
 	done ; \
 	echo -n $$objs > ../objlist
 
diff --git a/libf2c/libU77/Makefile.in b/libf2c/libU77/Makefile.in
index 5b12dd5..05d47b2 100644
--- a/libf2c/libU77/Makefile.in
+++ b/libf2c/libU77/Makefile.in
@@ -55,6 +55,8 @@ G77DIR = ../../../gcc/
 .c.lo:
 	@LIBTOOL@ --mode=compile $(CC) -c -DSkip_f2c_Undefs $(ALL_CFLAGS) $<
 
+LINK = @LIBTOOL@ --mode=link $(CC) $(ALL_CFLAGS) -o $@
+
 OBJS =  VersionU.lo gerror_.lo perror_.lo ierrno_.lo itime_.lo time_.lo \
 	unlink_.lo fnum_.lo getpid_.lo getuid_.lo getgid_.lo kill_.lo rand_.lo \
 	srand_.lo irand_.lo sleep_.lo idate_.lo ctime_.lo etime_.lo \
@@ -78,13 +80,15 @@ SRCS =  Version.c gerror_.c perror_.c ierrno_.c itime_.c time_.c \
 
 all: ../s-libu77
 
-../s-libu77: $(OBJS)
+../s-libu77: ../libU77.la
 	echo timestamp > ../s-libu77
 
+../libU77.la: $(OBJS)
+	$(LINK) $(OBJS)
+
 objlist:
 	objs="`cat ../objlist`" ; for i in $(OBJS) ; do \
-	   x=`echo $$i` ;\
-	   objs="$$objs libU77/$$x" ;\
+	   objs="$$objs libU77/$$i" ;\
 	done ; \
 	echo -n $$objs > ../objlist