Thu Feb 15 10:39:17 1996 H.J. Lu <hjl@zoom.com>

	* Makefile.in ($(srcdir)/bfd-in2.h): Rename target from bfd-in2.h.
	($(srcdir)/libbfd.h): Rename from libbfd.h.
	($(srcdir)/libcoff.h): Rename from libcoff.h.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 02531142eeb881fffc5ae8f97fd2782250e7a7cf..e6c7d581afd834153e11591f4603746ed4772d51 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+Thu Feb 15 10:39:17 1996  H.J. Lu  <hjl@zoom.com>
+
+       * Makefile.in ($(srcdir)/bfd-in2.h): Rename target from bfd-in2.h.
+       ($(srcdir)/libbfd.h): Rename from libbfd.h.
+       ($(srcdir)/libcoff.h): Rename from libcoff.h.
+
 Wed Feb 14 16:29:07 1996  Martin Anantharaman  <martin@mail.imech.uni-duisburg.de>
 
        * ieee.c (ieee_write_expression): Only use an R variable for a

diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 0da4cbbeb9f35fc01bf1bd32b9f2b46aeb8ec2fb..b67cb5aee828c4c72ebc66eec6df227082f30f05 100644 (file)
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -67,6 +67,8 @@ SHLIB_CFLAGS = @SHLIB_CFLAGS@
 COMMON_SHLIB = @COMMON_SHLIB@
 SHLINK = @SHLINK@
 
+SONAME = lib`echo $(SHLIB) | sed -e 's/^lib//' | sed '$(program_transform_name)'`
+
 CC_FOR_BUILD = @CC_FOR_BUILD@
 
 INCDIR = $(srcdir)/../include
@@ -496,10 +498,27 @@ $(SHLIB): stamp-picdir $(OFILES) piclist
        rm -f $(SHLIB)
        $(SHLIB_CC) $(SHLIB_CFLAGS) -o $(SHLIB) `cat piclist`
 
+# We make a link from libbfd.so to libbfd.so.VERSION for linking, and
+# also a link from libTARGET-bfd.so.VERSION for running.
 $(SHLINK): $(SHLIB)
+       ts=lib`echo $(SHLIB) | sed -e 's/^lib//' | sed -e '$(program_transform_name)'`; \
+       if [ "$$ts" != "$(SHLIB)" ]; then \
+         rm -f $$ts; \
+         ln -sf $(SHLIB) $$ts; \
+       else true; fi
        rm -f $(SHLINK)
        ln -sf $(SHLIB) $(SHLINK)
 
+# This target creates libTARGET-bfd.so.VERSION as a symlink to
+# libbfd.so.VERSION.  It is used on SunOS, which does not have SONAME.
+stamp-tshlink: $(SHLIB)
+       tf=lib`echo $(SHLIB) | sed -e 's/^lib//' | sed '$(program_transform_name)'`; \
+       if [ "$$tf" != "$(SHLIB)" ]; then \
+         rm -f $$tf; \
+         ln -sf $(SHLIB) $$tf; \
+       else true; fi
+       touch stamp-tshlink
+
 # When compiling archures.c and targets.c, supply the default target
 # info from configure.
 
@@ -626,6 +645,9 @@ force:
 
 install: $(ALLLIBS)
        for f in $(ALLLIBS); do \
+         if [ "$$f" = "stamp-tshlink" ]; then \
+           continue; \
+         fi; \
          tf=lib`echo $$f | sed -e 's/^lib//' | sed '$(program_transform_name)'`; \
          rm -f $(libdir)/$$tf; \
          if [ "$$f" = "$(SHLINK)" ]; then \
@@ -736,15 +758,15 @@ headers:
 
 # The rules for the generated header files are here so that people can
 # type `make bfd-in2.h' if they remove it.  They are not run by default.
-bfd-in2.h:
+$(srcdir)/bfd-in2.h:
        (cd $(docdir); $(MAKE) bfd.h $(FLAGS_TO_PASS))
        cp $(docdir)/bfd.h bfd-in2.h-new
        $(srcdir)/../move-if-change bfd-in2.h-new $(srcdir)/bfd-in2.h
-libbfd.h:
+$(srcdir)/libbfd.h:
        (cd $(docdir); $(MAKE) libbfd.h $(FLAGS_TO_PASS))
        cp $(docdir)/libbfd.h libbfd.h-new
        $(srcdir)/../move-if-change libbfd.h-new $(srcdir)/libbfd.h
-libcoff.h:
+$(srcdir)/libcoff.h:
        (cd $(docdir); $(MAKE) libcoff.h $(FLAGS_TO_PASS))
        cp $(docdir)/libcoff.h libcoff.h-new
        $(srcdir)/../move-if-change libcoff.h-new $(srcdir)/libcoff.h