re PR libgcj/23498 (libgcj/classpath add two undesired info files: hacking.info,...
authorTom Tromey <tromey@redhat.com>
Mon, 22 Aug 2005 20:01:53 +0000 (20:01 +0000)
committerTom Tromey <tromey@gcc.gnu.org>
Mon, 22 Aug 2005 20:01:53 +0000 (20:01 +0000)
PR libgcj/23498:
* doc/Makefile.am (info_TEXINFOS): Commented out.
* doc/Makefile.in: Rebuilt.

From-SVN: r103353

libjava/classpath/ChangeLog.gcj
libjava/classpath/doc/Makefile.am
libjava/classpath/doc/Makefile.in

index b4de2bc..d75ec5e 100644 (file)
@@ -1,3 +1,9 @@
+2005-08-22  Tom Tromey  <tromey@redhat.com>
+
+       PR libgcj/23498:
+       * doc/Makefile.am (info_TEXINFOS): Commented out.
+       * doc/Makefile.in: Rebuilt.
+
 2005-08-11  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
        * lib/split-for-gcj.sh: Don't use unportable %{parameter%word}.
index 70100ce..f0be6c8 100644 (file)
@@ -2,7 +2,8 @@ SUBDIRS = api
 
 EXTRA_DIST = README.jaxp
 
-info_TEXINFOS = hacking.texinfo vmintegration.texinfo
+## GCJ LOCAL: we don't want to install Classpath's info files.
+## info_TEXINFOS = hacking.texinfo vmintegration.texinfo
 
 %.dvi : %.texinfo
        texi2dvi $<
index c8deb1f..255b2ac 100644 (file)
@@ -51,25 +51,12 @@ CONFIG_HEADER = $(top_builddir)/include/config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
-INFO_DEPS = $(srcdir)/hacking.info $(srcdir)/vmintegration.info
-am__TEXINFO_TEX_DIR = $(srcdir)
-DVIS = hacking.dvi vmintegration.dvi
-PDFS = hacking.pdf vmintegration.pdf
-PSS = hacking.ps vmintegration.ps
-HTMLS = hacking.html vmintegration.html
-TEXINFOS = hacking.texinfo vmintegration.texinfo
-TEXI2DVI = texi2dvi
-TEXI2PDF = $(TEXI2DVI) --pdf --batch
-MAKEINFOHTML = $(MAKEINFO) --html
-AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
-DVIPS = dvips
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
        html-recursive info-recursive install-data-recursive \
        install-exec-recursive install-info-recursive \
        install-recursive installcheck-recursive installdirs-recursive \
        pdf-recursive ps-recursive uninstall-info-recursive \
        uninstall-recursive
-am__installdirs = "$(DESTDIR)$(infodir)"
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -250,11 +237,9 @@ target_vendor = @target_vendor@
 vm_classes = @vm_classes@
 SUBDIRS = api
 EXTRA_DIST = README.jaxp
-info_TEXINFOS = hacking.texinfo vmintegration.texinfo
 all: all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .dvi .html .info .pdf .ps .texinfo
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
@@ -293,117 +278,7 @@ clean-libtool:
 
 distclean-libtool:
        -rm -f libtool
-
-.texinfo.info:
-       restore=: && backupdir="$(am__leading_dot)am$$$$" && \
-       am__cwd=`pwd` && cd $(srcdir) && \
-       rm -rf $$backupdir && mkdir $$backupdir && \
-       for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
-         if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
-       done; \
-       cd "$$am__cwd"; \
-       if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-        -o $@ $<; \
-       then \
-         rc=0; \
-         cd $(srcdir); \
-       else \
-         rc=$$?; \
-         cd $(srcdir) && \
-         $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
-       fi; \
-       rm -rf $$backupdir; exit $$rc
-
-.texinfo.dvi:
-       TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-       MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-       $(TEXI2DVI) $<
-
-.texinfo.pdf:
-       TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-       MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-       $(TEXI2PDF) $<
-
-.texinfo.html:
-       rm -rf $(@:.html=.htp)
-       if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-        -o $(@:.html=.htp) $<; \
-       then \
-         rm -rf $@; \
-         if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-           mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
-       else \
-         if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-           rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
-         exit 1; \
-       fi
-$(srcdir)/hacking.info: hacking.texinfo 
-hacking.dvi: hacking.texinfo 
-hacking.pdf: hacking.texinfo 
-hacking.html: hacking.texinfo 
-$(srcdir)/vmintegration.info: vmintegration.texinfo 
-vmintegration.dvi: vmintegration.texinfo 
-vmintegration.pdf: vmintegration.texinfo 
-vmintegration.html: vmintegration.texinfo 
-.dvi.ps:
-       $(DVIPS) -o $@ $<
-
 uninstall-info-am:
-       @$(PRE_UNINSTALL)
-       @if (install-info --version && \
-            install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
-         list='$(INFO_DEPS)'; \
-         for file in $$list; do \
-           relfile=`echo "$$file" | sed 's|^.*/||'`; \
-           echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \
-           install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \
-         done; \
-       else :; fi
-       @$(NORMAL_UNINSTALL)
-       @list='$(INFO_DEPS)'; \
-       for file in $$list; do \
-         relfile=`echo "$$file" | sed 's|^.*/||'`; \
-         relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
-         (if cd "$(DESTDIR)$(infodir)"; then \
-            echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
-            rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
-          else :; fi); \
-       done
-
-dist-info: $(INFO_DEPS)
-       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-       list='$(INFO_DEPS)'; \
-       for base in $$list; do \
-         case $$base in \
-           $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
-         esac; \
-         if test -f $$base; then d=.; else d=$(srcdir); fi; \
-         for file in $$d/$$base*; do \
-           relfile=`expr "$$file" : "$$d/\(.*\)"`; \
-           test -f $(distdir)/$$relfile || \
-             cp -p $$file $(distdir)/$$relfile; \
-         done; \
-       done
-
-mostlyclean-aminfo:
-       -rm -rf hacking.aux hacking.cp hacking.cps hacking.fn hacking.fns hacking.ky \
-         hacking.kys hacking.log hacking.pg hacking.pgs hacking.tmp \
-         hacking.toc hacking.tp hacking.tps hacking.vr hacking.vrs \
-         hacking.dvi hacking.pdf hacking.ps hacking.html \
-         vmintegration.aux vmintegration.cp vmintegration.cps \
-         vmintegration.fn vmintegration.fns vmintegration.ky \
-         vmintegration.kys vmintegration.log vmintegration.pg \
-         vmintegration.pgs vmintegration.tmp vmintegration.toc \
-         vmintegration.tp vmintegration.tps vmintegration.vr \
-         vmintegration.vrs vmintegration.dvi vmintegration.pdf \
-         vmintegration.ps vmintegration.html
-
-maintainer-clean-aminfo:
-       @list='$(INFO_DEPS)'; for i in $$list; do \
-         i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \
-         echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
-         rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
-       done
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -579,17 +454,11 @@ distdir: $(DISTFILES)
              || exit 1; \
          fi; \
        done
-       $(MAKE) $(AM_MAKEFLAGS) \
-         top_distdir="$(top_distdir)" distdir="$(distdir)" \
-         dist-info
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(INFO_DEPS)
+all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(infodir)"; do \
-         test -z "$$dir" || $(mkdir_p) "$$dir"; \
-       done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -625,73 +494,39 @@ distclean-am: clean-am distclean-generic distclean-libtool \
 
 dvi: dvi-recursive
 
-dvi-am: $(DVIS)
+dvi-am:
 
 html: html-recursive
 
-html-am: $(HTMLS)
-
 info: info-recursive
 
-info-am: $(INFO_DEPS)
+info-am:
 
-install-data-am: install-info-am
+install-data-am:
 
 install-exec-am:
 
 install-info: install-info-recursive
 
-install-info-am: $(INFO_DEPS)
-       @$(NORMAL_INSTALL)
-       test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)"
-       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-       list='$(INFO_DEPS)'; \
-       for file in $$list; do \
-         case $$file in \
-           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-         esac; \
-         if test -f $$file; then d=.; else d=$(srcdir); fi; \
-         file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
-         for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
-                       $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
-           if test -f $$ifile; then \
-             relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
-             echo " $(INSTALL_DATA) '$$ifile' '$(DESTDIR)$(infodir)/$$relfile'"; \
-             $(INSTALL_DATA) "$$ifile" "$(DESTDIR)$(infodir)/$$relfile"; \
-           else : ; fi; \
-         done; \
-       done
-       @$(POST_INSTALL)
-       @if (install-info --version && \
-            install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
-         list='$(INFO_DEPS)'; \
-         for file in $$list; do \
-           relfile=`echo "$$file" | sed 's|^.*/||'`; \
-           echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
-           install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
-         done; \
-       else : ; fi
 install-man:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-aminfo \
-       maintainer-clean-generic
+maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
-mostlyclean-am: mostlyclean-aminfo mostlyclean-generic \
-       mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
 pdf: pdf-recursive
 
-pdf-am: $(PDFS)
+pdf-am:
 
 ps: ps-recursive
 
-ps-am: $(PSS)
+ps-am:
 
 uninstall-am: uninstall-info-am
 
@@ -699,17 +534,16 @@ uninstall-info: uninstall-info-recursive
 
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
        clean clean-generic clean-libtool clean-recursive ctags \
-       ctags-recursive dist-info distclean distclean-generic \
-       distclean-libtool distclean-recursive distclean-tags distdir \
-       dvi dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-exec install-exec-am \
-       install-info install-info-am install-man install-strip \
-       installcheck installcheck-am installdirs installdirs-am \
-       maintainer-clean maintainer-clean-aminfo \
+       ctags-recursive distclean distclean-generic distclean-libtool \
+       distclean-recursive distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-data \
+       install-data-am install-exec install-exec-am install-info \
+       install-info-am install-man install-strip installcheck \
+       installcheck-am installdirs installdirs-am maintainer-clean \
        maintainer-clean-generic maintainer-clean-recursive \
-       mostlyclean mostlyclean-aminfo mostlyclean-generic \
-       mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-       tags tags-recursive uninstall uninstall-am uninstall-info-am
+       mostlyclean mostlyclean-generic mostlyclean-libtool \
+       mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+       uninstall uninstall-am uninstall-info-am
 
 
 %.dvi : %.texinfo