Make-lang.in: Remove reference to FORTRAN_INIT.

2001-10-03  Toon Moene  <toon@moene.indiv.nluug.nl>

	gcc/f/
	* Make-lang.in: Remove reference to FORTRAN_INIT.
	* g77spec.c: Add reference to FORTRAN_INIT.

	libf2c/
	* Makefile.in: Add "AR" reference, change
	from frtbegin.o to libfrtbegin.a.
	* libF77/Makefile.in: Ditto.

From-SVN: r45985

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 98009f964db1589d04bdb39f3d252b9399743c96..872834fef17704dfb25996fd2cb5f0e64e239ab2 100644 (file)
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-03  Toon Moene  <toon@moene.indiv.nluug.nl>
+
+       * Make-lang.in: Remove reference to FORTRAN_INIT.
+       * g77spec.c: Add reference to FORTRAN_INIT.
+
 2001-09-29  Juergen Pfeifer  <juergen.pfeifer@gmx.net>
 
        Make libf2c a shared library.

diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in
index b3034cab946ed4555e086fe9607b3762e4b223df..df0a4d13779f15ef9005fdf7ff8a98706a5fff5e 100644 (file)
--- a/gcc/f/Make-lang.in
+++ b/gcc/f/Make-lang.in
@@ -73,7 +73,6 @@ g77spec.o: $(srcdir)/f/g77spec.c $(srcdir)/f/version.h $(SYSTEM_H) $(GCC_H) \
        esac
        if [ -f lang-f77 ]; then \
          $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-               -DFORTRAN_INIT=\"$(libsubdir)/frtbegin.o\" \
                $(srcdir)/f/g77spec.c $(OUTPUT_OPTION); \
        else true; fi
 

diff --git a/gcc/f/g77spec.c b/gcc/f/g77spec.c
index 70d4fac330604719827f05ec8934fcce3d820ea4..dfa1c88e5d7a48f87693f1afe7e78d0dc4373b82 100644 (file)
--- a/gcc/f/g77spec.c
+++ b/gcc/f/g77spec.c
@@ -53,6 +53,10 @@ Boston, MA 02111-1307, USA.  */
 #define MATH_LIBRARY "-lm"
 #endif
 
+#ifndef FORTRAN_INIT
+#define FORTRAN_INIT "-lfrtbegin"
+#endif
+
 #ifndef FORTRAN_LIBRARY
 #define FORTRAN_LIBRARY "-lg2c"
 #endif

diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog
index c6317458577b3263c1de7d39fa11f6d5b17080cb..4a50b123f02d9c3a635db6f6bdaf7ff9c3f3915d 100644 (file)
--- a/libf2c/ChangeLog
+++ b/libf2c/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-03  Toon Moene  <toon@moene.indiv.nluug.nl>
+
+       * Makefile.in: Add "AR" reference, change
+       from frtbegin.o to libfrtbegin.a.
+       * libF77/Makefile.in: Ditto.
+
 2001-10-02  Toon Moene  <toon@moene.indiv.nluug.nl>
 
        * libF77/Makefile.in: Make .lo the target of compilation.

diff --git a/libf2c/Makefile.in b/libf2c/Makefile.in
index 9efa1c527b61dad5fc8f737918bff455db190ed4..579182a1b358c0ba26eeca14f2e75ae71646549d 100644 (file)
--- a/libf2c/Makefile.in
+++ b/libf2c/Makefile.in
@@ -68,6 +68,7 @@ FLAGS_TO_PASS= \
        LIBTOOL='$(LIBTOOL)' \
        CFLAGS='$(CFLAGS)' \
        CPPFLAGS='$(CPPFLAGS)' \
+       AR='$(AR)' \
        RANLIB='$(RANLIB)' \
        prefix='$(prefix)' \
        exec_prefix='$(exec_prefix)' \
@@ -210,7 +211,8 @@ install: all
           if [ -f $(LIBG2C_BASE).so ]; then \
             mv $(LIBG2C_BASE).so* $(prefix)/lib ;\
           fi)
-       $(INSTALL_DATA) frtbegin.o $(libsubdir)
+       $(INSTALL_DATA) libfrtbegin.a $(libsubdir)/$(MULTISUBDIR)
+       $(RANLIB) $(libsubdir)/$(MULTISUBDIR)/libfrtbegin.a
        $(INSTALL_DATA) g2c.h $(libsubdir)/include/g2c.h
        @if [ -f f2c-install-ok -o -f $(srcdir)/f2c-install-ok ]; then \
          echo ''; \

diff --git a/libf2c/libF77/Makefile.in b/libf2c/libF77/Makefile.in
index 98ed23c4203e98d613a2a3d25cbd374e1a24dddc..794e996e641bef59008725f14d46a67ece3772e9 100644 (file)
--- a/libf2c/libF77/Makefile.in
+++ b/libf2c/libF77/Makefile.in
@@ -36,6 +36,8 @@ G2C_H_DIR = ..
 CC = @CC@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
+AR = @AR@
+ARFLAGS = rc
 @SET_MAKE@
 
 SHELL = /bin/sh
@@ -76,7 +78,7 @@ 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 ../frtbegin.o
+all: ../s-libf77 ../libfrtbegin.a
 
 ../s-libf77: $(OBJS)
        echo timestamp > ../s-libf77
@@ -93,7 +95,7 @@ Makefile: Makefile.in config.status
 
 config.status: configure
        rm -f config.cache
-       CONFIG_SITE=no-such-file CC='$(CC)' CFLAGS='$(CFLAGS)' \
+       CONFIG_SITE=no-such-file CC='$(CC)' AR='$(AR)' CFLAGS='$(CFLAGS)' \
          CPPFLAGS='$(CPPFLAGS)' $(SHELL) config.status --recheck
 
 ${srcdir}/configure: configure.in
@@ -103,9 +105,13 @@ ${srcdir}/configure: configure.in
 VersionF.lo: Version.c
        @LIBTOOL@ --mode=compile $(CC) -c $(ALL_CFLAGS) $(srcdir)/Version.c -o $@
 
-../frtbegin.o : main.c
+frtbegin.o : main.c
        $(CC) -c $(ALL_CFLAGS) $(srcdir)/main.c -o $@
 
+../libfrtbegin.a: frtbegin.o
+       $(AR) $(ARFLAGS) $@ $<
+       $(RANLIB) $@
+
 F77_aloc.lo: F77_aloc.c
 s_rnge.lo: s_rnge.c
 abort_.lo: abort_.c
@@ -234,7 +240,7 @@ $(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) $(HALF) $(CMP) $(EFL) \
 check install uninstall install-strip dist installcheck installdirs:
 
 mostlyclean:
-       rm -f *.o *.lo ../frtbegin.o
+       rm -f *.o *.lo ../libfrtbegin.a
        rm -rf .libs
 
 clean: mostlyclean