merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 5081525..ada1d12 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-10  Brooks Moses  <bmoses@stanford.edu>
+
+       * Makefile.in: Added "pdf", "libiberty.pdf" target support.
+       * testsuite/Makefile.in: Added empty "pdf" target.
+
 2006-09-22  Ian Lance Taylor  <ian@airs.com>
 
        PR other/29176

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index a579d79..6e02403 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -245,6 +245,7 @@ info: libiberty.info info-subdir
 install-info: install-info-subdir
 clean-info: clean-info-subdir
 dvi: libiberty.dvi dvi-subdir
+pdf: libiberty.pdf pdf-subdir
 
 # html, install-html targets
 HTMLS = libiberty.html
@@ -319,6 +320,9 @@ libiberty.info : $(srcdir)/libiberty.texi $(TEXISRC)
 libiberty.dvi : $(srcdir)/libiberty.texi $(TEXISRC)
        texi2dvi $(srcdir)/libiberty.texi
 
+libiberty.pdf : $(srcdir)/libiberty.texi $(TEXISRC)
+       texi2pdf $(srcdir)/libiberty.texi
+
 libiberty.html : $(srcdir)/libiberty.texi $(TEXISRC)
        $(MAKEINFO) --no-split --html -I$(srcdir) -o $@ $<
 
@@ -434,7 +438,7 @@ mostlyclean: mostlyclean-subdir
 clean: clean-subdir
        $(MAKE) SUBDIRS="" mostlyclean
        -rm -f *.a required-list tmpmulti.out
-       -rm -f libiberty.dvi libiberty.info* libiberty.html
+       -rm -f libiberty.dvi libiberty.pdf libiberty.info* libiberty.html
        @$(MULTICLEAN) multi-clean DO=clean
 distclean: distclean-subdir
        $(MAKE) SUBDIRS="" clean
@@ -463,7 +467,7 @@ config.status: $(srcdir)/configure
 # if needed.  This prevents problems with parallel builds, in case
 # subdirectories need to run config.status also.
 all-subdir check-subdir installcheck-subdir info-subdir        \
-install-info-subdir clean-info-subdir dvi-subdir install-subdir        \
+install-info-subdir clean-info-subdir dvi-subdir pdf-subdir install-subdir     \
 etags-subdir mostlyclean-subdir clean-subdir distclean-subdir \
 maintainer-clean-subdir: config.h
        @subdirs='$(SUBDIRS)'; \

diff --git a/libiberty/testsuite/Makefile.in b/libiberty/testsuite/Makefile.in
index 534626e..6979d94 100644 (file)
--- a/libiberty/testsuite/Makefile.in
+++ b/libiberty/testsuite/Makefile.in
@@ -73,7 +73,7 @@ test-expandargv: $(srcdir)/test-expandargv.c ../libiberty.a
                $(srcdir)/test-expandargv.c ../libiberty.a
 
 # Standard (either GNU or Cygnus) rules we don't use.
-html install-html info install-info clean-info dvi install etags tags installcheck:
+html install-html info install-info clean-info dvi pdf install etags tags installcheck:
 
 # The standard clean rules.
 mostlyclean: