From 6d76c71f5e7a2f7aeb5f9f969faeb1a4021a6980 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 15 Feb 1996 19:45:45 +0000 Subject: [PATCH] * Makefile.in (SONAME): Remove leading ../bfd/ from $(SHLIB). --- opcodes/ChangeLog | 4 ++++ opcodes/Makefile.in | 49 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 911502199c7..a6a5ddc4191 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +Thu Feb 15 14:45:05 1996 Ian Lance Taylor + + * Makefile.in (SONAME): Remove leading ../bfd/ from $(SHLIB). + Wed Feb 14 19:01:27 1996 Alan Modra * i386-dis.c (onebyte_has_modrm): New static array. diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index 997239380c4..388f5e8f30c 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -21,6 +21,7 @@ srcdir = @srcdir@ prefix = @prefix@ +program_transform_name = @program_transform_name@ exec_prefix = @exec_prefix@ bindir = $(exec_prefix)/bin libdir = $(exec_prefix)/lib @@ -63,6 +64,8 @@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ COMMON_SHLIB = @COMMON_SHLIB@ SHLINK = @SHLINK@ +SONAME = lib`echo $(SHLIB) | sed -e 's,^\.\./bfd/,,' -e 's/^lib//' | sed '$(program_transform_name)'` + INCDIR = $(srcdir)/../include BFDDIR = $(srcdir)/../bfd CSEARCH = -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @@ -154,9 +157,37 @@ $(SHLIB): stamp-picdir $(OFILES) piclist fi $(SHLINK): $(SHLIB) + ts=lib`echo $(SHLIB) | sed -e 's,^\.\./bfd/,,' -e 's/^lib//' | sed -e '$(program_transform_name)'`; \ + if [ "$(COMMON_SHLIB)" = "yes" ]; then \ + ts=../bfd/$$ts; \ + fi; \ + if [ "$$ts" != "$(SHLIB)" ]; then \ + rm -f $$ts; \ + ln -sf `echo $(SHLIB) | sed -e 's,^\.\./bfd/,,'` $$ts; \ + else true; fi rm -f $(SHLINK) ln -sf `echo $(SHLIB) | sed -e 's,^\.\./bfd/,,'` $(SHLINK) +# This target creates libTARGET-opcodes.so.VERSION as a symlink to +# libopcodes.so.VERSION. It is used on SunOS, which does not have SONAME. +stamp-tshlink: $(SHLIB) + tf=lib`echo $(SHLIB) | sed -e 's,\.\./bfd/,,' -e 's/^lib//' | sed '$(program_transform_name)'`; \ + if [ "$(COMMON_SHLIB)" = "yes" ]; then \ + tf=../bfd/$$tf; \ + fi; \ + if [ "$$tf" != "$(SHLIB)" ]; then \ + rm -f $$tf; \ + ln -sf $(SHLIB) $$tf; \ + else true; fi + if [ "$(COMMON_SHLIB)" = "yes" ]; then \ + tf=lib`echo $(TARGETLIB) | sed -e 's/^lib//' | sed '$(program_transform_name)'`; \ + if [ "$$tf" != "$(TARGETLIB)" ]; then \ + rm -f $$tf; \ + ln -sf $(TARGETLIB) $$tf; \ + else true; fi; \ + else true; fi + touch stamp-tshlink + $(OFILES): stamp-picdir disassemble.o: disassemble.c $(INCDIR)/dis-asm.h @@ -229,16 +260,20 @@ force: install: $(ALLLIBS) for f in $(ALLLIBS); do \ - bf=`echo $$f | sed -e 's,^\.\./bfd/,,'`; \ - rm -f $(libdir)/$$bf; \ + if [ "$$f" = "stamp-tshlink" ]; then \ + continue; \ + fi; \ + tf=lib`echo $$f | sed -e 's,^\.\./bfd/,,' -e 's/^lib//' | sed '$(program_transform_name)'`; \ + rm -f $(libdir)/$$tf; \ if [ "$$f" = "$(SHLINK)" ]; then \ - ln -sf `echo $(SHLIB) | sed -e 's,^\.\./bfd/,,'` $(libdir)/$$bf; \ + ts=lib`echo $(SHLIB) | sed -e 's,^\.\./bfd/,,' -e 's/^lib//' | sed '$(program_transform_name)'`; \ + ln -sf $$ts $(libdir)/$$tf; \ elif [ "$$f" = "$(SHLIB)" ]; then \ - $(INSTALL_PROGRAM) $$f $(libdir)/$$bf; \ + $(INSTALL_PROGRAM) $$f $(libdir)/$$tf; \ else \ - $(INSTALL_DATA) $$f $(libdir)/$$bf; \ - $(RANLIB) $(libdir)/$$bf; \ - chmod a-x $(libdir)/$$bf; \ + $(INSTALL_DATA) $$f $(libdir)/$$tf; \ + $(RANLIB) $(libdir)/$$tf; \ + chmod a-x $(libdir)/$$tf; \ fi; \ done -- 2.30.2