* Makefile.am (docdir): Define.

	* Makefile.in: Rebuild.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4244abf..2052c35 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug  6 18:56:51 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+       * Makefile.am (docdir): Define.
+       * Makefile.in: Rebuild.
+
 Tue Aug  5 23:05:03 1997  Ian Lance Taylor  <ian@cygnus.com>
 
        * configure: Rebuild with autoconf 2.12.1.

diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 912712a..ad7d646 100644 (file)
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -6,6 +6,8 @@ DEP = mkdep
 
 SUBDIRS = doc
 
+docdir = doc
+
 lib_LTLIBRARIES = libbfd.la
 
 # bfd.h goes here, for now
@@ -423,10 +425,15 @@ libbfd_la_LIBADD = `cat ofiles`
 # directory so that we don't have to convert all the programs that use
 # libbfd.a simultaneously.  This is a hack which should be removed if
 # everything else starts using libtool.  FIXME.
+
 noinst_LIBRARIES = libbfd.a
-libbfd.a: libbfd.la
-       rm -f libbfd.a
-       $(LN_S) .libs/libbfd.a libbfd.a
+
+stamp-lib: libbfd.la
+       cp .libs/libbfd.a libbfd.tmp
+       $(SHELL) $(srcdir)/../move-if-change libbfd.tmp libbfd.a
+       touch stamp-lib
+
+libbfd.a: stamp-lib ; @true
 
 # This file holds an array associating configuration triplets and
 # vector names.  It is built from config.bfd.  It is not compiled by
@@ -555,7 +562,7 @@ $(srcdir)/libcoff.h:
 MOSTLYCLEANFILES = elf32-target.h elf64-target.h ofiles stamp-ofiles \
        targmatch.h
 
-CLEANFILES = bfd.h dep.sed stmp-bfd.h .dep .dep1
+CLEANFILES = bfd.h dep.sed stmp-bfd.h .dep .dep1 libbfd.a stamp-lib
 
 start-sanitize-arc:
 elf32-arc.lo: elf32-arc.c elf-bfd.h $(INCDIR)/elf/common.h \

diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index fe68682..28475b3 100644 (file)
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -61,6 +61,7 @@ BFD_HOST_64_BIT = @BFD_HOST_64_BIT@
 BFD_HOST_64_BIT_DEFINED = @BFD_HOST_64_BIT_DEFINED@
 BFD_HOST_U_64_BIT = @BFD_HOST_U_64_BIT@
 CC = @CC@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 COREFILE = @COREFILE@
 COREFLAG = @COREFLAG@
 EXEEXT = @EXEEXT@
@@ -86,6 +87,8 @@ DEP = mkdep
 
 SUBDIRS = doc
 
+docdir = doc
+
 lib_LTLIBRARIES = libbfd.la
 
 # bfd.h goes here, for now