Commit 01a6a27a by Steve Ellcey Committed by Steve Ellcey

Makefile.am: Add -I ..

        * Makefile.am: Add -I .. to ACLOCAL_AMFLAGS.  Add libgfortran_la_LINK.
        * Makefile.in: Regenerate.

From-SVN: r123827
parent 6b2c5ce0
2007-04-14 Steve Ellcey <sje@cup.hp.com>
* Makefile.am: Add -I .. to ACLOCAL_AMFLAGS. Add libgfortran_la_LINK.
* Makefile.in: Regenerate.
2007-04-11 Kai Tietz <kai.tietz@onevision.com> 2007-04-11 Kai Tietz <kai.tietz@onevision.com>
* configure: Regenerate. * configure: Regenerate.
......
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
ACLOCAL_AMFLAGS = -I ../config ACLOCAL_AMFLAGS = -I .. -I ../config
## May be used by toolexeclibdir. ## May be used by toolexeclibdir.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
toolexeclib_LTLIBRARIES = libgfortran.la toolexeclib_LTLIBRARIES = libgfortran.la
libgfortran_la_LINK = $(LINK)
libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lm $(extra_ldflags_libgfortran) libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lm $(extra_ldflags_libgfortran)
myexeclib_LTLIBRARIES = libgfortranbegin.la myexeclib_LTLIBRARIES = libgfortranbegin.la
......
...@@ -387,9 +387,10 @@ target_subdir = @target_subdir@ ...@@ -387,9 +387,10 @@ target_subdir = @target_subdir@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
toolexecdir = @toolexecdir@ toolexecdir = @toolexecdir@
toolexeclibdir = @toolexeclibdir@ toolexeclibdir = @toolexeclibdir@
ACLOCAL_AMFLAGS = -I ../config ACLOCAL_AMFLAGS = -I .. -I ../config
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
toolexeclib_LTLIBRARIES = libgfortran.la toolexeclib_LTLIBRARIES = libgfortran.la
libgfortran_la_LINK = $(LINK)
libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lm $(extra_ldflags_libgfortran) libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lm $(extra_ldflags_libgfortran)
myexeclib_LTLIBRARIES = libgfortranbegin.la myexeclib_LTLIBRARIES = libgfortranbegin.la
myexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR) myexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)
...@@ -1122,7 +1123,7 @@ clean-toolexeclibLTLIBRARIES: ...@@ -1122,7 +1123,7 @@ clean-toolexeclibLTLIBRARIES:
rm -f "$${dir}/so_locations"; \ rm -f "$${dir}/so_locations"; \
done done
libgfortran.la: $(libgfortran_la_OBJECTS) $(libgfortran_la_DEPENDENCIES) libgfortran.la: $(libgfortran_la_OBJECTS) $(libgfortran_la_DEPENDENCIES)
$(FCLINK) -rpath $(toolexeclibdir) $(libgfortran_la_LDFLAGS) $(libgfortran_la_OBJECTS) $(libgfortran_la_LIBADD) $(LIBS) $(libgfortran_la_LINK) -rpath $(toolexeclibdir) $(libgfortran_la_LDFLAGS) $(libgfortran_la_OBJECTS) $(libgfortran_la_LIBADD) $(LIBS)
libgfortranbegin.la: $(libgfortranbegin_la_OBJECTS) $(libgfortranbegin_la_DEPENDENCIES) libgfortranbegin.la: $(libgfortranbegin_la_OBJECTS) $(libgfortranbegin_la_DEPENDENCIES)
$(LINK) -rpath $(myexeclibdir) $(libgfortranbegin_la_LDFLAGS) $(libgfortranbegin_la_OBJECTS) $(libgfortranbegin_la_LIBADD) $(LIBS) $(LINK) -rpath $(myexeclibdir) $(libgfortranbegin_la_LDFLAGS) $(libgfortranbegin_la_OBJECTS) $(libgfortranbegin_la_LIBADD) $(LIBS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment