From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 902C83858417; Thu, 10 Feb 2022 01:22:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 902C83858417 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] libgloss: merge doc into top-level Makefile X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 7517551007edda5b72cdab774abe0dcce835a9b9 X-Git-Newrev: 492e5fe8b0863e15ffd5a269e42b60fabfc5f5db Message-Id: <20220210012207.902C83858417@sourceware.org> Date: Thu, 10 Feb 2022 01:22:07 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Feb 2022 01:22:07 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D492e5fe8b08= 63e15ffd5a269e42b60fabfc5f5db commit 492e5fe8b0863e15ffd5a269e42b60fabfc5f5db Author: Mike Frysinger Date: Tue Feb 1 23:46:57 2022 -0500 libgloss: merge doc into top-level Makefile =20 Avoid a recursive make with this tiny subdir to speed things up a bit. Diff: --- libgloss/Makefile.am | 7 + libgloss/Makefile.in | 403 ++++++++++++++++++++++++++++++++++++++++--= ---- libgloss/configure | 22 ++- libgloss/configure.ac | 7 +- libgloss/doc/Makefile.in | 175 -------------------- libgloss/doc/Makefile.inc | 1 + 6 files changed, 388 insertions(+), 227 deletions(-) diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am index 0779da76d..81ba50a70 100644 --- a/libgloss/Makefile.am +++ b/libgloss/Makefile.am @@ -3,6 +3,7 @@ ACLOCAL_AMFLAGS =3D -I . -I .. -I ../config =20 # Variables that will accumulate in subdirs. +info_TEXINFOS =3D PHONY =3D =20 SUBDIRS =3D @subdirs@ . @@ -36,3 +37,9 @@ FLAGS_TO_PASS =3D \ "DESTDIR=3D$(DESTDIR)" =20 include $(top_srcdir)/../multilib.am + +TEXINFO_TEX =3D ../texinfo/texinfo.tex + +if HAVE_DOC +include doc/Makefile.inc +endif diff --git a/libgloss/Makefile.in b/libgloss/Makefile.in index b5579104d..f4494ee9b 100644 --- a/libgloss/Makefile.in +++ b/libgloss/Makefile.in @@ -88,6 +88,7 @@ POST_UNINSTALL =3D : build_triplet =3D @build@ host_triplet =3D @host@ target_triplet =3D @target@ +@HAVE_DOC_TRUE@am__append_1 =3D doc/porting.texi subdir =3D . ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps =3D $(top_srcdir)/../config/depstand.m4 \ @@ -103,13 +104,13 @@ am__CONFIG_DISTCLEAN_FILES =3D config.status config.c= ache config.log \ configure.lineno config.status.lineno mkinstalldirs =3D $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER =3D config.h -CONFIG_CLEAN_FILES =3D doc/Makefile arc/Makefile epiphany/Makefile \ - m32r/Makefile m68hc11/Makefile nds32/Makefile pa/Makefile \ - i960/Makefile sparc_leon/Makefile riscv/Makefile \ - rs6000/Makefile bfin/Makefile cr16/Makefile cris/Makefile \ - crx/Makefile d30v/Makefile fr30/Makefile frv/Makefile \ - ft32/Makefile lm32/Makefile mep/Makefile microblaze/Makefile \ - mt/Makefile v850/Makefile visium/Makefile xc16x/Makefile \ +CONFIG_CLEAN_FILES =3D arc/Makefile epiphany/Makefile m32r/Makefile \ + m68hc11/Makefile nds32/Makefile pa/Makefile i960/Makefile \ + sparc_leon/Makefile riscv/Makefile rs6000/Makefile \ + bfin/Makefile cr16/Makefile cris/Makefile crx/Makefile \ + d30v/Makefile fr30/Makefile frv/Makefile ft32/Makefile \ + lm32/Makefile mep/Makefile microblaze/Makefile mt/Makefile \ + v850/Makefile visium/Makefile xc16x/Makefile \ xstormy16/Makefile m32c/Makefile msp430/Makefile rl78/Makefile \ rx/Makefile spu/Makefile tic6x/Makefile iq2000/Makefile \ or1k/Makefile pru/Makefile nios2/Makefile libnosys/Makefile @@ -127,6 +128,47 @@ am__v_at_ =3D $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 =3D @ am__v_at_1 =3D=20 SOURCES =3D +AM_V_DVIPS =3D $(am__v_DVIPS_@AM_V@) +am__v_DVIPS_ =3D $(am__v_DVIPS_@AM_DEFAULT_V@) +am__v_DVIPS_0 =3D @echo " DVIPS " $@; +am__v_DVIPS_1 =3D=20 +AM_V_MAKEINFO =3D $(am__v_MAKEINFO_@AM_V@) +am__v_MAKEINFO_ =3D $(am__v_MAKEINFO_@AM_DEFAULT_V@) +am__v_MAKEINFO_0 =3D @echo " MAKEINFO" $@; +am__v_MAKEINFO_1 =3D=20 +AM_V_INFOHTML =3D $(am__v_INFOHTML_@AM_V@) +am__v_INFOHTML_ =3D $(am__v_INFOHTML_@AM_DEFAULT_V@) +am__v_INFOHTML_0 =3D @echo " INFOHTML" $@; +am__v_INFOHTML_1 =3D=20 +AM_V_TEXI2DVI =3D $(am__v_TEXI2DVI_@AM_V@) +am__v_TEXI2DVI_ =3D $(am__v_TEXI2DVI_@AM_DEFAULT_V@) +am__v_TEXI2DVI_0 =3D @echo " TEXI2DVI" $@; +am__v_TEXI2DVI_1 =3D=20 +AM_V_TEXI2PDF =3D $(am__v_TEXI2PDF_@AM_V@) +am__v_TEXI2PDF_ =3D $(am__v_TEXI2PDF_@AM_DEFAULT_V@) +am__v_TEXI2PDF_0 =3D @echo " TEXI2PDF" $@; +am__v_TEXI2PDF_1 =3D=20 +AM_V_texinfo =3D $(am__v_texinfo_@AM_V@) +am__v_texinfo_ =3D $(am__v_texinfo_@AM_DEFAULT_V@) +am__v_texinfo_0 =3D -q +am__v_texinfo_1 =3D=20 +AM_V_texidevnull =3D $(am__v_texidevnull_@AM_V@) +am__v_texidevnull_ =3D $(am__v_texidevnull_@AM_DEFAULT_V@) +am__v_texidevnull_0 =3D > /dev/null +am__v_texidevnull_1 =3D=20 +am__dirstamp =3D $(am__leading_dot)dirstamp +INFO_DEPS =3D $(srcdir)/doc/porting.info +am__TEXINFO_TEX_DIR =3D $(srcdir)/../texinfo +DVIS =3D doc/porting.dvi +PDFS =3D doc/porting.pdf +PSS =3D doc/porting.ps +HTMLS =3D doc/porting.html +TEXINFOS =3D $(am__append_1) +TEXI2DVI =3D texi2dvi +TEXI2PDF =3D $(TEXI2DVI) --pdf --batch +MAKEINFOHTML =3D $(MAKEINFO) --html +AM_MAKEINFOHTMLFLAGS =3D $(AM_MAKEINFOFLAGS) +DVIPS =3D dvips RECURSIVE_TARGETS =3D all-recursive check-recursive cscopelist-recursive \ ctags-recursive dvi-recursive html-recursive info-recursive \ install-data-recursive install-dvi-recursive \ @@ -140,6 +182,34 @@ am__can_run_installinfo =3D \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__installdirs =3D "$(DESTDIR)$(infodir)" +am__vpath_adj_setup =3D srcdirstrip=3D`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj =3D case $$p in \ + $(srcdir)/*) f=3D`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=3D$$p;; \ + esac; +am__strip_dir =3D f=3D`echo $$p | sed -e 's|^.*/||'`; +am__install_max =3D 40 +am__nobase_strip_setup =3D \ + srcdirstrip=3D`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip =3D \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list =3D $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' |= \ + $(AWK) 'BEGIN { files["."] =3D "" } { files[$$2] =3D files[$$2] " " $$1;= \ + if (++n[$$2] =3D=3D $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] =3D 0; files[$$2] =3D "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list =3D \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir =3D { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } RECURSIVE_CLEAN_TARGETS =3D mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets =3D \ @@ -280,6 +350,7 @@ top_srcdir =3D @top_srcdir@ ACLOCAL_AMFLAGS =3D -I . -I .. -I ../config =20 # Variables that will accumulate in subdirs. +info_TEXINFOS =3D $(am__append_1) PHONY =3D=20 SUBDIRS =3D @subdirs@ . tooldir =3D $(exec_prefix)/$(target_alias) @@ -313,13 +384,15 @@ MULTIDIRS =3D MULTISUBDIR =3D=20 MULTIDO =3D true MULTICLEAN =3D true +TEXINFO_TEX =3D ../texinfo/texinfo.tex all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive =20 .SUFFIXES: +.SUFFIXES: .dvi .ps am--refresh: Makefile @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/../multilib.am= $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/../multilib.am= $(srcdir)/doc/Makefile.inc $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -341,7 +414,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.= status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfil= es_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_mayb= e);; \ esac; -$(top_srcdir)/../multilib.am $(am__empty): +$(top_srcdir)/../multilib.am $(srcdir)/doc/Makefile.inc $(am__empty): =20 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEP= ENDENCIES) $(SHELL) ./config.status --recheck @@ -366,8 +439,6 @@ $(srcdir)/config.h.in: $(am__configure_deps) =20 distclean-hdr: -rm -f config.h stamp-h1 -doc/Makefile: $(top_builddir)/config.status $(top_srcdir)/doc/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ arc/Makefile: $(top_builddir)/config.status $(top_srcdir)/arc/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ epiphany/Makefile: $(top_builddir)/config.status $(top_srcdir)/epiphany/Ma= kefile.in @@ -442,6 +513,146 @@ nios2/Makefile: $(top_builddir)/config.status $(top_s= rcdir)/nios2/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ libnosys/Makefile: $(top_builddir)/config.status $(top_srcdir)/libnosys/Ma= kefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ +doc/$(am__dirstamp): + @$(MKDIR_P) doc + @: > doc/$(am__dirstamp) + +$(srcdir)/doc/porting.info: doc/porting.texi=20 + $(AM_V_MAKEINFO)restore=3D: && backupdir=3D"$(am__leading_dot)am$$$$" && \ + am__cwd=3D`pwd` && $(am__cd) $(srcdir) && \ + rm -rf $$backupdir && mkdir $$backupdir && \ + if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ + for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=3D).i[0-9] $(@:.info=3D).i= [0-9][0-9]; do \ + if test -f $$f; then mv $$f $$backupdir; restore=3Dmv; else :; fi; \ + done; \ + else :; fi && \ + cd "$$am__cwd"; \ + if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/d= oc \ + -o $@ $(srcdir)/doc/porting.texi; \ + then \ + rc=3D0; \ + $(am__cd) $(srcdir); \ + else \ + rc=3D$$?; \ + $(am__cd) $(srcdir) && \ + $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ + fi; \ + rm -rf $$backupdir; exit $$rc + +doc/porting.dvi: doc/porting.texi doc/$(am__dirstamp) + $(AM_V_TEXI2DVI)TEXINPUTS=3D"$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEX= INPUTS" \ + MAKEINFO=3D'$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(= srcdir)/doc' \ + $(TEXI2DVI) $(AM_V_texinfo) --build-dir=3D$(@:.dvi=3D.t2d) -o $@ $(AM_V_t= exidevnull) \ + `test -f 'doc/porting.texi' || echo '$(srcdir)/'`doc/porting.texi + +doc/porting.pdf: doc/porting.texi doc/$(am__dirstamp) + $(AM_V_TEXI2PDF)TEXINPUTS=3D"$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEX= INPUTS" \ + MAKEINFO=3D'$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(= srcdir)/doc' \ + $(TEXI2PDF) $(AM_V_texinfo) --build-dir=3D$(@:.pdf=3D.t2p) -o $@ $(AM_V_t= exidevnull) \ + `test -f 'doc/porting.texi' || echo '$(srcdir)/'`doc/porting.texi + +doc/porting.html: doc/porting.texi doc/$(am__dirstamp) + $(AM_V_MAKEINFO)rm -rf $(@:.html=3D.htp) + $(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I = doc -I $(srcdir)/doc \ + -o $(@:.html=3D.htp) `test -f 'doc/porting.texi' || echo '$(srcdir)/'`do= c/porting.texi; \ + then \ + rm -rf $@ && mv $(@:.html=3D.htp) $@; \ + else \ + rm -rf $(@:.html=3D.htp); exit 1; \ + fi +.dvi.ps: + $(AM_V_DVIPS)TEXINPUTS=3D"$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINP= UTS" \ + $(DVIPS) $(AM_V_texinfo) -o $@ $< + +uninstall-dvi-am: + @$(NORMAL_UNINSTALL) + @list=3D'$(DVIS)'; test -n "$(dvidir)" || list=3D; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \ + rm -f "$(DESTDIR)$(dvidir)/$$f"; \ + done + +uninstall-html-am: + @$(NORMAL_UNINSTALL) + @list=3D'$(HTMLS)'; test -n "$(htmldir)" || list=3D; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \ + rm -rf "$(DESTDIR)$(htmldir)/$$f"; \ + done + +uninstall-info-am: + @$(PRE_UNINSTALL) + @if test -d '$(DESTDIR)$(infodir)' && $(am__can_run_installinfo); then \ + list=3D'$(INFO_DEPS)'; \ + for file in $$list; do \ + relfile=3D`echo "$$file" | sed 's|^.*/||'`; \ + echo " install-info --info-dir=3D'$(DESTDIR)$(infodir)' --remove '$(D= ESTDIR)$(infodir)/$$relfile'"; \ + if install-info --info-dir=3D"$(DESTDIR)$(infodir)" --remove "$(DESTD= IR)$(infodir)/$$relfile"; \ + then :; else test ! -f "$(DESTDIR)$(infodir)/$$relfile" || exit 1; fi= ; \ + done; \ + else :; fi + @$(NORMAL_UNINSTALL) + @list=3D'$(INFO_DEPS)'; \ + for file in $$list; do \ + relfile=3D`echo "$$file" | sed 's|^.*/||'`; \ + relfile_i=3D`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \ + (if test -d "$(DESTDIR)$(infodir)" && 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 + +uninstall-pdf-am: + @$(NORMAL_UNINSTALL) + @list=3D'$(PDFS)'; test -n "$(pdfdir)" || list=3D; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(pdfdir)/$$f"; \ + done + +uninstall-ps-am: + @$(NORMAL_UNINSTALL) + @list=3D'$(PSS)'; test -n "$(psdir)" || list=3D; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \ + rm -f "$(DESTDIR)$(psdir)/$$f"; \ + done + +dist-info: $(INFO_DEPS) + @srcdirstrip=3D`echo "$(srcdir)" | sed 's|.|.|g'`; \ + list=3D'$(INFO_DEPS)'; \ + for base in $$list; do \ + case $$base in \ + $(srcdir)/*) base=3D`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \ + esac; \ + if test -f $$base; then d=3D.; else d=3D$(srcdir); fi; \ + base_i=3D`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \ + for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$bas= e_i[0-9] $$d/$$base_i[0-9][0-9]; do \ + if test -f $$file; then \ + relfile=3D`expr "$$file" : "$$d/\(.*\)"`; \ + test -f "$(distdir)/$$relfile" || \ + cp -p $$file "$(distdir)/$$relfile"; \ + else :; fi; \ + done; \ + done + +mostlyclean-aminfo: + -rm -rf doc/porting.t2d doc/porting.t2p + +clean-aminfo: + -test -z "doc/porting.dvi doc/porting.pdf doc/porting.ps doc/porting.html= " \ + || rm -rf doc/porting.dvi doc/porting.pdf doc/porting.ps doc/porting.html + +maintainer-clean-aminfo: + @list=3D'$(INFO_DEPS)'; for i in $$list; do \ + i_i=3D`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 =20 # This directory's subdirectories are mostly independent; you can cd # into them and run 'make' without going through this Makefile. @@ -550,9 +761,12 @@ distclean-tags: -rm -f cscope.out cscope.in.out cscope.po.out cscope.files check-am: all-am check: check-recursive -all-am: Makefile config.h all-local +all-am: Makefile $(INFO_DEPS) config.h all-local 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 @@ -579,13 +793,14 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . =3D "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f= $(CONFIG_CLEAN_VPATH_FILES) + -rm -f doc/$(am__dirstamp) =20 maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." clean: clean-recursive =20 -clean-am: clean-generic clean-local mostlyclean-am +clean-am: clean-aminfo clean-generic clean-local mostlyclean-am =20 distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -595,81 +810,177 @@ distclean-am: clean-am distclean-generic distclean-h= dr distclean-local \ =20 dvi: dvi-recursive =20 -dvi-am: +dvi-am: $(DVIS) =20 html: html-recursive =20 -html-am: +html-am: $(HTMLS) =20 info: info-recursive =20 -info-am: +info-am: $(INFO_DEPS) =20 -install-data-am: +install-data-am: install-info-am =20 install-dvi: install-dvi-recursive =20 -install-dvi-am: - +install-dvi-am: $(DVIS) + @$(NORMAL_INSTALL) + @list=3D'$(DVIS)'; test -n "$(dvidir)" || list=3D; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(dvidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(dvidir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \ + done install-exec-am: install-exec-local =20 install-html: install-html-recursive =20 -install-html-am: - +install-html-am: $(HTMLS) + @$(NORMAL_INSTALL) + @list=3D'$(HTMLS)'; list2=3D; test -n "$(htmldir)" || list=3D; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p" || test -d "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi= ; \ + $(am__strip_dir) \ + d2=3D$$d$$p; \ + if test -d "$$d2"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \ + $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ + echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \ + $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ + else \ + list2=3D"$$list2 $$d2"; \ + fi; \ + done; \ + test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \ + done; } install-info: install-info-recursive =20 -install-info-am: - +install-info-am: $(INFO_DEPS) + @$(NORMAL_INSTALL) + @srcdirstrip=3D`echo "$(srcdir)" | sed 's|.|.|g'`; \ + list=3D'$(INFO_DEPS)'; test -n "$(infodir)" || list=3D; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(infodir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(infodir)" || exit 1; \ + fi; \ + for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=3D`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + esac; \ + if test -f $$file; then d=3D.; else d=3D$(srcdir); fi; \ + file_i=3D`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 \ + echo "$$ifile"; \ + else : ; fi; \ + done; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done + @$(POST_INSTALL) + @if $(am__can_run_installinfo); then \ + list=3D'$(INFO_DEPS)'; test -n "$(infodir)" || list=3D; \ + for file in $$list; do \ + relfile=3D`echo "$$file" | sed 's|^.*/||'`; \ + echo " install-info --info-dir=3D'$(DESTDIR)$(infodir)' '$(DESTDIR)$(= infodir)/$$relfile'";\ + install-info --info-dir=3D"$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir= )/$$relfile" || :;\ + done; \ + else : ; fi install-man: =20 install-pdf: install-pdf-recursive =20 -install-pdf-am: - +install-pdf-am: $(PDFS) + @$(NORMAL_INSTALL) + @list=3D'$(PDFS)'; test -n "$(pdfdir)" || list=3D; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pdfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pdfdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done install-ps: install-ps-recursive =20 -install-ps-am: - +install-ps-am: $(PSS) + @$(NORMAL_INSTALL) + @list=3D'$(PSS)'; test -n "$(psdir)" || list=3D; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(psdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(psdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done installcheck-am: =20 maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic \ - maintainer-clean-local +maintainer-clean-am: distclean-am maintainer-clean-aminfo \ + maintainer-clean-generic maintainer-clean-local =20 mostlyclean: mostlyclean-recursive =20 -mostlyclean-am: mostlyclean-generic mostlyclean-local +mostlyclean-am: mostlyclean-aminfo mostlyclean-generic \ + mostlyclean-local =20 pdf: pdf-recursive =20 -pdf-am: +pdf-am: $(PDFS) =20 ps: ps-recursive =20 -ps-am: +ps-am: $(PSS) =20 -uninstall-am: +uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \ + uninstall-pdf-am uninstall-ps-am =20 .MAKE: $(am__recursive_targets) all install-am install-strip =20 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \ - am--refresh check check-am clean clean-cscope clean-generic \ - clean-local cscope cscopelist-am ctags ctags-am distclean \ - distclean-generic distclean-hdr distclean-local distclean-tags \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-exec-local install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-local pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am + am--refresh check check-am clean clean-aminfo clean-cscope \ + clean-generic clean-local cscope cscopelist-am ctags ctags-am \ + dist-info distclean distclean-generic distclean-hdr \ + distclean-local distclean-tags dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-exec-local install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-aminfo maintainer-clean-generic \ + maintainer-clean-local mostlyclean mostlyclean-aminfo \ + mostlyclean-generic mostlyclean-local pdf pdf-am ps ps-am tags \ + tags-am uninstall uninstall-am uninstall-dvi-am \ + uninstall-html-am uninstall-info-am uninstall-pdf-am \ + uninstall-ps-am =20 .PRECIOUS: Makefile =20 diff --git a/libgloss/configure b/libgloss/configure index 4349cbf0e..a3c8c4e73 100755 --- a/libgloss/configure +++ b/libgloss/configure @@ -615,6 +615,8 @@ am__include DEPDIR CC subdirs +HAVE_DOC_FALSE +HAVE_DOC_TRUE AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V @@ -2630,13 +2632,22 @@ fi AM_BACKSLASH=3D'\' =20 =20 -if test -z "${with_multisubdir}" ; then - ac_config_files=3D"$ac_config_files doc/Makefile" - +if test -z "${with_multisubdir}"; then + have_multisubdir=3Dno +else + have_multisubdir=3Dyes +fi + if test x$have_multisubdir =3D xno; then + HAVE_DOC_TRUE=3D + HAVE_DOC_FALSE=3D'#' +else + HAVE_DOC_TRUE=3D'#' + HAVE_DOC_FALSE=3D fi =20 =20 =20 + config_testsuite=3Dtrue =20 config_libnosys=3Dtrue @@ -5001,6 +5012,10 @@ else am__EXEEXT_FALSE=3D fi =20 +if test -z "${HAVE_DOC_TRUE}" && test -z "${HAVE_DOC_FALSE}"; then + as_fn_error $? "conditional \"HAVE_DOC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -5621,7 +5636,6 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "config.h") CONFIG_HEADERS=3D"$CONFIG_HEADERS config.h" ;; - "doc/Makefile") CONFIG_FILES=3D"$CONFIG_FILES doc/Makefile" ;; "arc/Makefile") CONFIG_FILES=3D"$CONFIG_FILES arc/Makefile" ;; "epiphany/Makefile") CONFIG_FILES=3D"$CONFIG_FILES epiphany/Makefile" = ;; "m32r/Makefile") CONFIG_FILES=3D"$CONFIG_FILES m32r/Makefile" ;; diff --git a/libgloss/configure.ac b/libgloss/configure.ac index e5fd07fa7..7c50e73bd 100644 --- a/libgloss/configure.ac +++ b/libgloss/configure.ac @@ -14,9 +14,12 @@ AC_CANONICAL_SYSTEM AM_INIT_AUTOMAKE([foreign no-dist no-define subdir-objects 1.15.1]) AM_SILENT_RULES(yes) =20 -if test -z "${with_multisubdir}" ; then - AC_CONFIG_FILES([doc/Makefile]) +if test -z "${with_multisubdir}"; then + have_multisubdir=3Dno +else + have_multisubdir=3Dyes fi +AM_CONDITIONAL(HAVE_DOC, test x$have_multisubdir =3D xno) =20 AC_NO_EXECUTABLES =20 diff --git a/libgloss/doc/Makefile.in b/libgloss/doc/Makefile.in deleted file mode 100644 index ccd81881f..000000000 --- a/libgloss/doc/Makefile.in +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright (c) 1995, 1996 Cygnus Support -# -# The authors hereby grant permission to use, copy, modify, distribute, -# and license this software and its documentation for any purpose, provided -# that existing copyright notices are retained in all copies and that this -# notice is included verbatim in any distributions. No written agreement, -# license, or royalty fee is required for any of the authorized uses. -# Modifications to this software may be copyrighted by their authors -# and need not follow the licensing terms described here, provided that -# the new terms are clearly indicated on the first page of each file where -# they apply. -# - -DESTDIR =3D -srcdir =3D @srcdir@ -VPATH =3D @srcdir@ - -prefix =3D @prefix@ -exec_prefix =3D @exec_prefix@ -datarootdir =3D @datarootdir@ - -mandir =3D @mandir@ -man1dir =3D $(mandir)/man1 -infodir =3D @infodir@ -htmldir =3D @htmldir@ -pdfdir =3D @pdfdir@ - -MAKEINFO =3D makeinfo -TEXI2DVI =3D TEXINPUTS=3D$(TEXIDIR):$(srcdir):$$TEXINPUTS texi2dvi - -INSTALL =3D @INSTALL@ -INSTALL_PROGRAM =3D @INSTALL_PROGRAM@ -INSTALL_DATA =3D @INSTALL_DATA@ - -# Where to find texinfo.tex to format docn with TeX -TEXIDIR =3D $(srcdir)/../../texinfo - -MANPAGES =3D - -all: - -info: porting.info=20 - -html: porting.html - -dvi: porting.dvi=20 - -pdf: porting.pdf - -ps: porting.ps=20 - -doc: info dvi - -porting: porting.dvi porting.info - -###################################################################### -# DOCUMENTATION TARGETS -# TeX output -porting.dvi: $(srcdir)/porting.texi $(srcdir)/porting.texi - $(TEXI2DVI) $(srcdir)/porting.texi - -porting.pdf: $(srcdir)/porting.texi $(srcdir)/porting.texi - $(TEXI2DVI) --pdf $(srcdir)/porting.texi - -# info file for online browsing -porting.info: $(srcdir)/porting.texi $(srcdir)/porting.texi - $(MAKEINFO) -I $(srcdir) -o porting.info $(srcdir)/porting.texi - -porting.html: $(srcdir)/porting.texi $(srcdir)/porting.texi - $(MAKEINFO) --html -I $(srcdir) -o porting.html $(srcdir)/porting.texi - -porting.ps: porting.dvi - dvips -f porting.dvi > porting.ps - -# different targets for -ms, -mm, -me -# Try to use a recent texi2roff. v2 was put on prep in jan91. -# If you want an index, see texi2roff doc for postprocessing=20 -# and add -i to texi2roff invocations below. -# Workarounds for texi2roff-2 (probably fixed in later texi2roff's, delete -# correspondint -e lines when later texi2roff's are current) -# + @ifinfo's deleted explicitly due to texi2roff-2 bug w nested construct= s. -# + @c's deleted explicitly because texi2roff sees texinfo commands in them -# + @ (that's at-BLANK) not recognized by texi2roff, turned into blank -# + @alphaenumerate is ridiculously new, turned into @enumerate - -# roff output (-ms) -porting.ms: $(srcdir)/porting.texi - sed -e '/\\input texinfo/d' \ - -e '/@c TEXI2ROFF-KILL/,/@c END TEXI2ROFF-KILL/d' \ - -e '/^@ifinfo/,/^@end ifinfo/d' \ - -e '/^@c/d' \ - -e 's/{.*,,/{/' \ - -e 's/@ / /g' \ - -e 's/^@alphaenumerate/@enumerate/g' \ - -e 's/^@end alphaenumerate/@end enumerate/g' \ - $(srcdir)/porting.texi | \ - $(TEXI2ROFF) -ms | \ - sed -e 's/---/\\(em/g' \ - >porting.ms=20 - -# roff output (-mm) -# '@noindent's removed due to texi2roff-2 mm bug; if yours is newer,=20 -# try leaving them in -porting.mm: $(srcdir)/porting.texi - sed -e '/\\input texinfo/d' \ - -e '/@c TEXI2ROFF-KILL/,/@c END TEXI2ROFF-KILL/d' \ - -e '/^@ifinfo/,/^@end ifinfo/d' \ - -e '/^@c/d' \ - -e 's/{.*,,/{/' \ - -e '/@noindent/d' \ - -e 's/@ / /g' \ - -e 's/^@alphaenumerate/@enumerate/g' \ - -e 's/^@end alphaenumerate/@end enumerate/g' \ - $(srcdir)/porting.texi | \ - $(TEXI2ROFF) -mm | \ - sed -e 's/---/\\(em/g' \ - >porting.mm - -# roff output (-me) -porting.me: $(srcdir)/porting.texi - sed -e '/\\input texinfo/d' \ - -e '/@c TEXI2ROFF-KILL/,/@c END TEXI2ROFF-KILL/d' \ - -e '/^@ifinfo/,/^@end ifinfo/d' \ - -e '/^@c/d' \ - -e 's/{.*,,/{/' \ - -e 's/@ / /g' \ - -e 's/^@alphaenumerate/@enumerate/g' \ - -e 's/^@end alphaenumerate/@end enumerate/g' \ - $(srcdir)/porting.texi | \ - $(TEXI2ROFF) -me | \ - sed -e 's/---/\\(em/g' \ - >porting.me=20 - - -###################################################################### - -clean mostlyclean: - -rm -f *.o *~ \#* core *.aux *.cp *.dvi *.fn *.ky *.log *.pg *.toc \ - *.tp *.vr *.cps *.fns *.kys *.pgs *.tps *.vrs *.info* *.1 *.ps - -maintainer-clean realclean: clean - -rm -f=20 - -install:=20 - -install-info: info - for i in *.info* ; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \ - done - -install-pdf: pdf - for i in *.pdf ; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(pdfdir)/$$i ; \ - done - -install-html: html - for i in *.html ; do \ - if [ -d $$i ]; then \ - mkdir -p $(DESTDIR)$(htmldir)/$$i ; \ - for j in $$i/*.html ; do \ - $(INSTALL_DATA) $$j $(DESTDIR)$(htmldir)/$$j ; \ - done \ - else \ - $(INSTALL_DATA) $$i $(DESTDIR)$(htmldir)/$$i ; \ - fi ; \ - done - -clean-info: - -rm -rf *.info* - -distclean: clean - -rm -f Makefile - -Makefile: Makefile.in ../config.status=20 - cd .. && $(SHELL) config.status diff --git a/libgloss/doc/Makefile.inc b/libgloss/doc/Makefile.inc new file mode 100644 index 000000000..fa5e30fbf --- /dev/null +++ b/libgloss/doc/Makefile.inc @@ -0,0 +1 @@ +info_TEXINFOS +=3D %D%/porting.texi