From bd4e926677c6c1020e6c40e712e9dc0d2a09afe2 Mon Sep 17 00:00:00 2001 From: Kelley Cook Date: Mon, 5 Jul 2004 17:40:38 +0000 Subject: [PATCH] Makefile.am: Silence two automake warnings. 2004-07-05 Kelley Cook * Makefile.am: Silence two automake warnings. * Makefile.in: Regenerate. From-SVN: r84124 --- fastjar/ChangeLog | 5 +++++ fastjar/Makefile.am | 4 ++-- fastjar/Makefile.in | 7 ++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog index 055a7f0563e..57dc2aa6b03 100644 --- a/fastjar/ChangeLog +++ b/fastjar/ChangeLog @@ -1,3 +1,8 @@ +2004-07-05 Kelley Cook + + * Makefile.am: Silence two automake warnings. + * Makefile.in: Regenerate. + 2004-06-25 Kelley Cook PR other/15194 diff --git a/fastjar/Makefile.am b/fastjar/Makefile.am index 6c442e22868..3efd12eb51c 100644 --- a/fastjar/Makefile.am +++ b/fastjar/Makefile.am @@ -41,7 +41,7 @@ AM_MAKEFLAGS = \ "RANLIB=$(RANLIB)" \ "DESTDIR=$(DESTDIR)" -INCLUDES = -I. -I$(top_srcdir) $(ZINCS) -I$(top_srcdir)/../include +AM_CPPFLAGS = -I. -I$(top_srcdir) $(ZINCS) -I$(top_srcdir)/../include LIBIBERTY = ../libiberty/libiberty.a @@ -70,7 +70,7 @@ EXTRA_DIST = $(man_MANS) TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@" -%.1: %.pod +.pod.1: -($(POD2MAN) --section=1 $< > $(@).T$$$$ && \ mv -f $(@).T$$$$ $@) || \ (rm -f $(@).T$$$$ && exit 1) diff --git a/fastjar/Makefile.in b/fastjar/Makefile.in index c2696bd7873..0d81acee770 100644 --- a/fastjar/Makefile.in +++ b/fastjar/Makefile.in @@ -129,6 +129,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GENINSRC_FALSE = @GENINSRC_FALSE@ GENINSRC_TRUE = @GENINSRC_TRUE@ +GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -226,7 +227,7 @@ AM_MAKEFLAGS = \ "RANLIB=$(RANLIB)" \ "DESTDIR=$(DESTDIR)" -INCLUDES = -I. -I$(top_srcdir) $(ZINCS) -I$(top_srcdir)/../include +AM_CPPFLAGS = -I. -I$(top_srcdir) $(ZINCS) -I$(top_srcdir)/../include LIBIBERTY = ../libiberty/libiberty.a jar_SOURCES = jartool.c dostime.c compress.c pushback.c jartool.h \ zipfile.h dostime.h compress.h pushback.h @@ -266,7 +267,7 @@ all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .c .dvi .html .info .o .obj .pdf .ps .texi +.SUFFIXES: .1 .c .dvi .html .info .o .obj .pdf .pod .ps .texi am--refresh: @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @@ -817,7 +818,7 @@ uninstall-man: uninstall-man1 uninstall-man1 -%.1: %.pod +.pod.1: -($(POD2MAN) --section=1 $< > $(@).T$$$$ && \ mv -f $(@).T$$$$ $@) || \ (rm -f $(@).T$$$$ && exit 1) -- 2.30.2