diff options
| author | toon <toon@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-10-03 06:10:50 +0000 |
|---|---|---|
| committer | toon <toon@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-10-03 06:10:50 +0000 |
| commit | 9bd67d5dd88fab5e0bc79613b7c834cff0fd8064 (patch) | |
| tree | 09c8d16c72810dcff07b800e2cf05a00395740a6 /libf2c | |
| parent | a8f4c092e7d981f6b8ceb8d37d705b1fca8c8c22 (diff) | |
| download | gcc-9bd67d5dd88fab5e0bc79613b7c834cff0fd8064.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@45985 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libf2c')
| -rw-r--r-- | libf2c/ChangeLog | 6 | ||||
| -rw-r--r-- | libf2c/Makefile.in | 4 | ||||
| -rw-r--r-- | libf2c/libF77/Makefile.in | 14 |
3 files changed, 19 insertions, 5 deletions
diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog index c6317458577..4a50b123f02 100644 --- 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 9efa1c527b6..579182a1b35 100644 --- 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 98ed23c4203..794e996e641 100644 --- 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 |