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
This commit is contained in:
Toon Moene 2001-10-03 08:10:50 +02:00 committed by Toon Moene
parent c25ca2d7f7
commit 4ffe74d94f
6 changed files with 28 additions and 6 deletions

View File

@ -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.

View File

@ -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

View File

@ -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

View File

@ -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.

View File

@ -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 ''; \

View File

@ -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