2004-07-05 Kelley Cook <kcook@gcc.gnu.org>

	* Makefile.am: Silence two automake warnings.
	* Makefile.in: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@84124 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog
index 055a7f0..57dc2aa 100644 (file)
--- a/fastjar/ChangeLog
+++ b/fastjar/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-05  Kelley Cook  <kcook@gcc.gnu.org>
+
+       * Makefile.am: Silence two automake warnings.
+       * Makefile.in: Regenerate.
+
 2004-06-25  Kelley Cook  <kcook@gcc.gnu.org>
 
        PR other/15194

diff --git a/fastjar/Makefile.am b/fastjar/Makefile.am
index 6c442e2..3efd12e 100644 (file)
--- 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 c2696bd..0d81ace 100644 (file)
--- 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)