Commit 53d60c04 by Kelley Cook Committed by R. Kelley Cook

Makefile.am: Define AM_MAKINFOFLAGS.


fastjar/
2003-12-01  Kelley Cook  <kcook@gcc.gnu.org>

	* Makefile.am: Define AM_MAKINFOFLAGS.  Remove Automake 1.4 hack.
	* Makefile.in: Regenerate with automake 1.7.6 & autoconf 2.57 tools.
	* aclocal.m4, config.h.in, configure: Likewise.
	* install-sh, missing, mkinstalldirs, stamp-h.in: Remove.

gcc/
2003-12-01  Kelley Cook  <kcook@gcc.gnu.org>

	* doc/install.texi: Note that fastjar is built with automake 1.7.x
	and autoconf 2.57.

From-SVN: r74082
parent ae954fc6
2003-12-01 Kelley Cook <kcook@gcc.gnu.org>
* Makefile.am: Define AM_MAKINFOFLAGS. Remove Automake 1.4 hack.
* Makefile.in: Regenerate with automake 1.7.6 & autoconf 2.57 tools.
* aclocal.m4, config.h.in, configure: Likewise.
* install-sh, missing, mkinstalldirs, stamp-h.in: Remove.
2003-11-21 Kelley Cook <kcook@gcc.gnu.org> 2003-11-21 Kelley Cook <kcook@gcc.gnu.org>
* .cvsignore: Delete. * .cvsignore: Delete.
......
...@@ -57,6 +57,7 @@ grepjar_LDADD = $(ZLIBS) $(LIBIBERTY) ...@@ -57,6 +57,7 @@ grepjar_LDADD = $(ZLIBS) $(LIBIBERTY)
grepjar_DEPENDENCIES = $(ZDEPS) $(LIBIBERTY) grepjar_DEPENDENCIES = $(ZDEPS) $(LIBIBERTY)
AM_CFLAGS = @fastjar_warn_cflags@ AM_CFLAGS = @fastjar_warn_cflags@
AM_MAKEINFOFLAGS = -I $(srcdir)/../gcc/doc/include
TEXINFO_TEX = ../gcc/doc/include/texinfo.tex TEXINFO_TEX = ../gcc/doc/include/texinfo.tex
info_TEXINFOS = fastjar.texi info_TEXINFOS = fastjar.texi
...@@ -66,16 +67,6 @@ fastjar_TEXINFOS = \ ...@@ -66,16 +67,6 @@ fastjar_TEXINFOS = \
man_MANS = jar.1 grepjar.1 man_MANS = jar.1 grepjar.1
EXTRA_DIST = $(man_MANS) EXTRA_DIST = $(man_MANS)
## This is a hack. We can't set AM_MAKEINFOFLAGS, since that isn't
## 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.
my_makei_flags += -I $(srcdir)/../gcc/doc/include
fastjar.info: fastjar.texi $(fastjar_TEXINFOS)
rm -f $@ $@-[0-9] $@-[0-9][0-9]
$(MAKEINFO) $(my_makei_flags) -o $@ $<
TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl
POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@" POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@"
......
/* config.h.in. Generated automatically from configure.in by autoheader. */ /* config.h.in. Generated from configure.in by autoheader. */
/* Define to `long' if <sys/types.h> doesn't define. */ /* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
#undef off_t #undef BYTEORDER
/* Define if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Define if your <sys/time.h> declares struct tm. */
#undef TM_IN_SYS_TIME
/* Define if you have the <dirent.h> header file. */ /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
*/
#undef HAVE_DIRENT_H #undef HAVE_DIRENT_H
/* Define if you have the <fcntl.h> header file. */ /* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H #undef HAVE_FCNTL_H
/* Define if you have the <limits.h> header file. */ /* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H #undef HAVE_LIMITS_H
/* Define if you have the <ndir.h> header file. */ /* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
#undef HAVE_NDIR_H #undef HAVE_NDIR_H
/* Define if you have the <stdlib.h> header file. */ /* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H #undef HAVE_STDLIB_H
/* Define if you have the <sys/dir.h> header file. */ /* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
*/
#undef HAVE_SYS_DIR_H #undef HAVE_SYS_DIR_H
/* Define if you have the <sys/ndir.h> header file. */ /* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
*/
#undef HAVE_SYS_NDIR_H #undef HAVE_SYS_NDIR_H
/* Define if you have the <sys/param.h> header file. */ /* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H #undef HAVE_SYS_PARAM_H
/* Define if you have the <unistd.h> header file. */ /* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H #undef HAVE_UNISTD_H
/* Define if the host machine stores words of multi-word integers in
big-endian order. */
#undef HOST_WORDS_BIG_ENDIAN
/* Define if host mkdir takes a single argument. */
#undef MKDIR_TAKES_ONE_ARG
/* Name of package */ /* Name of package */
#undef PACKAGE #undef PACKAGE
/* Version number of package */ /* Define to the address where bug reports for this package should be sent. */
#undef VERSION #undef PACKAGE_BUGREPORT
/* Define if host mkdir takes a /* Define to the full name of this package. */
single argument. */ #undef PACKAGE_NAME
#undef MKDIR_TAKES_ONE_ARG
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* The number of bytes in type char */ /* The number of bytes in type char */
#undef SIZEOF_CHAR #undef SIZEOF_CHAR
/* The number of bytes in type short */
#undef SIZEOF_SHORT
/* The number of bytes in type int */ /* The number of bytes in type int */
#undef SIZEOF_INT #undef SIZEOF_INT
...@@ -61,13 +91,20 @@ single argument. */ ...@@ -61,13 +91,20 @@ single argument. */
/* The number of bytes in type long long */ /* The number of bytes in type long long */
#undef SIZEOF_LONG_LONG #undef SIZEOF_LONG_LONG
/* whether byteorder is bigendian */ /* The number of bytes in type short */
#undef WORDS_BIGENDIAN #undef SIZEOF_SHORT
/* Define if the host machine stores words of multi-word integers in /* Define to 1 if you have the ANSI C header files. */
big-endian order. */ #undef STDC_HEADERS
#undef HOST_WORDS_BIG_ENDIAN
/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */ /* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef BYTEORDER #undef TM_IN_SYS_TIME
/* Version number of package */
#undef VERSION
/* whether byteorder is bigendian */
#undef WORDS_BIGENDIAN
/* Define to `long' if <sys/types.h> does not define. */
#undef off_t
This source diff could not be displayed because it is too large. You can view the blob instead.
#! /bin/bash
. install-defs.sh
$CP fastjar ${BINDIR}
$STRIP ${BINDIR}/fastjar
$CHMOD 755 ${BINDIR}/fastjar
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
if test $# -eq 0; then
echo 1>&2 "Try \`$0 --help' for more information"
exit 1
fi
case "$1" in
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
error status if there is no known handling for PROGRAM.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
echo "missing - GNU libit 0.0"
;;
-*)
echo 1>&2 "$0: Unknown \`$1' option"
echo 1>&2 "Try \`$0 --help' for more information"
exit 1
;;
aclocal)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified \`acinclude.m4' or \`configure.in'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
;;
autoconf)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified \`configure.in'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
;;
autoheader)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified \`acconfig.h' or \`configure.in'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
case "$f" in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
esac
done
touch $touch_files
;;
automake)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
find . -type f -name Makefile.am -print |
sed 's/\.am$/.in/' |
while read f; do touch "$f"; done
;;
bison|yacc)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
case "$LASTARG" in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
if [ ! -f y.tab.h ]; then
echo >y.tab.h
fi
if [ ! -f y.tab.c ]; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
lex|flex)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
case "$LASTARG" in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
if [ ! -f lex.yy.c ]; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
makeinfo)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
fi
touch $file
;;
*)
echo 1>&2 "\
WARNING: \`$1' is needed, and you do not seem to have it handy on your
system. You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequirements for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
exit 1
;;
esac
exit 0
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
# Author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16
# Public domain
errstatus=0
dirmode=""
usage="\
Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
# process command line arguments
while test $# -gt 0 ; do
case $1 in
-h | --help | --h*) # -h for help
echo "$usage" 1>&2
exit 0
;;
-m) # -m PERM arg
shift
test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
dirmode=$1
shift
;;
--) # stop option processing
shift
break
;;
-*) # unknown option
echo "$usage" 1>&2
exit 1
;;
*) # first non-opt arg
break
;;
esac
done
for file
do
if test -d "$file"; then
shift
else
break
fi
done
case $# in
0) exit 0 ;;
esac
case $dirmode in
'')
if mkdir -p -- . 2>/dev/null; then
echo "mkdir -p -- $*"
exec mkdir -p -- "$@"
fi
;;
*)
if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
echo "mkdir -m $dirmode -p -- $*"
exec mkdir -m "$dirmode" -p -- "$@"
fi
;;
esac
for file
do
set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
shift
pathcomp=
for d
do
pathcomp="$pathcomp$d"
case $pathcomp in
-*) pathcomp=./$pathcomp ;;
esac
if test ! -d "$pathcomp"; then
echo "mkdir $pathcomp"
mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then
errstatus=$lasterr
else
if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
lasterr=""
chmod "$dirmode" "$pathcomp" || lasterr=$?
if test ! -z "$lasterr"; then
errstatus=$lasterr
fi
fi
fi
fi
pathcomp="$pathcomp/"
done
done
exit $errstatus
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# End:
# mkinstalldirs ends here
2003-12-01 Kelley Cook <kcook@gcc.gnu.org>
* doc/install.texi: Note that fastjar is built with automake 1.7.x
and autoconf 2.57.
2003-12-01 Alan Modra <amodra@bigpond.net.au> 2003-12-01 Alan Modra <amodra@bigpond.net.au>
* config/rs6000/linux64.h (SUBSUBTARGET_OVERRIDE_OPTIONS): Test * config/rs6000/linux64.h (SUBSUBTARGET_OVERRIDE_OPTIONS): Test
......
...@@ -292,14 +292,15 @@ systems' @command{tar} programs will also work, only try GNU ...@@ -292,14 +292,15 @@ systems' @command{tar} programs will also work, only try GNU
Necessary when modifying @file{configure.in}, @file{aclocal.m4}, etc.@: Necessary when modifying @file{configure.in}, @file{aclocal.m4}, etc.@:
to regenerate @file{configure} and @file{config.in} files. Most to regenerate @file{configure} and @file{config.in} files. Most
directories require autoconf 2.13 (exactly), but @file{libiberty} and directories require autoconf 2.13 (exactly), but @file{libiberty},
@file{libstdc++-v3} require autoconf 2.57 (exactly). @file{fastjar}, and @file{libstdc++-v3} require autoconf 2.57 (exactly).
@item automake versions 1.4-p? and 1.7.? @item automake versions 1.4-p? and 1.7.?
Necessary when modifying a @file{Makefile.am} file to regenerate its Necessary when modifying a @file{Makefile.am} file to regenerate its
associated @file{Makefile.in}. Most directories require a 1.4 series associated @file{Makefile.in}. Most directories require a 1.4 series
automake; @file{libstdc++-v3} requires a 1.7 series automake. automake; @file{libstdc++-v3} and @file{fastjar} requires a 1.7 series
automake.
@item gettext version 0.12 (or later) @item gettext version 0.12 (or later)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment