diff options
| author | sje <sje@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-04-14 19:50:46 +0000 |
|---|---|---|
| committer | sje <sje@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-04-14 19:50:46 +0000 |
| commit | cc38658d121bbf9086e9ea01586cfcb2c1d44f6f (patch) | |
| tree | e585e59f4ddd6964623be39791604e77e1323fd1 | |
| parent | 21d39539fee111c0a4816111f4a5edd84498c548 (diff) | |
| download | gcc-cc38658d121bbf9086e9ea01586cfcb2c1d44f6f.tar.gz | |
* Makefile.am: Add -I .. to ACLOCAL_AMFLAGS. Add libgfortran_la_LINK.
* Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123827 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libgfortran/ChangeLog | 5 | ||||
| -rw-r--r-- | libgfortran/Makefile.am | 3 | ||||
| -rw-r--r-- | libgfortran/Makefile.in | 5 |
3 files changed, 10 insertions, 3 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index c419af9884b..17f0885c48c 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,8 @@ +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> * configure: Regenerate. diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am index 2338b9b8c4d..b857ffed51f 100644 --- a/libgfortran/Makefile.am +++ b/libgfortran/Makefile.am @@ -1,12 +1,13 @@ ## Process this file with automake to produce Makefile.in -ACLOCAL_AMFLAGS = -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config ## May be used by toolexeclibdir. gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) toolexeclib_LTLIBRARIES = libgfortran.la +libgfortran_la_LINK = $(LINK) libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lm $(extra_ldflags_libgfortran) myexeclib_LTLIBRARIES = libgfortranbegin.la diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in index 8e10976943e..00b1774999e 100644 --- a/libgfortran/Makefile.in +++ b/libgfortran/Makefile.in @@ -387,9 +387,10 @@ target_subdir = @target_subdir@ target_vendor = @target_vendor@ toolexecdir = @toolexecdir@ toolexeclibdir = @toolexeclibdir@ -ACLOCAL_AMFLAGS = -I ../config +ACLOCAL_AMFLAGS = -I .. -I ../config gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) toolexeclib_LTLIBRARIES = libgfortran.la +libgfortran_la_LINK = $(LINK) libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lm $(extra_ldflags_libgfortran) myexeclib_LTLIBRARIES = libgfortranbegin.la myexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR) @@ -1122,7 +1123,7 @@ clean-toolexeclibLTLIBRARIES: rm -f "$${dir}/so_locations"; \ done 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) $(LINK) -rpath $(myexeclibdir) $(libgfortranbegin_la_LDFLAGS) $(libgfortranbegin_la_OBJECTS) $(libgfortranbegin_la_LIBADD) $(LIBS) |