From c7afc98559704bccb7193d13505b326d4974bb2b Mon Sep 17 00:00:00 2001 From: Kelley Cook Date: Mon, 3 Nov 2003 13:21:00 +0000 Subject: [PATCH] Makefile.am (my_make_i_flags): Add $(srcdir) and update comment to match. 2003-10-30 Kelley Cook * Makefile.am (my_make_i_flags): Add $(srcdir) and update comment to match. (fastjar.info): Update target to write to build directory. (%.1): New implicit rule from a .pod file. (jar.1): Delete. (grepjar.1): Delete. (jar.pod): New intermediate rule. (grepjar.pod): Likewise. * Makefile.in: Regenerate. From-SVN: r73216 --- fastjar/ChangeLog | 12 ++++++++++++ fastjar/Makefile.am | 34 +++++++++++++++------------------- fastjar/Makefile.in | 34 ++++++++++++++++------------------ 3 files changed, 43 insertions(+), 37 deletions(-) diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog index 2653d1725e3..114b84fa992 100644 --- a/fastjar/ChangeLog +++ b/fastjar/ChangeLog @@ -1,3 +1,15 @@ +2003-10-30 Kelley Cook + + * Makefile.am (my_make_i_flags): Add $(srcdir) and update comment + to match. + (fastjar.info): Update target to write to build directory. + (%.1): New implicit rule from a .pod file. + (jar.1): Delete. + (grepjar.1): Delete. + (jar.pod): New intermediate rule. + (grepjar.pod): Likewise. + * Makefile.in: Regenerate. + 2003-08-13 Matthias Klose * fastjar.texi: License manual under the GPL. diff --git a/fastjar/Makefile.am b/fastjar/Makefile.am index fa31b9235fb..21629654f4c 100644 --- a/fastjar/Makefile.am +++ b/fastjar/Makefile.am @@ -70,28 +70,24 @@ EXTRA_DIST = $(man_MANS) ## available in 1.4. Nor can we override or append to MAKEINFO or ## MAKEINFOFLAGS, since these are overridden by the top-level ## Makefile. So, we just duplicate the rules. FIXME: remove this -## when we upgrade automake. Note that we don't include $(srcdir) in -## my_makei_flags; makeinfo is run in srcdir. -my_makei_flags += -I ../gcc/doc/include +## when we upgrade automake. +my_makei_flags += -I $(srcdir)/../gcc/doc/include fastjar.info: fastjar.texi $(fastjar_TEXINFOS) - @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] - cd $(srcdir) \ - && $(MAKEINFO) $(my_makei_flags) `echo $< | sed 's,.*/,,'` - + rm -f $@ $@-[0-9] $@-[0-9][0-9] + $(MAKEINFO) $(my_makei_flags) -o $@ $< TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@" -$(srcdir)/jar.1: $(srcdir)/fastjar.texi - -$(TEXI2POD) -D jar < $(srcdir)/fastjar.texi > fastjar.pod - -($(POD2MAN) --section=1 fastjar.pod > jar.1.T$$$$ && \ - mv -f jar.1.T$$$$ $(srcdir)/jar.1) || \ - (rm -f jar.1.T$$$$ && exit 1) - -rm -f fastjar.pod +%.1: %.pod + -($(POD2MAN) --section=1 $< > $(@).T$$$$ && \ + mv -f $(@).T$$$$ $@) || \ + (rm -f $(@).T$$$$ && exit 1) -$(srcdir)/grepjar.1: $(srcdir)/fastjar.texi - -$(TEXI2POD) -D grepjar < $(srcdir)/fastjar.texi > grepjar.pod - -($(POD2MAN) --section=1 grepjar.pod > grepjar.1.T$$$$ && \ - mv -f grepjar.1.T$$$$ $(srcdir)/grepjar.1) || \ - (rm -f grepjar.1.T$$$$ && exit 1) - -rm -f grepjar.pod +.INTERMEDIATE: jar.pod grepjar.pod + +jar.pod: $(srcdir)/fastjar.texi + -$(TEXI2POD) -D jar $< > $@ + +grepjar.pod: $(srcdir)/fastjar.texi + -$(TEXI2POD) -D grepjar $< > $@ diff --git a/fastjar/Makefile.in b/fastjar/Makefile.in index b79a3ade06e..ac27bc34c65 100644 --- a/fastjar/Makefile.in +++ b/fastjar/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -107,7 +107,7 @@ fastjar_TEXINFOS = ../gcc/doc/include/gcc-common.texi ../gcc/doc/include/gpl. man_MANS = jar.1 grepjar.1 EXTRA_DIST = $(man_MANS) -my_makei_flags = -I ../gcc/doc/include +my_makei_flags = -I $(srcdir)/../gcc/doc/include TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@" @@ -426,7 +426,7 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)) + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: @@ -570,23 +570,21 @@ mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean fastjar.info: fastjar.texi $(fastjar_TEXINFOS) - @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] - cd $(srcdir) \ - && $(MAKEINFO) $(my_makei_flags) `echo $< | sed 's,.*/,,'` + rm -f $@ $@-[0-9] $@-[0-9][0-9] + $(MAKEINFO) $(my_makei_flags) -o $@ $< -$(srcdir)/jar.1: $(srcdir)/fastjar.texi - -$(TEXI2POD) -D jar < $(srcdir)/fastjar.texi > fastjar.pod - -($(POD2MAN) --section=1 fastjar.pod > jar.1.T$$$$ && \ - mv -f jar.1.T$$$$ $(srcdir)/jar.1) || \ - (rm -f jar.1.T$$$$ && exit 1) - -rm -f fastjar.pod +%.1: %.pod + -($(POD2MAN) --section=1 $< > $(@).T$$$$ && \ + mv -f $(@).T$$$$ $@) || \ + (rm -f $(@).T$$$$ && exit 1) -$(srcdir)/grepjar.1: $(srcdir)/fastjar.texi - -$(TEXI2POD) -D grepjar < $(srcdir)/fastjar.texi > grepjar.pod - -($(POD2MAN) --section=1 grepjar.pod > grepjar.1.T$$$$ && \ - mv -f grepjar.1.T$$$$ $(srcdir)/grepjar.1) || \ - (rm -f grepjar.1.T$$$$ && exit 1) - -rm -f grepjar.pod +.INTERMEDIATE: jar.pod grepjar.pod + +jar.pod: $(srcdir)/fastjar.texi + -$(TEXI2POD) -D jar $< > $@ + +grepjar.pod: $(srcdir)/fastjar.texi + -$(TEXI2POD) -D grepjar $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded.