From 761ffb30cd853c3e1951b976255601779871e474 Mon Sep 17 00:00:00 2001 From: doko Date: Wed, 11 Sep 2002 05:49:48 +0000 Subject: 2002-09-11 Matthias Klose * Makefile.am: Revert the previous patch. * Makefile.in: Regenerated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@57022 138bc75d-0d04-0410-961f-82ee72b054a4 --- fastjar/ChangeLog | 5 ++ fastjar/Makefile.am | 10 --- fastjar/Makefile.in | 220 +++++----------------------------------------------- 3 files changed, 26 insertions(+), 209 deletions(-) (limited to 'fastjar') diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog index 9963d77e64f..304bab02261 100644 --- a/fastjar/ChangeLog +++ b/fastjar/ChangeLog @@ -1,3 +1,8 @@ +2002-09-11 Matthias Klose + + * Makefile.am: Revert the previous patch. + * Makefile.in: Regenerated. + 2002-09-10 Matthias Klose * fastjar.texi: New. diff --git a/fastjar/Makefile.am b/fastjar/Makefile.am index b7c43c977df..238b51c2317 100644 --- a/fastjar/Makefile.am +++ b/fastjar/Makefile.am @@ -58,16 +58,6 @@ grepjar_DEPENDENCIES = $(ZDEPS) $(LIBIBERTY) AM_CFLAGS = @fastjar_warn_cflags@ -MAKEINFO += -I $(srcdir)/../gcc/doc/include -TEXINFO_TEX = $(srcdir)/../gcc/doc/include/texinfo.tex -info_TEXINFOS = fastjar.texi -fastjar_TEXINFOS = \ - $(srcdir)/../gcc/doc/include/gcc-common.texi \ - $(srcdir)/../gcc/doc/include/fdl.texi \ - $(srcdir)/../gcc/doc/include/gpl.texi -man_MANS = jar.1 grepjar.1 -EXTRA_DIST = $(man_MANS) - TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@" diff --git a/fastjar/Makefile.in b/fastjar/Makefile.in index e83f235604b..684d504af9e 100644 --- a/fastjar/Makefile.in +++ b/fastjar/Makefile.in @@ -64,6 +64,7 @@ CHMOD = @CHMOD@ CP = @CP@ EXEEXT = @EXEEXT@ MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ RM = @RM@ STRIP = @STRIP@ @@ -99,14 +100,6 @@ grepjar_DEPENDENCIES = $(ZDEPS) $(LIBIBERTY) AM_CFLAGS = @fastjar_warn_cflags@ -MAKEINFO = @MAKEINFO@ -I $(srcdir)/../gcc/doc/include -TEXINFO_TEX = $(srcdir)/../gcc/doc/include/texinfo.tex -info_TEXINFOS = fastjar.texi -fastjar_TEXINFOS = $(srcdir)/../gcc/doc/include/gcc-common.texi $(srcdir)/../gcc/doc/include/fdl.texi $(srcdir)/../gcc/doc/include/gpl.texi - -man_MANS = jar.1 grepjar.1 -EXTRA_DIST = $(man_MANS) - TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@" ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -129,18 +122,10 @@ CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -TEXI2DVI = texi2dvi -INFO_DEPS = fastjar.info -DVIS = fastjar.dvi -TEXINFOS = fastjar.texi -man1dir = $(mandir)/man1 -MANS = $(man_MANS) - -NROFF = nroff -DIST_COMMON = README $(fastjar_TEXINFOS) ./stamp-h.in AUTHORS COPYING \ -ChangeLog INSTALL Makefile.am Makefile.in NEWS acinclude.m4 aclocal.m4 \ -config.h.in configure configure.in install-defs.sh.in install-sh \ -missing mkinstalldirs +DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ +Makefile.am Makefile.in NEWS acinclude.m4 aclocal.m4 config.h.in \ +configure configure.in install-defs.sh.in install-sh missing \ +mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -152,7 +137,7 @@ OBJECTS = $(jar_OBJECTS) $(grepjar_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .dvi .info .o .ps .s .texi .texinfo .txi +.SUFFIXES: .S .c .o .s $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile @@ -250,162 +235,6 @@ grepjar$(EXEEXT): $(grepjar_OBJECTS) $(grepjar_DEPENDENCIES) @rm -f grepjar$(EXEEXT) $(LINK) $(grepjar_LDFLAGS) $(grepjar_OBJECTS) $(grepjar_LDADD) $(LIBS) -fastjar.info: fastjar.texi $(fastjar_TEXINFOS) -fastjar.dvi: fastjar.texi $(fastjar_TEXINFOS) - - -DVIPS = dvips - -.texi.info: - @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] - cd $(srcdir) \ - && $(MAKEINFO) `echo $< | sed 's,.*/,,'` - -.texi.dvi: - TEXINPUTS=$(srcdir)/$(srcdir)/../gcc/doc/include:$$TEXINPUTS \ - MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< - -.texi: - @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] - cd $(srcdir) \ - && $(MAKEINFO) `echo $< | sed 's,.*/,,'` - -.texinfo.info: - @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] - cd $(srcdir) \ - && $(MAKEINFO) `echo $< | sed 's,.*/,,'` - -.texinfo: - @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] - cd $(srcdir) \ - && $(MAKEINFO) `echo $< | sed 's,.*/,,'` - -.texinfo.dvi: - TEXINPUTS=$(srcdir)/$(srcdir)/../gcc/doc/include:$$TEXINPUTS \ - MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< - -.txi.info: - @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] - cd $(srcdir) \ - && $(MAKEINFO) `echo $< | sed 's,.*/,,'` - -.txi.dvi: - TEXINPUTS=$(srcdir)/$(srcdir)/../gcc/doc/include:$$TEXINPUTS \ - MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< - -.txi: - @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] - cd $(srcdir) \ - && $(MAKEINFO) `echo $< | sed 's,.*/,,'` -.dvi.ps: - $(DVIPS) $< -o $@ - -install-info-am: $(INFO_DEPS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(infodir) - @list='$(INFO_DEPS)'; \ - for file in $$list; do \ - d=$(srcdir); \ - for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \ - if test -f $$d/$$ifile; then \ - echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \ - $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \ - else : ; fi; \ - done; \ - done - @$(POST_INSTALL) - @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ - list='$(INFO_DEPS)'; \ - for file in $$list; do \ - echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\ - install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\ - done; \ - else : ; fi - -uninstall-info: - $(PRE_UNINSTALL) - @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ - ii=yes; \ - else ii=; fi; \ - list='$(INFO_DEPS)'; \ - for file in $$list; do \ - test -z "$$ii" \ - || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ - done - @$(NORMAL_UNINSTALL) - list='$(INFO_DEPS)'; \ - for file in $$list; do \ - (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \ - done - -dist-info: $(INFO_DEPS) - list='$(INFO_DEPS)'; \ - for base in $$list; do \ - d=$(srcdir); \ - for file in `cd $$d && eval echo $$base*`; do \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ - done; \ - done - -mostlyclean-aminfo: - -rm -f fastjar.aux fastjar.cp fastjar.cps fastjar.dvi fastjar.fn \ - fastjar.fns fastjar.ky fastjar.kys fastjar.ps fastjar.log \ - fastjar.pg fastjar.toc fastjar.tp fastjar.tps fastjar.vr \ - fastjar.vrs fastjar.op fastjar.tr fastjar.cv fastjar.cn - -clean-aminfo: - -distclean-aminfo: - -maintainer-clean-aminfo: - cd $(srcdir) && for i in $(INFO_DEPS); do \ - rm -f $$i; \ - if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \ - rm -f $$i-[0-9]*; \ - fi; \ - done - -install-man1: - $(mkinstalldirs) $(DESTDIR)$(man1dir) - @list='$(man1_MANS)'; \ - l2='$(man_MANS)'; for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ - done - -uninstall-man1: - @list='$(man1_MANS)'; \ - l2='$(man_MANS)'; for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ - rm -f $(DESTDIR)$(man1dir)/$$inst; \ - done -install-man: $(MANS) - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-man1 -uninstall-man: - @$(NORMAL_UNINSTALL) - $(MAKE) $(AM_MAKEFLAGS) uninstall-man1 - tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) @@ -483,10 +312,9 @@ distdir: $(DISTFILES) || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done - $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info -info-am: $(INFO_DEPS) +info-am: info: info-am -dvi-am: $(DVIS) +dvi-am: dvi: dvi-am check-am: all-am check: check-am @@ -498,21 +326,20 @@ all-recursive-am: config.h install-exec-am: install-binPROGRAMS install-exec: install-exec-am -install-data-am: install-info-am install-man +install-data-am: install-data: install-data-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: uninstall-binPROGRAMS uninstall-info uninstall-man +uninstall-am: uninstall-binPROGRAMS uninstall: uninstall-am -all-am: Makefile $(INFO_DEPS) $(PROGRAMS) $(MANS) config.h +all-am: Makefile $(PROGRAMS) config.h all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(infodir) \ - $(DESTDIR)$(mandir)/man1 + $(mkinstalldirs) $(DESTDIR)$(bindir) mostlyclean-generic: @@ -525,27 +352,25 @@ distclean-generic: maintainer-clean-generic: mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \ - mostlyclean-compile mostlyclean-aminfo mostlyclean-tags \ + mostlyclean-compile mostlyclean-tags \ mostlyclean-generic mostlyclean: mostlyclean-am -clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-aminfo \ - clean-tags clean-generic mostlyclean-am +clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-tags \ + clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \ - distclean-aminfo distclean-tags distclean-generic \ - clean-am + distclean-tags distclean-generic clean-am distclean: distclean-am -rm -f config.status maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \ - maintainer-clean-compile maintainer-clean-aminfo \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am + maintainer-clean-compile maintainer-clean-tags \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -556,12 +381,9 @@ maintainer-clean: maintainer-clean-am mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile install-info-am uninstall-info \ -mostlyclean-aminfo distclean-aminfo clean-aminfo \ -maintainer-clean-aminfo install-man1 uninstall-man1 install-man \ -uninstall-man tags mostlyclean-tags distclean-tags clean-tags \ -maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck all-recursive-am install-exec-am \ +maintainer-clean-compile tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ +check-am installcheck-am installcheck all-recursive-am install-exec-am \ install-exec install-data-am install-data install-am install \ uninstall-am uninstall all-redirect all-am all installdirs \ mostlyclean-generic distclean-generic clean-generic \ -- cgit v1.2.1