2001-11-13 Toon Moene <toon@moene.indiv.nluug.nl>

	* Makefile.in: Change dependencies on stamp files
	into dependencies on the generated .la files.
	Get rid of objlist.  Update comment.
	* libF77/Makefile.in: Ditto.
	* libI77/Makefile.in: Ditto.
	* libU77/Makefile.in: Ditto.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46970 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 30 insertions, 59 deletions

diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog
index bf047a1b30d..cc89759c10d 100644
--- a/libf2c/ChangeLog
+++ b/libf2c/ChangeLog
@@ -1,3 +1,12 @@
+2001-11-13  Toon Moene  <toon@moene.indiv.nluug.nl>
+
+	* Makefile.in: Change dependencies on stamp files
+	into dependencies on the generated .la files.
+	Get rid of objlist.  Update comment.
+	* libF77/Makefile.in: Ditto.
+	* libI77/Makefile.in: Ditto.
+	* libU77/Makefile.in: Ditto.
+
 2001-10-20  Hans-Peter Nilsson  <hp@bitrange.com>
 
 	* configure.in: Fake AC_EXEEXT invocation.
diff --git a/libf2c/Makefile.in b/libf2c/Makefile.in
index 18b3a8d7ca1..ef62147bd6c 100644
--- a/libf2c/Makefile.in
+++ b/libf2c/Makefile.in
@@ -117,36 +117,24 @@ all: all-unilib
 # meant to be invoked via multi-do for multilibs.
 
 # Its dependencies can be satisfied in parallel.  The [fiu]77 targets
-# update stamp files (see the subdir makefiles) which the $(LIBG2C)
-# target checks in the sub make to decide whether to run ar/ranlib.
-# (Probably only one stamp file is really needed.)  The stamp files
-# s-lib[fiu]77 are intentionally not targets, since we're only meant
-# to come in at the level of this target.  The [fiu]77 targets always
-# invoke sub makes to check dependencies in the subdirs, else we'd
+# always invoke sub makes to check dependencies in the subdirs, else we'd
 # have to maintain them at this level; we live with the overhead of
 # some recursive makes which may do nothing.
 
-all-unilib: i77 f77 u77 s-libe77
+all-unilib: i77 f77 u77 libE77.la
 	$(MAKE) $(FLAGS_TO_PASS) $(LIBG2C)
 
 i77 f77 u77: g2c.h
 
 # This target should normally only get invoked via `all-unilib' --
 # after all's well in the subdirs -- actually to assemble the library.
-# The stamp file dependencies are just to check whether libg2c.a is
-# up-to-date (to avoid running ar regardless) -- the files should
-# always have been created by a successful `all-unilib'.
 
-$(LIBG2C): s-libi77 s-libf77 s-libu77 s-libe77
+$(LIBG2C): libF77.la libI77.la libU77.la libE77.la
 	rm -f $@ ;\
 	set -e; \
-	rm -f objlist ;\
-	touch 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` libF77.la libI77.la libU77.la -lc -lm
+	  -rpath $(prefix)/lib libE77.la libF77.la libI77.la libU77.la -lc -lm
 
 i77:
 	cd libI77; $(MAKE) $(FLAGS_TO_PASS) all
@@ -157,7 +145,8 @@ f77:
 u77:
 	cd libU77; $(MAKE) $(FLAGS_TO_PASS) all
 
-s-libe77: f2cext.c
+libE77.la: f2cext.c
+	rm -f $@
 	if [ -d libE77 ]; then rm -f libE77/*.o libE77/*.lo; else mkdir libE77; fi
 	for name in $(F2CEXT); \
 	do \
@@ -167,7 +156,7 @@ s-libe77: f2cext.c
 	    -o libE77/L$${name}.o ; \
 	  if [ $$? -eq 0 ] ; then true; else exit 1; fi; \
 	done
-	echo timestamp >s-libe77
+	$(LIBTOOL) --mode=link $(CC) -o libE77.la libE77/*.lo
 
 f2cext.c: g2c.h
 
@@ -230,7 +219,7 @@ mostlyclean:
 	rm -f $(LIBG2C) objlist
 	$(MAKE) DO=$@ DODIRS="$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do; \
 	$(MULTICLEAN) multi-clean DO=$@
-	rm -fr libE77 s-libe77
+	rm -fr libE77 libE77.la
 
 clean: mostlyclean
 	rm -f config.log
@@ -239,7 +228,7 @@ clean: mostlyclean
 	rm -rf .libs
 
 distclean: clean
-	rm -f g2c.h s-libe77
+	rm -f g2c.h libE77.la
 	$(MAKE) DO=$@ DODIRS="$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do; \
 	$(MULTICLEAN) multi-clean DO=distclean
 	rm -f config.cache config.status Makefile
diff --git a/libf2c/libF77/Makefile.in b/libf2c/libF77/Makefile.in
index bdb31a85637..e853b05fd4c 100644
--- a/libf2c/libF77/Makefile.in
+++ b/libf2c/libF77/Makefile.in
@@ -52,7 +52,7 @@ 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 $@
+LINK = @LIBTOOL@ --mode=link $(CC) -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\
@@ -80,20 +80,11 @@ F90BIT = lbitbits.lo lbitshft.lo qbitbits.lo qbitshft.lo
 OBJS = $(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) \
 	 $(HALF) $(CMP) $(EFL) $(CHAR) $(F90BIT)
 
-all: ../s-libf77 ../libfrtbegin.a
-
-../s-libf77: ../libF77.la
-	echo timestamp > ../s-libf77
+all: ../libF77.la ../libfrtbegin.a
 
 ../libF77.la: $(OBJS)
 	$(LINK) $(OBJS)
 
-objlist:
-	objs="`cat ../objlist`" ; for i in $(OBJS) ; do \
-	   objs="$$objs libF77/$$i" ;\
-	done ; \
-	echo -n $$objs > ../objlist
-
 Makefile: Makefile.in config.status
 	$(SHELL) config.status
 
@@ -249,10 +240,10 @@ mostlyclean:
 
 clean: mostlyclean
 	rm -f config.log
-	rm -f ../s-libf77
+	rm -f ../libF77.la
 
 distclean: clean
-	rm -f config.cache config.status Makefile ../s-libf77 configure
+	rm -f config.cache config.status Makefile ../libF77.la configure
 
 maintainer-clean:
 
diff --git a/libf2c/libI77/Makefile.in b/libf2c/libI77/Makefile.in
index 125368ddd3a..b7ca7d72eaf 100644
--- a/libf2c/libI77/Makefile.in
+++ b/libf2c/libI77/Makefile.in
@@ -51,7 +51,7 @@ 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 $@
+LINK = @LIBTOOL@ --mode=link $(CC) -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 \
@@ -59,20 +59,11 @@ OBJS =	VersionI.lo backspace.lo close.lo dfe.lo dolio.lo due.lo endfile.lo err.l
 	util.lo wref.lo wrtfmt.lo wsfe.lo wsle.lo wsne.lo xwsne.lo \
 	ftell_.lo
 
-all: ../s-libi77
-
-../s-libi77: ../libI77.la
-	echo timestamp > ../s-libi77
+all: ../libI77.la
 
 ../libI77.la: $(OBJS)
 	$(LINK) $(OBJS)
 
-objlist:
-	objs="`cat ../objlist`" ; for i in $(OBJS) ; do \
-	   objs="$$objs libI77/$$i" ;\
-	done ; \
-	echo -n $$objs > ../objlist
-
 Makefile: Makefile.in config.status
 	$(SHELL) config.status
 
@@ -166,10 +157,10 @@ mostlyclean:
 	rm -rf .libs
 
 clean: mostlyclean
-	rm -f config.log ../s-libi77
+	rm -f config.log ../libI77.la
 
 distclean: clean
-	rm -f config.cache config.status Makefile ../s-libi77 configure
+	rm -f config.cache config.status Makefile ../libI77.la configure
 
 maintainer-clean:
 
diff --git a/libf2c/libU77/Makefile.in b/libf2c/libU77/Makefile.in
index 05d47b29f7e..c6dcadb812f 100644
--- a/libf2c/libU77/Makefile.in
+++ b/libf2c/libU77/Makefile.in
@@ -55,7 +55,7 @@ G77DIR = ../../../gcc/
 .c.lo:
 	@LIBTOOL@ --mode=compile $(CC) -c -DSkip_f2c_Undefs $(ALL_CFLAGS) $<
 
-LINK = @LIBTOOL@ --mode=link $(CC) $(ALL_CFLAGS) -o $@
+LINK = @LIBTOOL@ --mode=link $(CC) -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 \
@@ -78,20 +78,11 @@ SRCS =  Version.c gerror_.c perror_.c ierrno_.c itime_.c time_.c \
 	umask_.c sys_clock_.c date_.c second_.c flush1_.c mclock_.c \
 	alarm_.c datetime_.c
 
-all: ../s-libu77
-
-../s-libu77: ../libU77.la
-	echo timestamp > ../s-libu77
+all: ../libU77.la
 
 ../libU77.la: $(OBJS)
 	$(LINK) $(OBJS)
 
-objlist:
-	objs="`cat ../objlist`" ; for i in $(OBJS) ; do \
-	   objs="$$objs libU77/$$i" ;\
-	done ; \
-	echo -n $$objs > ../objlist
-
 Makefile: Makefile.in config.status
 	$(SHELL) config.status
 
@@ -187,11 +178,11 @@ mostlyclean:
 	rm -rf .libs
 
 clean: mostlyclean
-	rm -f config.log ../s-libu77
+	rm -f config.log ../libU77.la
 
 distclean: clean
 	rm -f config.cache config.status Makefile config.h stamp.h \
-	  ../s-libu77 configure
+	  ../libU77.la configure
 
 maintainer-clean: