Merge commit 'upstream/2.20'

[msp430-binutils.git] / bfd / doc / Makefile.am

diff --git a/bfd/doc/Makefile.am b/bfd/doc/Makefile.am
index 6ff434a6e7e67cd4bbb1260ef88240559bbb517b..7476ee5bab710b6b418072124b473cf0d340b247 100644 (file)
--- a/bfd/doc/Makefile.am
+++ b/bfd/doc/Makefile.am
@@ -56,18 +56,14 @@ bfd_TEXINFOS = $(DOCFILES) bfdsumm.texi
 
 MKDOC = chew$(EXEEXT_FOR_BUILD)
 
-INCLUDES = -I.. -I$(srcdir)/.. -I$(srcdir)/../../include \
+AM_CPPFLAGS = -I.. -I$(srcdir)/.. -I$(srcdir)/../../include \
        -I$(srcdir)/../../intl -I../../intl
 
 $(MKDOC): $(srcdir)/chew.c
-       $(CC_FOR_BUILD) -o chew.$$$$ $(srcdir)/chew.c \
-         $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(H_CFLAGS) \
-         $(INCLUDES); \
+       $(CC_FOR_BUILD) -o chew.$$$$ $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \
+         $(H_CFLAGS) $(AM_CPPFLAGS) $(srcdir)/chew.c; \
        $(SHELL) $(srcdir)/../../move-if-change chew.$$$$ $(MKDOC)
 
-chew.o: chew.c
-       $(CC_FOR_BUILD) -c $(INCLUDES) $(H_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/chew.c
-
 protos: libbfd.h libcoff.h bfd.h
 
 # We can't replace these rules with an implicit rule, because
@@ -253,6 +249,7 @@ BFD_H_DEP = \
        $(srcdir)/../format.c           \
        $(srcdir)/../linker.c           \
        $(srcdir)/../simple.c           \
+       $(srcdir)/../compress.c         \
        $(srcdir)/header.sed            \
        $(srcdir)/proto.str             \
        $(srcdir)/../version.h          \
@@ -299,27 +296,6 @@ MAINTAINERCLEANFILES = $(DOCFILES)
 # cygnus option.
 install: install-info
 
-html__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-
-install-html: install-html-am
-
-install-html-am: $(HTMLS)
-       @$(NORMAL_INSTALL)
-       test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
-       @list='$(HTMLS)'; for p in $$list; do \
-         if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \
-         f=$(html__strip_dir) \
-         if test -d "$$d$$p"; then \
-           echo " $(mkdir_p) '$(DESTDIR)$(htmldir)/$$f'"; \
-           $(mkdir_p) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
-           echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
-           $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
-         else \
-           echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
-           $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
-         fi; \
-       done
-
 MAINTAINERCLEANFILES += bfd.info
 
 # Automake 1.9 will only build info files in the objdir if they are