From e5fd53e574864bb240ff496ea5304eac717c9b2d Mon Sep 17 00:00:00 2001 From: gord Date: Mon, 15 Oct 2001 04:49:50 +0000 Subject: [PATCH] Update to Automake 1.5 --- ChangeLog | 7 +- INSTALL | 10 +- Makefile.in | 25 ++- aclocal.m4 | 260 ++++++++++++++--------- configure | 505 +++++++++++++++++++++++++------------------- configure.in | 2 + docs/Makefile.in | 22 +- docs/compile | 82 ------- grub/Makefile.in | 45 ++-- lib/Makefile.in | 24 +-- netboot/Makefile.in | 64 +++--- netboot/compile | 82 ------- stage1/Makefile.in | 20 +- stage2/Makefile.in | 253 +++++++++++----------- stage2/compile | 82 ------- util/Makefile.am | 3 + util/Makefile.in | 45 ++-- 17 files changed, 727 insertions(+), 804 deletions(-) delete mode 100644 docs/compile delete mode 100644 netboot/compile delete mode 100644 stage2/compile diff --git a/ChangeLog b/ChangeLog index 9cf5ec33f..c38808891 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-10-14 Gordon Matzigkeit + + * configure.in: Explicitly call _AM_DEPENDENCIES(CC) for the + benefit of older Autoconfs. + 2001-10-13 Yoshinori K. Okuji * netboot/fsys_tftp.c (tftp_read): Move the unused data @@ -73,7 +78,7 @@ 2001-08-02 Gordon Matzigkeit * stage2/common.c (init_bios_info): Ignore zero-length memory - ranges. From Derrik Pates. + ranges. From Derrik Pates . 2001-07-26 Jochen Hoenicke diff --git a/INSTALL b/INSTALL index ef95d54e1..ac379f615 100644 --- a/INSTALL +++ b/INSTALL @@ -43,11 +43,13 @@ configure script. Texinfo release. See the webpage . -* GNU Automake 1.4h or later +* Developers: GNU Automake 1.4h or later - We use the new feature "per-executable flags" in the pretest releases - of automake. So you need to obtain a later version from: - . + You should not need Automake just to compile GRUB, but you will need + it if you edit any of the build files (Makefile.am, configure.in, + etc). We use the new "per-executable flags" feature found in the + latest release of automake. See the webpage + . Configuring the GRUB diff --git a/Makefile.in b/Makefile.in index e6baae33f..ffecbb43e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4h from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -65,6 +65,7 @@ ASFLAGS = @ASFLAGS@ AWK = @AWK@ CC = @CC@ DEPDIR = @DEPDIR@ +EXEEXT = @EXEEXT@ FSYS_CFLAGS = @FSYS_CFLAGS@ GRUB_CFLAGS = @GRUB_CFLAGS@ GRUB_LIBS = @GRUB_LIBS@ @@ -74,22 +75,21 @@ NETBOOT_DRIVERS = @NETBOOT_DRIVERS@ NET_CFLAGS = @NET_CFLAGS@ NET_EXTRAFLAGS = @NET_EXTRAFLAGS@ OBJCOPY = @OBJCOPY@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ RANLIB = @RANLIB@ STAGE1_CFLAGS = @STAGE1_CFLAGS@ STAGE2_CFLAGS = @STAGE2_CFLAGS@ VERSION = @VERSION@ -_am_include = @_am_include@ -_am_quote = @_am_quote@ +am__include = @am__include@ +am__quote = @am__quote@ host_cpu = @host_cpu@ host_vendor = @host_vendor@ install_sh = @install_sh@ SUBDIRS = netboot stage2 stage1 lib grub util docs EXTRA_DIST = BUGS -EXEEXT = -OBJEXT = o subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -103,8 +103,9 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ Makefile.am Makefile.in NEWS THANKS TODO acconfig.h \ - acinclude.m4 aclocal.m4 config.guess config.h.in config.sub \ - configure configure.in depcomp install-sh missing mkinstalldirs + acinclude.m4 aclocal.m4 compile config.guess config.h.in \ + config.sub configure configure.in depcomp install-sh missing \ + mkinstalldirs DIST_SUBDIRS = $(SUBDIRS) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -239,10 +240,10 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ GTAGS: here=`CDPATH=: && cd $(top_builddir) && pwd` \ && cd $(top_srcdir) \ - && gtags -i $$here + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -312,7 +313,9 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && test `find $$dc_install_base -type f -print | wc -l` -le 1 \ + && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ + || (echo "Error: files left after uninstall" 1>&2; \ + exit 1) ) \ && $(MAKE) $(AM_MAKEFLAGS) dist \ && $(MAKE) $(AM_MAKEFLAGS) distclean \ && rm -f $(distdir).tar.gz \ @@ -392,7 +395,7 @@ uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) all all-am check check-am clean \ +.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ clean-generic clean-recursive dist dist-all distcheck distclean \ distclean-generic distclean-hdr distclean-recursive \ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ diff --git a/aclocal.m4 b/aclocal.m4 index 3fc94fed2..9a7a742f4 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# aclocal.m4 generated automatically by aclocal 1.4h +# aclocal.m4 generated automatically by aclocal 1.5 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000 +# Copyright 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -432,6 +432,15 @@ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])]) ifdef([m4_pattern_allow], [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl +# Autoconf 2.50 always computes EXEEXT. However we need to be +# compatible with 2.13, for now. So we always define EXEEXT, but we +# don't compute it. +AC_SUBST(EXEEXT) +# Similar for OBJEXT -- only we only use OBJEXT if the user actually +# requests that it be used. This is a bit dumb. +: ${OBJEXT=o} +AC_SUBST(OBJEXT) + # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl @@ -441,7 +450,7 @@ AM_MISSING_PROG(AUTOMAKE, automake) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) AM_MISSING_PROG(AMTAR, tar) -AM_MISSING_INSTALL_SH +AM_PROG_INSTALL_SH AM_PROG_INSTALL_STRIP # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -450,13 +459,13 @@ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_DEP_TRACK])dnl AC_REQUIRE([AM_SET_DEPDIR])dnl AC_PROVIDE_IFELSE([AC_PROG_][CC], - [AM_DEPENDENCIES(CC)], + [_AM_DEPENDENCIES(CC)], [define([AC_PROG_][CC], - defn([AC_PROG_][CC])[AM_DEPENDENCIES(CC)])])dnl + defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl AC_PROVIDE_IFELSE([AC_PROG_][CXX], - [AM_DEPENDENCIES(CXX)], + [_AM_DEPENDENCIES(CXX)], [define([AC_PROG_][CXX], - defn([AC_PROG_][CXX])[AM_DEPENDENCIES(CXX)])])dnl + defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl ]) # @@ -517,32 +526,13 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) -# AM_MISSING_INSTALL_SH -# --------------------- -# Like AM_MISSING_PROG, but only looks for install-sh. -AC_DEFUN([AM_MISSING_INSTALL_SH], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -if test -z "$install_sh"; then - for install_sh in "$ac_aux_dir/install-sh" \ - "$ac_aux_dir/install.sh" \ - "${am_missing_run}${ac_auxdir}/install-sh"; - do - test -f "$install_sh" && break - done - # FIXME: an evil hack: we remove the SHELL invocation from - # install_sh because automake adds it back in. Sigh. - install_sh=`echo $install_sh | sed -e 's/\${SHELL}//'` -fi -AC_SUBST(install_sh)]) - - # AM_MISSING_HAS_RUN # ------------------ # Define MISSING if not defined so far and test if it supports --run. # If it does, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], -[test x"${MISSING+set}" = xset || - MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing" +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " @@ -556,27 +546,56 @@ fi # AM_AUX_DIR_EXPAND # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to ${srcdir}/foo. In other projects, it is set to `.'. -# Of course, Automake must honor this variable whenever it call a tool -# from the auxiliary directory. The problem is that $srcdir (hence -# $ac_aux_dir) can be either an absolute path or a path relative to -# $top_srcdir or absolute, this depends on how configure is run. This -# is pretty anoying since it makes $ac_aux_dir quite unusable in -# subdirectories: on the top source directory, any form will work -# fine, but in subdirectories relative pat needs to be adapted. -# - calling $top_srcidr/$ac_aux_dir/missing would success if $srcdir is -# relative, but fail if $srcdir is absolute -# - conversly, calling $ax_aux_dir/missing would fail if $srcdir is -# absolute, and success on relative paths. +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. # -# Consequently, we define and use $am_aux_dir, the "always absolute" -# version of $ac_aux_dir. +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], [ # expand $ac_aux_dir to an absolute path am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` ]) +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +install_sh=${install_sh-"$am_aux_dir/install-sh"} +AC_SUBST(install_sh)]) + # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -585,12 +604,13 @@ am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` # always use install-sh in `make install-strip', and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_MISSING_INSTALL_SH])dnl -_am_dirpart="`echo $install_sh | sed -e 's,//*[[^/]]*$,,'`" -INSTALL_STRIP_PROGRAM="\${SHELL} \`CDPATH=: && cd $_am_dirpart && pwd\`/install-sh -c -s" +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# serial 3 +# serial 4 -*- Autoconf -*- + + # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -598,36 +618,29 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) # C support machinery. Also note that it means that autoscan, seeing # CC etc. in the Makefile, will ask for an AC_PROG_CC use... -# AM_DEPENDENCIES(NAME) + + +# _AM_DEPENDENCIES(NAME) # --------------------- # See how the compiler implements dependency checking. # NAME is "CC", "CXX" or "OBJC". # We try a few techniques and use that to set a single cache variable. -AC_DEFUN([AM_DEPENDENCIES], +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -am_compiler_list= -ifelse([$1], CC, - [AC_REQUIRE([AC_PROG_][CC])dnl -AC_REQUIRE([AC_PROG_][CPP]) -depcc="$CC" -depcpp="$CPP"], - [$1], CXX, [AC_REQUIRE([AC_PROG_][CXX])dnl -AC_REQUIRE([AC_PROG_][CXXCPP]) -depcc="$CXX" -depcpp="$CXXCPP"], - [$1], OBJC, [am_compiler_list='gcc3 gcc' -depcc="$OBJC" -depcpp=""], - [$1], GCJ, [am_compiler_list='gcc3 gcc' -depcc="$GCJ" -depcpp=""], - [AC_REQUIRE([AC_PROG_][$1])dnl -depcc="$$1" -depcpp=""]) +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl -AC_REQUIRE([AM_MAKE_INCLUDE]) -AC_REQUIRE([AM_DEP_TRACK]) +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'] + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -637,15 +650,15 @@ AC_CACHE_CHECK([dependency style of $depcc], # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. - mkdir confdir + mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. - cp "$am_depcomp" confdir - cd confdir + cp "$am_depcomp" conftest.dir + cd conftest.dir am_cv_$1_dependencies_compiler_type=none if test "$am_compiler_list" = ""; then - am_compiler_list="`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`" + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi for depmode in $am_compiler_list; do # We need to recreate these files for each test, as the compiler may @@ -653,8 +666,9 @@ AC_CACHE_CHECK([dependency style of $depcc], # This happens at least with the AIX C compiler. echo '#include "conftest.h"' > conftest.c echo 'int i;' > conftest.h + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf - case "$depmode" in + case $depmode in nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -669,18 +683,19 @@ AC_CACHE_CHECK([dependency style of $depcc], # We check with `-c' and `-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly # handle `-M -o', and we need to detect this. - if depmode="$depmode" \ + if depmode=$depmode \ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && - grep conftest.h conftest.Po > /dev/null 2>&1; then - am_cv_$1_dependencies_compiler_type="$depmode" + grep conftest.h conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + am_cv_$1_dependencies_compiler_type=$depmode break fi done cd .. - rm -rf confdir + rm -rf conftest.dir else am_cv_$1_dependencies_compiler_type=none fi @@ -693,16 +708,17 @@ AC_SUBST([$1DEPMODE]) # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES AC_DEFUN([AM_SET_DEPDIR], -[if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then +[rm -f .deps 2>/dev/null +mkdir .deps 2>/dev/null +if test -d .deps; then DEPDIR=.deps - # We redirect because .deps might already exist and be populated. - # In this situation we don't want to see an error. - rmdir .deps > /dev/null 2>&1 else + # MS-DOS does not allow filenames that begin with a dot. DEPDIR=_deps fi +rmdir .deps 2>/dev/null AC_SUBST(DEPDIR) ]) @@ -785,8 +801,8 @@ doit: END # If we don't find an include directive, just comment out the code. AC_MSG_CHECKING([for style of include used by $am_make]) -_am_include='#' -_am_quote= +am__include='#' +am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf @@ -796,21 +812,21 @@ echo "include confinc" > confmf # be invoked under some other name (usually "gmake"), in which # case it prints its new name instead of `make'. if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then - _am_include=include - _am_quote= + am__include=include + am__quote= _am_result=GNU fi # Now try BSD make style include. -if test "$_am_include" = "#"; then +if test "$am__include" = "#"; then echo '.include "confinc"' > confmf if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - _am_include=.include - _am_quote='"' + am__include=.include + am__quote='"' _am_result=BSD fi fi -AC_SUBST(_am_include) -AC_SUBST(_am_quote) +AC_SUBST(am__include) +AC_SUBST(am__quote) AC_MSG_RESULT($_am_result) rm -f confinc confmf ]) @@ -854,22 +870,60 @@ fi]) AC_PREREQ([2.12]) AC_DEFUN([AM_CONFIG_HEADER], +[ifdef([AC_FOREACH],dnl + [dnl init our file count if it isn't already + m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0])) + dnl prepare to store our destination file list for use in config.status + AC_FOREACH([_AM_File], [$1], + [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*])) + m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index)) + dnl and add it to the list of files AC keeps track of, along + dnl with our hook + AC_CONFIG_HEADERS(_AM_File, +dnl COMMANDS, [, INIT-CMDS] +[# update the timestamp +echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index[" +][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS + m4_popdef([_AM_Dest])])],dnl [AC_CONFIG_HEADER([$1]) AC_OUTPUT_COMMANDS( ifelse(patsubst([$1], [[^ ]], []), [], [test -z "$CONFIG_HEADERS" || echo timestamp >dnl - patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]), - [am_indx=1 - for am_file in $1; do - case " $CONFIG_HEADERS " in - *" $am_file "*) - echo timestamp > `echo $am_file | sed 's%:.*%%;s%[^/]*$%%'`stamp-h$am_indx - ;; - esac - am_indx=\`expr \$am_indx + 1\` - done]) -]) + patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl +[am_indx=1 +for am_file in $1; do + case " \$CONFIG_HEADERS " in + *" \$am_file "*) + am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\` + if test -n "\$am_dir"; then + am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\` + for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do + am_tmpdir=\$am_tmpdir\$am_subdir/ + if test ! -d \$am_tmpdir; then + mkdir \$am_tmpdir + fi + done + fi + echo timestamp > "\$am_dir"stamp-h\$am_indx + ;; + esac + am_indx=\`expr \$am_indx + 1\` +done]) +])]) # AM_CONFIG_HEADER + +# _AM_DIRNAME(PATH) +# ----------------- +# Like AS_DIRNAME, only do it during macro expansion +AC_DEFUN([_AM_DIRNAME], + [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, + m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1, + m4_if(m4_regexp([$1], [^/.*]), -1, + [.], + m4_patsubst([$1], [^\(/\).*], [\1])), + m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), + m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl +]) # _AM_DIRNAME # Add --enable-maintainer-mode option to configure. # From Jim Meyering diff --git a/configure b/configure index 54041b7d9..85bd3e8d1 100644 --- a/configure +++ b/configure @@ -663,6 +663,10 @@ ac_config_guess=$ac_aux_dir/config.guess ac_config_sub=$ac_aux_dir/config.sub ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + +# expand $ac_aux_dir to an absolute path +am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -675,7 +679,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:679: checking for a BSD compatible install" >&5 +echo "configure:683: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -728,7 +732,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:732: checking whether build environment is sane" >&5 +echo "configure:736: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftest.file @@ -784,8 +788,7 @@ test "$program_suffix" != NONE && # sed with no file args requires a program. test "$program_transform_name" = "" && program_transform_name="s,x,x," -test x"${MISSING+set}" = xset || - MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing" +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " @@ -795,12 +798,12 @@ else echo "configure: warning: ${am_backtick}missing' script is too old or missing" 1>&2 fi -for ac_prog in gawk mawk nawk awk +for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:804: checking for $ac_word" >&5 +echo "configure:807: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -830,7 +833,7 @@ test -n "$AWK" && break done echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:834: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:837: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -879,14 +882,15 @@ fi -if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then +rm -f .deps 2>/dev/null +mkdir .deps 2>/dev/null +if test -d .deps; then DEPDIR=.deps - # We redirect because .deps might already exist and be populated. - # In this situation we don't want to see an error. - rmdir .deps > /dev/null 2>&1 else + # MS-DOS does not allow filenames that begin with a dot. DEPDIR=_deps fi +rmdir .deps 2>/dev/null # test to see if srcdir already configured @@ -910,6 +914,15 @@ EOF # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow # the ones we care about. +# Autoconf 2.50 always computes EXEEXT. However we need to be +# compatible with 2.13, for now. So we always define EXEEXT, but we +# don't compute it. + +# Similar for OBJEXT -- only we only use OBJEXT if the user actually +# requests that it be used. This is a bit dumb. +: ${OBJEXT=o} + + # Some tools Automake needs. ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} @@ -929,21 +942,9 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} AMTAR=${AMTAR-"${am_missing_run}tar"} +install_sh=${install_sh-"$am_aux_dir/install-sh"} -if test -z "$install_sh"; then - for install_sh in "$ac_aux_dir/install-sh" \ - "$ac_aux_dir/install.sh" \ - "${am_missing_run}${ac_auxdir}/install-sh"; - do - test -f "$install_sh" && break - done - # FIXME: an evil hack: we remove the SHELL invocation from - # install_sh because automake adds it back in. Sigh. - install_sh=`echo $install_sh | sed -e 's/\${SHELL}//'` -fi - -_am_dirpart="`echo $install_sh | sed -e 's,//*[^/]*$,,'`" -INSTALL_STRIP_PROGRAM="\${SHELL} \`CDPATH=: && cd $_am_dirpart && pwd\`/install-sh -c -s" +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -960,7 +961,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:964: checking host system type" >&5 +echo "configure:965: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -994,7 +995,7 @@ esac # echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:998: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:999: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1020,7 +1021,7 @@ if test "x$enable_maintainer_mode" = xyes; then # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1024: checking for $ac_word" >&5 +echo "configure:1025: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1067,7 +1068,7 @@ fi # echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1071: checking build system type" >&5 +echo "configure:1072: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1093,7 +1094,7 @@ fi # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1097: checking for $ac_word" >&5 +echo "configure:1098: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1125,7 +1126,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1129: checking for $ac_word" >&5 +echo "configure:1130: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1155,7 +1156,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1159: checking for $ac_word" >&5 +echo "configure:1160: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1206,7 +1207,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1210: checking for $ac_word" >&5 +echo "configure:1211: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1238,7 +1239,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1242: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1243: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1249,12 +1250,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1253 "configure" +#line 1254 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1280,12 +1281,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1284: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1285: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1289: checking whether we are using GNU C" >&5 +echo "configure:1290: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1294,7 +1295,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1298: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1299: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1313,7 +1314,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1317: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1318: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1345,86 +1346,6 @@ else fi -echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1350: checking how to run the C preprocessor" >&5 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp -fi -rm -f conftest* -fi -rm -f conftest* -fi -rm -f conftest* - ac_cv_prog_CPP="$CPP" -fi - CPP="$ac_cv_prog_CPP" -else - ac_cv_prog_CPP="$CPP" -fi -echo "$ac_t""$CPP" 1>&6 - am_make=${MAKE-make} cat > confinc << 'END' doit: @@ -1432,9 +1353,9 @@ doit: END # If we don't find an include directive, just comment out the code. echo $ac_n "checking for style of include used by $am_make""... $ac_c" 1>&6 -echo "configure:1436: checking for style of include used by $am_make" >&5 -_am_include='#' -_am_quote= +echo "configure:1357: checking for style of include used by $am_make" >&5 +am__include='#' +am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf @@ -1444,16 +1365,16 @@ echo "include confinc" > confmf # be invoked under some other name (usually "gmake"), in which # case it prints its new name instead of `make'. if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then - _am_include=include - _am_quote= + am__include=include + am__quote= _am_result=GNU fi # Now try BSD make style include. -if test "$_am_include" = "#"; then +if test "$am__include" = "#"; then echo '.include "confinc"' > confmf if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - _am_include=.include - _am_quote='"' + am__include=.include + am__quote='"' _am_result=BSD fi fi @@ -1462,16 +1383,11 @@ fi echo "$ac_t""$_am_result" 1>&6 rm -f confinc confmf -am_compiler_list= - -depcc="$CC" -depcpp="$CPP" - - +depcc="$CC" am_compiler_list= echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6 -echo "configure:1475: checking dependency style of $depcc" >&5 +echo "configure:1391: checking dependency style of $depcc" >&5 if eval "test \"`echo '$''{'am_cv_CC_dependencies_compiler_type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1481,15 +1397,15 @@ else # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. - mkdir confdir + mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. - cp "$am_depcomp" confdir - cd confdir + cp "$am_depcomp" conftest.dir + cd conftest.dir am_cv_CC_dependencies_compiler_type=none if test "$am_compiler_list" = ""; then - am_compiler_list="`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`" + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi for depmode in $am_compiler_list; do # We need to recreate these files for each test, as the compiler may @@ -1497,8 +1413,9 @@ else # This happens at least with the AIX C compiler. echo '#include "conftest.h"' > conftest.c echo 'int i;' > conftest.h + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf - case "$depmode" in + case $depmode in nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -1513,18 +1430,90 @@ else # We check with `-c' and `-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly # handle `-M -o', and we need to detect this. - if depmode="$depmode" \ + if depmode=$depmode \ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && - grep conftest.h conftest.Po > /dev/null 2>&1; then - am_cv_CC_dependencies_compiler_type="$depmode" + grep conftest.h conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + am_cv_CC_dependencies_compiler_type=$depmode break fi done cd .. - rm -rf confdir + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi + +echo "$ac_t""$am_cv_CC_dependencies_compiler_type" 1>&6 +CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" + + +# We need this for older versions of Autoconf. + +depcc="$CC" am_compiler_list= + +echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6 +echo "configure:1462: checking dependency style of $depcc" >&5 +if eval "test \"`echo '$''{'am_cv_CC_dependencies_compiler_type'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + echo '#include "conftest.h"' > conftest.c + echo 'int i;' > conftest.h + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=conftest.c object=conftest.o \ + depfile=conftest.Po tmpdepfile=conftest.TPo \ + $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && + grep conftest.h conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + done + + cd .. + rm -rf conftest.dir else am_cv_CC_dependencies_compiler_type=none fi @@ -1550,7 +1539,7 @@ if test "x$with_binutils" != x; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1554: checking for $ac_word" >&5 +echo "configure:1543: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1587,7 +1576,7 @@ else # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1591: checking for $ac_word" >&5 +echo "configure:1580: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1627,7 +1616,7 @@ if test "x$ac_cv_prog_gcc" = xyes; then STAGE1_CFLAGS="-O2" GRUB_CFLAGS="-O2" echo $ac_n "checking whether optimization for size works""... $ac_c" 1>&6 -echo "configure:1631: checking whether optimization for size works" >&5 +echo "configure:1620: checking whether optimization for size works" >&5 if eval "test \"`echo '$''{'size_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1635,14 +1624,14 @@ else saved_CFLAGS=$CFLAGS CFLAGS="-Os -g" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* size_flag=yes else @@ -1674,7 +1663,7 @@ CPPFLAGS="$CPPFLAGS -Wall -Wmissing-prototypes -Wunused -Wshadow" CPPFLAGS="$CPPFLAGS -Wpointer-arith" echo $ac_n "checking whether -Wundef works""... $ac_c" 1>&6 -echo "configure:1678: checking whether -Wundef works" >&5 +echo "configure:1667: checking whether -Wundef works" >&5 if eval "test \"`echo '$''{'undef_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1682,14 +1671,14 @@ else saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="-Wundef" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1682: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* undef_flag=yes else @@ -1716,7 +1705,7 @@ if test "x$with_binutils" != x; then # Extract the first word of "objcopy", so it can be a program name with args. set dummy objcopy; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1720: checking for $ac_word" >&5 +echo "configure:1709: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OBJCOPY'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1752,7 +1741,7 @@ else # Extract the first word of "${ac_tool_prefix}objcopy", so it can be a program name with args. set dummy ${ac_tool_prefix}objcopy; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1756: checking for $ac_word" >&5 +echo "configure:1745: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1786,7 +1775,7 @@ fi # Defined in acinclude.m4. echo $ac_n "checking if C symbols get an underscore after compilation""... $ac_c" 1>&6 -echo "configure:1790: checking if C symbols get an underscore after compilation" >&5 +echo "configure:1779: checking if C symbols get an underscore after compilation" >&5 if eval "test \"`echo '$''{'grub_cv_asm_uscore'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1799,7 +1788,7 @@ func (int *list) } EOF -if { ac_try='${CC-cc} ${CFLAGS} -S conftest.c'; { (eval echo configure:1803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.s; then +if { ac_try='${CC-cc} ${CFLAGS} -S conftest.c'; { (eval echo configure:1792: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.s; then true else { echo "configure: error: ${CC-cc} failed to produce assembly code" 1>&2; exit 1; } @@ -1825,7 +1814,7 @@ fi echo "$ac_t""$grub_cv_asm_uscore" 1>&6 echo $ac_n "checking whether ${OBJCOPY} works for absolute addresses""... $ac_c" 1>&6 -echo "configure:1829: checking whether ${OBJCOPY} works for absolute addresses" >&5 +echo "configure:1818: checking whether ${OBJCOPY} works for absolute addresses" >&5 if eval "test \"`echo '$''{'grub_cv_prog_objcopy_absolute'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1837,21 +1826,21 @@ cmain (void) } EOF -if { (eval echo configure:1841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then : +if { (eval echo configure:1830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then : else { echo "configure: error: ${CC-cc} cannot compile C source code" 1>&2; exit 1; } fi grub_cv_prog_objcopy_absolute=yes for link_addr in 2000 8000 7C00; do - if { ac_try='${CC-cc} ${CFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,$link_addr conftest.o -o conftest.exec'; { (eval echo configure:1847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : + if { ac_try='${CC-cc} ${CFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,$link_addr conftest.o -o conftest.exec'; { (eval echo configure:1836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : else { echo "configure: error: ${CC-cc} cannot link at address $link_addr" 1>&2; exit 1; } fi - if { ac_try='${OBJCOPY-objcopy} -O binary conftest.exec conftest'; { (eval echo configure:1851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : + if { ac_try='${OBJCOPY-objcopy} -O binary conftest.exec conftest'; { (eval echo configure:1840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then : else { echo "configure: error: ${OBJCOPY-objcopy} cannot create binary files" 1>&2; exit 1; } fi - if test ! -f conftest.old || { ac_try='cmp -s conftest.old conftest'; { (eval echo configure:1855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if test ! -f conftest.old || { ac_try='cmp -s conftest.old conftest'; { (eval echo configure:1844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then mv -f conftest conftest.old else grub_cv_prog_objcopy_absolute=no @@ -1868,7 +1857,7 @@ fi echo $ac_n "checking whether addr32 must be in the same line as the instruction""... $ac_c" 1>&6 -echo "configure:1872: checking whether addr32 must be in the same line as the instruction" >&5 +echo "configure:1861: checking whether addr32 must be in the same line as the instruction" >&5 if eval "test \"`echo '$''{'grub_cv_asm_prefix_requirement'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1877,7 +1866,7 @@ else l1: addr32 movb %al, l1 EOF -if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then +if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then grub_cv_asm_prefix_requirement=yes else grub_cv_asm_prefix_requirement=no @@ -1909,7 +1898,7 @@ echo "$ac_t""$grub_cv_asm_prefix_requirement" 1>&6 echo $ac_n "checking for .code16 addr32 assembler support""... $ac_c" 1>&6 -echo "configure:1913: checking for .code16 addr32 assembler support" >&5 +echo "configure:1902: checking for .code16 addr32 assembler support" >&5 if eval "test \"`echo '$''{'grub_cv_asm_addr32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1924,7 +1913,7 @@ else sed -e s/@ADDR32@/addr32\;/ < conftest.s.in > conftest.s fi -if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then +if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then grub_cv_asm_addr32=yes else grub_cv_asm_addr32=no @@ -1941,7 +1930,7 @@ fi echo $ac_n "checking whether an absolute indirect call/jump must not be prefixed with an asterisk""... $ac_c" 1>&6 -echo "configure:1945: checking whether an absolute indirect call/jump must not be prefixed with an asterisk" >&5 +echo "configure:1934: checking whether an absolute indirect call/jump must not be prefixed with an asterisk" >&5 if eval "test \"`echo '$''{'grub_cv_asm_absolute_without_asterisk'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1952,7 +1941,7 @@ offset: .word 0 EOF -if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then +if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then grub_cv_asm_absolute_without_asterisk=no else grub_cv_asm_absolute_without_asterisk=yes @@ -1973,19 +1962,19 @@ echo "$ac_t""$grub_cv_asm_absolute_without_asterisk" 1>&6 echo $ac_n "checking if start is defined by the compiler""... $ac_c" 1>&6 -echo "configure:1977: checking if start is defined by the compiler" >&5 +echo "configure:1966: checking if start is defined by the compiler" >&5 if eval "test \"`echo '$''{'grub_cv_check_start_symbol'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* grub_cv_check_start_symbol=yes else @@ -2009,19 +1998,19 @@ echo "$ac_t""$grub_cv_check_start_symbol" 1>&6 echo $ac_n "checking if _start is defined by the compiler""... $ac_c" 1>&6 -echo "configure:2013: checking if _start is defined by the compiler" >&5 +echo "configure:2002: checking if _start is defined by the compiler" >&5 if eval "test \"`echo '$''{'grub_cv_check_uscore_start_symbol'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* grub_cv_check_uscore_start_symbol=yes else @@ -2050,19 +2039,19 @@ fi echo $ac_n "checking if __bss_start is defined by the compiler""... $ac_c" 1>&6 -echo "configure:2054: checking if __bss_start is defined by the compiler" >&5 +echo "configure:2043: checking if __bss_start is defined by the compiler" >&5 if eval "test \"`echo '$''{'grub_cv_check_uscore_uscore_bss_start_symbol'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* grub_cv_check_uscore_uscore_bss_start_symbol=yes else @@ -2086,19 +2075,19 @@ echo "$ac_t""$grub_cv_check_uscore_uscore_bss_start_symbol" 1>&6 echo $ac_n "checking if _edata is defined by the compiler""... $ac_c" 1>&6 -echo "configure:2090: checking if _edata is defined by the compiler" >&5 +echo "configure:2079: checking if _edata is defined by the compiler" >&5 if eval "test \"`echo '$''{'grub_cv_check_uscore_edata_symbol'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* grub_cv_check_uscore_edata_symbol=yes else @@ -2122,19 +2111,19 @@ echo "$ac_t""$grub_cv_check_uscore_edata_symbol" 1>&6 echo $ac_n "checking if edata is defined by the compiler""... $ac_c" 1>&6 -echo "configure:2126: checking if edata is defined by the compiler" >&5 +echo "configure:2115: checking if edata is defined by the compiler" >&5 if eval "test \"`echo '$''{'grub_cv_check_edata_symbol'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* grub_cv_check_edata_symbol=yes else @@ -2164,19 +2153,19 @@ fi echo $ac_n "checking if end is defined by the compiler""... $ac_c" 1>&6 -echo "configure:2168: checking if end is defined by the compiler" >&5 +echo "configure:2157: checking if end is defined by the compiler" >&5 if eval "test \"`echo '$''{'grub_cv_check_end_symbol'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* grub_cv_check_end_symbol=yes else @@ -2200,19 +2189,19 @@ echo "$ac_t""$grub_cv_check_end_symbol" 1>&6 echo $ac_n "checking if _end is defined by the compiler""... $ac_c" 1>&6 -echo "configure:2204: checking if _end is defined by the compiler" >&5 +echo "configure:2193: checking if _end is defined by the compiler" >&5 if eval "test \"`echo '$''{'grub_cv_check_uscore_end_symbol'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* grub_cv_check_uscore_end_symbol=yes else @@ -2250,7 +2239,7 @@ fi # Get the filename or the whole disk and open it. # Known to work on NetBSD. echo $ac_n "checking for opendisk in -lutil""... $ac_c" 1>&6 -echo "configure:2254: checking for opendisk in -lutil" >&5 +echo "configure:2243: checking for opendisk in -lutil" >&5 ac_lib_var=`echo util'_'opendisk | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2258,7 +2247,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2297,7 +2286,7 @@ fi # Unless the user specify --without-curses, check for curses. if test "x$with_curses" != "xno"; then echo $ac_n "checking for wgetch in -lncurses""... $ac_c" 1>&6 -echo "configure:2301: checking for wgetch in -lncurses" >&5 +echo "configure:2290: checking for wgetch in -lncurses" >&5 ac_lib_var=`echo ncurses'_'wgetch | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2305,7 +2294,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2339,7 +2328,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for wgetch in -lcurses""... $ac_c" 1>&6 -echo "configure:2343: checking for wgetch in -lcurses" >&5 +echo "configure:2332: checking for wgetch in -lcurses" >&5 ac_lib_var=`echo curses'_'wgetch | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2347,7 +2336,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2389,21 +2378,101 @@ fi # Check for headers. +echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +echo "configure:2383: checking how to run the C preprocessor" >&5 +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then +if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + # This must be in double quotes, not single quotes, because CPP may get + # substituted into the Makefile and "${CC-cc}" will confuse make. + CPP="${CC-cc} -E" + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext < +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext < +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP=/lib/cpp +fi +rm -f conftest* +fi +rm -f conftest* +fi +rm -f conftest* + ac_cv_prog_CPP="$CPP" +fi + CPP="$ac_cv_prog_CPP" +else + ac_cv_prog_CPP="$CPP" +fi +echo "$ac_t""$CPP" 1>&6 + for ac_hdr in string.h strings.h ncurses/curses.h ncurses.h curses.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2397: checking for $ac_hdr" >&5 +echo "configure:2466: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2407: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3039,7 +3108,7 @@ main (void) } EOF -if { ac_try='${CC-cc} ${CFLAGS} conftest.c -o conftest'; { (eval echo configure:3043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest; then +if { ac_try='${CC-cc} ${CFLAGS} conftest.c -o conftest'; { (eval echo configure:3112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest; then grub_tmp_value=`./conftest < "$enable_preset_menu"` else { echo "configure: error: ${CC-cc} failed to produce an executable file" 1>&2; exit 1; } @@ -3237,6 +3306,8 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@PACKAGE@%$PACKAGE%g s%@VERSION@%$VERSION%g +s%@EXEEXT@%$EXEEXT%g +s%@OBJEXT@%$OBJEXT%g s%@ACLOCAL@%$ACLOCAL%g s%@AUTOCONF@%$AUTOCONF%g s%@AUTOMAKE@%$AUTOMAKE%g @@ -3266,9 +3337,8 @@ s%@build_cpu@%$build_cpu%g s%@build_vendor@%$build_vendor%g s%@build_os@%$build_os%g s%@CC@%$CC%g -s%@CPP@%$CPP%g -s%@_am_include@%$_am_include%g -s%@_am_quote@%$_am_quote%g +s%@am__include@%$am__include%g +s%@am__quote@%$am__quote%g s%@CCDEPMODE@%$CCDEPMODE%g s%@AS@%$AS%g s%@RANLIB@%$RANLIB%g @@ -3277,6 +3347,7 @@ s%@STAGE2_CFLAGS@%$STAGE2_CFLAGS%g s%@GRUB_CFLAGS@%$GRUB_CFLAGS%g s%@OBJCOPY@%$OBJCOPY%g s%@GRUB_LIBS@%$GRUB_LIBS%g +s%@CPP@%$CPP%g s%@NETBOOT_SUPPORT_TRUE@%$NETBOOT_SUPPORT_TRUE%g s%@NETBOOT_SUPPORT_FALSE@%$NETBOOT_SUPPORT_FALSE%g s%@DISKLESS_SUPPORT_TRUE@%$DISKLESS_SUPPORT_TRUE%g @@ -3507,14 +3578,24 @@ fi; done EOF cat >> $CONFIG_STATUS < `echo $am_file | sed 's%:.*%%;s%[^/]*$%%'`stamp-h$am_indx - ;; - esac - am_indx=\`expr \$am_indx + 1\` - done +for am_file in config.h; do + case " \$CONFIG_HEADERS " in + *" \$am_file "*) + am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\` + if test -n "\$am_dir"; then + am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\` + for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do + am_tmpdir=\$am_tmpdir\$am_subdir/ + if test ! -d \$am_tmpdir; then + mkdir \$am_tmpdir + fi + done + fi + echo timestamp > "\$am_dir"stamp-h\$am_indx + ;; + esac + am_indx=\`expr \$am_indx + 1\` +done AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" diff --git a/configure.in b/configure.in index f07177793..9503e9c9f 100644 --- a/configure.in +++ b/configure.in @@ -50,6 +50,8 @@ fi AC_CHECK_TOOL(CC, gcc) AC_PROG_CC +# We need this for older versions of Autoconf. +_AM_DEPENDENCIES(CC) dnl Because recent automake complains about AS, set it here. AS="$CC" diff --git a/docs/Makefile.in b/docs/Makefile.in index 0300e17ae..4c6a1ba29 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4h from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -63,6 +63,7 @@ ASFLAGS = @ASFLAGS@ AWK = @AWK@ CC = @CC@ DEPDIR = @DEPDIR@ +EXEEXT = @EXEEXT@ FSYS_CFLAGS = @FSYS_CFLAGS@ GRUB_CFLAGS = @GRUB_CFLAGS@ GRUB_LIBS = @GRUB_LIBS@ @@ -72,14 +73,15 @@ NETBOOT_DRIVERS = @NETBOOT_DRIVERS@ NET_CFLAGS = @NET_CFLAGS@ NET_EXTRAFLAGS = @NET_EXTRAFLAGS@ OBJCOPY = @OBJCOPY@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ RANLIB = @RANLIB@ STAGE1_CFLAGS = @STAGE1_CFLAGS@ STAGE2_CFLAGS = @STAGE2_CFLAGS@ VERSION = @VERSION@ -_am_include = @_am_include@ -_am_quote = @_am_quote@ +am__include = @am__include@ +am__quote = @am__quote@ host_cpu = @host_cpu@ host_vendor = @host_vendor@ install_sh = @install_sh@ @@ -106,8 +108,6 @@ EXTRA_DIST = menu.lst $(man_MANS) $(noinst_SCRIPTS) \ $(EXAMPLES) $(multiboot_TEXINFOS) CLEANFILES = $(noinst_PROGRAMS) -EXEEXT = -OBJEXT = o subdir = docs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h @@ -147,7 +147,7 @@ TEXINFOS = grub.texi multiboot.texi NROFF = nroff MANS = $(man_MANS) DIST_COMMON = $(grub_TEXINFOS) $(multiboot_TEXINFOS) Makefile.am \ - Makefile.in compile mdate-sh stamp-vti texinfo.tex version.texi + Makefile.in mdate-sh stamp-vti texinfo.tex version.texi SOURCES = $(kernel_SOURCES) all: all-am @@ -165,7 +165,7 @@ Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.s clean-noinstPROGRAMS: -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) kernel-kernel.$(OBJEXT): kernel.c -kernel$(EXEEXT): $(kernel_OBJECTS) $(kernel_DEPENDENCIES) +kernel$(EXEEXT): $(kernel_OBJECTS) $(kernel_DEPENDENCIES) @rm -f kernel$(EXEEXT) $(LINK) $(kernel_LDFLAGS) $(kernel_OBJECTS) $(kernel_LDADD) $(LIBS) @@ -175,7 +175,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/kernel-kernel.Po@_am_quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kernel-kernel.Po@am__quote@ distclean-depend: -rm -rf $(DEPDIR) @@ -404,10 +404,10 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ GTAGS: here=`CDPATH=: && cd $(top_builddir) && pwd` \ && cd $(top_srcdir) \ - && gtags -i $$here + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -527,7 +527,7 @@ uninstall-am: uninstall-info-am uninstall-man uninstall-man: uninstall-man1 uninstall-man8 -.PHONY: all all-am check check-am clean clean-generic \ +.PHONY: GTAGS all all-am check check-am clean clean-generic \ clean-noinstPROGRAMS dist-info distclean distclean-compile \ distclean-depend distclean-generic distclean-tags distdir dvi \ dvi-am info info-am install install-am install-data \ diff --git a/docs/compile b/docs/compile deleted file mode 100644 index d4a34aa0e..000000000 --- a/docs/compile +++ /dev/null @@ -1,82 +0,0 @@ -#! /bin/sh - -# Wrapper for compilers which do not understand `-c -o'. - -# Copyright 1999, 2000 Free Software Foundation, Inc. -# Written by Tom Tromey . -# -# 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. - -# Usage: -# compile PROGRAM [ARGS]... -# `-o FOO.o' is removed from the args passed to the actual compile. - -prog=$1 -shift - -ofile= -cfile= -args= -while test $# -gt 0; do - case "$1" in - -o) - ofile=$2 - shift - ;; - *.c) - cfile=$1 - args="$args $1" - ;; - *) - args="$args $1" - ;; - esac - shift -done - -test -z "$ofile" && { - echo "compile: no \`-o' option seen" 1>&2 - exit 1 -} - -test -z "$cfile" && { - echo "compile: no \`.c' file seen" 1>&2 - exit 1 -} - -# Name of file we expect compiler to create. -cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'` - -# Create the lock directory. -lockdir=`echo $ofile | sed -e 's|/|_|g'` -while true; do - if mkdir $lockdir > /dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir $lockdir; exit 1" 1 2 15 - -# Run the compile. -"$prog" $args -status=$? - -if test -f "$cofile"; then - mv "$cofile" "$ofile" -fi - -rmdir $lockdir -exit $status diff --git a/grub/Makefile.in b/grub/Makefile.in index 01ace3239..7c8af1962 100644 --- a/grub/Makefile.in +++ b/grub/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4h from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -63,6 +63,7 @@ ASFLAGS = @ASFLAGS@ AWK = @AWK@ CC = @CC@ DEPDIR = @DEPDIR@ +EXEEXT = @EXEEXT@ FSYS_CFLAGS = @FSYS_CFLAGS@ GRUB_CFLAGS = @GRUB_CFLAGS@ GRUB_LIBS = @GRUB_LIBS@ @@ -72,14 +73,15 @@ NETBOOT_DRIVERS = @NETBOOT_DRIVERS@ NET_CFLAGS = @NET_CFLAGS@ NET_EXTRAFLAGS = @NET_EXTRAFLAGS@ OBJCOPY = @OBJCOPY@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ RANLIB = @RANLIB@ STAGE1_CFLAGS = @STAGE1_CFLAGS@ STAGE2_CFLAGS = @STAGE2_CFLAGS@ VERSION = @VERSION@ -_am_include = @_am_include@ -_am_quote = @_am_quote@ +am__include = @am__include@ +am__quote = @am__quote@ host_cpu = @host_cpu@ host_vendor = @host_vendor@ install_sh = @install_sh@ @@ -97,8 +99,6 @@ AM_CFLAGS = $(GRUB_CFLAGS) -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 \ grub_SOURCES = main.c asmstub.c grub_LDADD = ../stage2/libgrub.a ../lib/libcommon.a $(GRUB_LIBS) -EXEEXT = -OBJEXT = o subdir = grub mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h @@ -142,8 +142,10 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(sbindir) @list='$(sbin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + ; then \ + f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$f; \ else :; fi; \ @@ -159,7 +161,7 @@ uninstall-sbinPROGRAMS: clean-sbinPROGRAMS: -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) -grub$(EXEEXT): $(grub_OBJECTS) $(grub_DEPENDENCIES) +grub$(EXEEXT): $(grub_OBJECTS) $(grub_DEPENDENCIES) @rm -f grub$(EXEEXT) $(LINK) $(grub_LDFLAGS) $(grub_OBJECTS) $(grub_LDADD) $(LIBS) @@ -169,8 +171,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/asmstub.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/main.Po@_am_quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/asmstub.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Po@am__quote@ distclean-depend: -rm -rf $(DEPDIR) @@ -216,10 +218,10 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ GTAGS: here=`CDPATH=: && cd $(top_builddir) && pwd` \ && cd $(top_srcdir) \ - && gtags -i $$here + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -309,15 +311,16 @@ mostlyclean-am: mostlyclean-compile mostlyclean-generic uninstall-am: uninstall-info-am uninstall-sbinPROGRAMS -.PHONY: all all-am check check-am clean clean-generic clean-sbinPROGRAMS \ - distclean distclean-compile distclean-depend distclean-generic \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-sbinPROGRAMS install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic tags \ - uninstall uninstall-am uninstall-info-am uninstall-sbinPROGRAMS +.PHONY: GTAGS all all-am check check-am clean clean-generic \ + clean-sbinPROGRAMS distclean distclean-compile distclean-depend \ + distclean-generic distclean-tags distdir dvi dvi-am info \ + info-am install install-am install-data install-data-am \ + install-exec install-exec-am install-info install-info-am \ + install-man install-sbinPROGRAMS install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic tags uninstall uninstall-am \ + uninstall-info-am uninstall-sbinPROGRAMS # 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. diff --git a/lib/Makefile.in b/lib/Makefile.in index 5b8e4dc6a..ca2781d90 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4h from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -63,6 +63,7 @@ ASFLAGS = @ASFLAGS@ AWK = @AWK@ CC = @CC@ DEPDIR = @DEPDIR@ +EXEEXT = @EXEEXT@ FSYS_CFLAGS = @FSYS_CFLAGS@ GRUB_CFLAGS = @GRUB_CFLAGS@ GRUB_LIBS = @GRUB_LIBS@ @@ -72,14 +73,15 @@ NETBOOT_DRIVERS = @NETBOOT_DRIVERS@ NET_CFLAGS = @NET_CFLAGS@ NET_EXTRAFLAGS = @NET_EXTRAFLAGS@ OBJCOPY = @OBJCOPY@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ RANLIB = @RANLIB@ STAGE1_CFLAGS = @STAGE1_CFLAGS@ STAGE2_CFLAGS = @STAGE2_CFLAGS@ VERSION = @VERSION@ -_am_include = @_am_include@ -_am_quote = @_am_quote@ +am__include = @am__include@ +am__quote = @am__quote@ host_cpu = @host_cpu@ host_vendor = @host_vendor@ install_sh = @install_sh@ @@ -91,8 +93,6 @@ AM_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/stage2 \ libcommon_a_SOURCES = getopt.c getopt1.c getopt.h device.c device.h -EXEEXT = -OBJEXT = o subdir = lib mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h @@ -138,7 +138,7 @@ AR = ar clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libcommon.a: $(libcommon_a_OBJECTS) $(libcommon_a_DEPENDENCIES) +libcommon.a: $(libcommon_a_OBJECTS) $(libcommon_a_DEPENDENCIES) -rm -f libcommon.a $(libcommon_a_AR) libcommon.a $(libcommon_a_OBJECTS) $(libcommon_a_LIBADD) $(RANLIB) libcommon.a @@ -149,9 +149,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/device.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/getopt.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/getopt1.Po@_am_quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/device.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt1.Po@am__quote@ distclean-depend: -rm -rf $(DEPDIR) @@ -197,10 +197,10 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ GTAGS: here=`CDPATH=: && cd $(top_builddir) && pwd` \ && cd $(top_srcdir) \ - && gtags -i $$here + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -289,7 +289,7 @@ mostlyclean-am: mostlyclean-compile mostlyclean-generic uninstall-am: uninstall-info-am -.PHONY: all all-am check check-am clean clean-generic \ +.PHONY: GTAGS all all-am check check-am clean clean-generic \ clean-noinstLIBRARIES distclean distclean-compile \ distclean-depend distclean-generic distclean-tags distdir dvi \ dvi-am info info-am install install-am install-data \ diff --git a/netboot/Makefile.in b/netboot/Makefile.in index 321365564..5b73e3f98 100644 --- a/netboot/Makefile.in +++ b/netboot/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4h from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -65,6 +65,7 @@ ASFLAGS = @ASFLAGS@ AWK = @AWK@ CC = @CC@ DEPDIR = @DEPDIR@ +EXEEXT = @EXEEXT@ FSYS_CFLAGS = @FSYS_CFLAGS@ GRUB_CFLAGS = @GRUB_CFLAGS@ GRUB_LIBS = @GRUB_LIBS@ @@ -74,14 +75,15 @@ NETBOOT_DRIVERS = @NETBOOT_DRIVERS@ NET_CFLAGS = @NET_CFLAGS@ NET_EXTRAFLAGS = @NET_EXTRAFLAGS@ OBJCOPY = @OBJCOPY@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ RANLIB = @RANLIB@ STAGE1_CFLAGS = @STAGE1_CFLAGS@ STAGE2_CFLAGS = @STAGE2_CFLAGS@ VERSION = @VERSION@ -_am_include = @_am_include@ -_am_quote = @_am_quote@ +am__include = @am__include@ +am__quote = @am__quote@ host_cpu = @host_cpu@ host_vendor = @host_vendor@ install_sh = @install_sh@ @@ -162,8 +164,6 @@ smc9000_o_CFLAGS = -DINCLUDE_SMC9000=1 tiara_o_CFLAGS = -DINCLUDE_TIARA=1 tulip_o_CFLAGS = -DINCLUDE_TULIP=1 via_rhine_o_CFLAGS = -DINCLUDE_VIA_RHINE=1 -EXEEXT = -OBJEXT = o subdir = netboot mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h @@ -210,7 +210,7 @@ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ CFLAGS = @CFLAGS@ DIST_SOURCES = $(libdrivers_a_SOURCES) $(EXTRA_libdrivers_a_SOURCES) -DIST_COMMON = Makefile.am Makefile.in compile +DIST_COMMON = Makefile.am Makefile.in SOURCES = $(libdrivers_a_SOURCES) $(EXTRA_libdrivers_a_SOURCES) all: all-am @@ -251,7 +251,7 @@ libdrivers_a-smc9000.$(OBJEXT): smc9000.c libdrivers_a-tiara.$(OBJEXT): tiara.c libdrivers_a-tulip.$(OBJEXT): tulip.c libdrivers_a-via-rhine.$(OBJEXT): via-rhine.c -libdrivers.a: $(libdrivers_a_OBJECTS) $(libdrivers_a_DEPENDENCIES) +libdrivers.a: $(libdrivers_a_OBJECTS) $(libdrivers_a_DEPENDENCIES) -rm -f libdrivers.a $(libdrivers_a_AR) libdrivers.a $(libdrivers_a_OBJECTS) $(libdrivers_a_LIBADD) $(RANLIB) libdrivers.a @@ -262,28 +262,28 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libdrivers_a-3c509.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libdrivers_a-3c595.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libdrivers_a-3c90x.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libdrivers_a-config.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libdrivers_a-cs89x0.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libdrivers_a-depca.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libdrivers_a-eepro100.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libdrivers_a-epic100.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libdrivers_a-fsys_tftp.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libdrivers_a-i82586.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libdrivers_a-lance.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libdrivers_a-main.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libdrivers_a-misc.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libdrivers_a-ns8390.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libdrivers_a-otulip.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libdrivers_a-pci.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libdrivers_a-rtl8139.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libdrivers_a-sk_g16.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libdrivers_a-smc9000.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libdrivers_a-tiara.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libdrivers_a-tulip.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libdrivers_a-via-rhine.Po@_am_quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-3c509.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-3c595.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-3c90x.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-config.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-cs89x0.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-depca.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-eepro100.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-epic100.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-fsys_tftp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-i82586.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-lance.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-misc.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-ns8390.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-otulip.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-pci.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-rtl8139.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-sk_g16.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-smc9000.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-tiara.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-tulip.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libdrivers_a-via-rhine.Po@am__quote@ distclean-depend: -rm -rf $(DEPDIR) @@ -593,10 +593,10 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ GTAGS: here=`CDPATH=: && cd $(top_builddir) && pwd` \ && cd $(top_srcdir) \ - && gtags -i $$here + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -685,7 +685,7 @@ mostlyclean-am: mostlyclean-compile mostlyclean-generic uninstall-am: uninstall-info-am -.PHONY: all all-am check check-am clean clean-generic \ +.PHONY: GTAGS all all-am check check-am clean clean-generic \ clean-noinstLIBRARIES distclean distclean-compile \ distclean-depend distclean-generic distclean-tags distdir dvi \ dvi-am info info-am install install-am install-data \ diff --git a/netboot/compile b/netboot/compile deleted file mode 100644 index d4a34aa0e..000000000 --- a/netboot/compile +++ /dev/null @@ -1,82 +0,0 @@ -#! /bin/sh - -# Wrapper for compilers which do not understand `-c -o'. - -# Copyright 1999, 2000 Free Software Foundation, Inc. -# Written by Tom Tromey . -# -# 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. - -# Usage: -# compile PROGRAM [ARGS]... -# `-o FOO.o' is removed from the args passed to the actual compile. - -prog=$1 -shift - -ofile= -cfile= -args= -while test $# -gt 0; do - case "$1" in - -o) - ofile=$2 - shift - ;; - *.c) - cfile=$1 - args="$args $1" - ;; - *) - args="$args $1" - ;; - esac - shift -done - -test -z "$ofile" && { - echo "compile: no \`-o' option seen" 1>&2 - exit 1 -} - -test -z "$cfile" && { - echo "compile: no \`.c' file seen" 1>&2 - exit 1 -} - -# Name of file we expect compiler to create. -cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'` - -# Create the lock directory. -lockdir=`echo $ofile | sed -e 's|/|_|g'` -while true; do - if mkdir $lockdir > /dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir $lockdir; exit 1" 1 2 15 - -# Run the compile. -"$prog" $args -status=$? - -if test -f "$cofile"; then - mv "$cofile" "$ofile" -fi - -rmdir $lockdir -exit $status diff --git a/stage1/Makefile.in b/stage1/Makefile.in index 48347762b..ea2d40c47 100644 --- a/stage1/Makefile.in +++ b/stage1/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4h from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -62,6 +62,7 @@ ASFLAGS = @ASFLAGS@ AWK = @AWK@ CC = @CC@ DEPDIR = @DEPDIR@ +EXEEXT = @EXEEXT@ FSYS_CFLAGS = @FSYS_CFLAGS@ GRUB_CFLAGS = @GRUB_CFLAGS@ GRUB_LIBS = @GRUB_LIBS@ @@ -71,14 +72,15 @@ NETBOOT_DRIVERS = @NETBOOT_DRIVERS@ NET_CFLAGS = @NET_CFLAGS@ NET_EXTRAFLAGS = @NET_EXTRAFLAGS@ OBJCOPY = @OBJCOPY@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ RANLIB = @RANLIB@ STAGE1_CFLAGS = @STAGE1_CFLAGS@ STAGE2_CFLAGS = @STAGE2_CFLAGS@ VERSION = @VERSION@ -_am_include = @_am_include@ -_am_quote = @_am_quote@ +am__include = @am__include@ +am__quote = @am__quote@ host_cpu = @host_cpu@ host_vendor = @host_vendor@ install_sh = @install_sh@ @@ -94,13 +96,11 @@ LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00 noinst_PROGRAMS = stage1.exec stage1_exec_SOURCES = stage1.S stage1.h -EXEEXT = -OBJEXT = o subdir = stage1 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -noinst_PROGRAMS = stage1.exec +noinst_PROGRAMS = stage1.exec$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) am_stage1_exec_OBJECTS = stage1.$(OBJEXT) @@ -139,7 +139,7 @@ Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.s clean-noinstPROGRAMS: -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) -stage1.exec$(EXEEXT): $(stage1_exec_OBJECTS) $(stage1_exec_DEPENDENCIES) +stage1.exec$(EXEEXT): $(stage1_exec_OBJECTS) $(stage1_exec_DEPENDENCIES) @rm -f stage1.exec$(EXEEXT) $(LINK) $(stage1_exec_LDFLAGS) $(stage1_exec_OBJECTS) $(stage1_exec_LDADD) $(LIBS) @@ -200,10 +200,10 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ GTAGS: here=`CDPATH=: && cd $(top_builddir) && pwd` \ && cd $(top_srcdir) \ - && gtags -i $$here + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -294,7 +294,7 @@ mostlyclean-am: mostlyclean-compile mostlyclean-generic uninstall-am: uninstall-info-am uninstall-nodist_pkgdataDATA -.PHONY: all all-am check check-am clean clean-generic \ +.PHONY: GTAGS all all-am check check-am clean clean-generic \ clean-noinstPROGRAMS distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am info \ info-am install install-am install-data install-data-am \ diff --git a/stage2/Makefile.in b/stage2/Makefile.in index 078f5b94e..de21b8faa 100644 --- a/stage2/Makefile.in +++ b/stage2/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4h from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -64,6 +64,7 @@ ASFLAGS = @ASFLAGS@ AWK = @AWK@ CC = @CC@ DEPDIR = @DEPDIR@ +EXEEXT = @EXEEXT@ FSYS_CFLAGS = @FSYS_CFLAGS@ GRUB_CFLAGS = @GRUB_CFLAGS@ GRUB_LIBS = @GRUB_LIBS@ @@ -73,14 +74,15 @@ NETBOOT_DRIVERS = @NETBOOT_DRIVERS@ NET_CFLAGS = @NET_CFLAGS@ NET_EXTRAFLAGS = @NET_EXTRAFLAGS@ OBJCOPY = @OBJCOPY@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ RANLIB = @RANLIB@ STAGE1_CFLAGS = @STAGE1_CFLAGS@ STAGE2_CFLAGS = @STAGE2_CFLAGS@ VERSION = @VERSION@ -_am_include = @_am_include@ -_am_quote = @_am_quote@ +am__include = @am__include@ +am__quote = @am__quote@ host_cpu = @host_cpu@ host_vendor = @host_vendor@ install_sh = @install_sh@ @@ -270,8 +272,6 @@ nbloader_exec_LDFLAGS = $(NBLOADER_LINK) pxeloader_exec_SOURCES = pxeloader.S pxeloader_exec_ASFLAGS = $(STAGE2_COMPILE) pxeloader_exec_LDFLAGS = $(PXELOADER_LINK) -EXEEXT = -OBJEXT = o subdir = stage2 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h @@ -290,18 +290,27 @@ am_libgrub_a_OBJECTS = libgrub_a-boot.$(OBJEXT) \ libgrub_a-fsys_vstafs.$(OBJEXT) libgrub_a-stage2.$(OBJEXT) \ libgrub_a-md5.$(OBJEXT) libgrub_a_OBJECTS = $(am_libgrub_a_OBJECTS) -EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec -@DISKLESS_SUPPORT_TRUE@noinst_PROGRAMS = pre_stage2.exec start.exec \ -@DISKLESS_SUPPORT_TRUE@ e2fs_stage1_5.exec fat_stage1_5.exec \ -@DISKLESS_SUPPORT_TRUE@ ffs_stage1_5.exec minix_stage1_5.exec \ -@DISKLESS_SUPPORT_TRUE@ reiserfs_stage1_5.exec \ -@DISKLESS_SUPPORT_TRUE@ vstafs_stage1_5.exec nbloader.exec \ -@DISKLESS_SUPPORT_TRUE@ pxeloader.exec diskless.exec -@DISKLESS_SUPPORT_FALSE@noinst_PROGRAMS = pre_stage2.exec start.exec \ -@DISKLESS_SUPPORT_FALSE@ e2fs_stage1_5.exec fat_stage1_5.exec \ -@DISKLESS_SUPPORT_FALSE@ ffs_stage1_5.exec minix_stage1_5.exec \ -@DISKLESS_SUPPORT_FALSE@ reiserfs_stage1_5.exec \ -@DISKLESS_SUPPORT_FALSE@ vstafs_stage1_5.exec +EXTRA_PROGRAMS = nbloader.exec$(EXEEXT) pxeloader.exec$(EXEEXT) \ + diskless.exec$(EXEEXT) +@DISKLESS_SUPPORT_TRUE@noinst_PROGRAMS = pre_stage2.exec$(EXEEXT) \ +@DISKLESS_SUPPORT_TRUE@ start.exec$(EXEEXT) \ +@DISKLESS_SUPPORT_TRUE@ e2fs_stage1_5.exec$(EXEEXT) \ +@DISKLESS_SUPPORT_TRUE@ fat_stage1_5.exec$(EXEEXT) \ +@DISKLESS_SUPPORT_TRUE@ ffs_stage1_5.exec$(EXEEXT) \ +@DISKLESS_SUPPORT_TRUE@ minix_stage1_5.exec$(EXEEXT) \ +@DISKLESS_SUPPORT_TRUE@ reiserfs_stage1_5.exec$(EXEEXT) \ +@DISKLESS_SUPPORT_TRUE@ vstafs_stage1_5.exec$(EXEEXT) \ +@DISKLESS_SUPPORT_TRUE@ nbloader.exec$(EXEEXT) \ +@DISKLESS_SUPPORT_TRUE@ pxeloader.exec$(EXEEXT) \ +@DISKLESS_SUPPORT_TRUE@ diskless.exec$(EXEEXT) +@DISKLESS_SUPPORT_FALSE@noinst_PROGRAMS = pre_stage2.exec$(EXEEXT) \ +@DISKLESS_SUPPORT_FALSE@ start.exec$(EXEEXT) \ +@DISKLESS_SUPPORT_FALSE@ e2fs_stage1_5.exec$(EXEEXT) \ +@DISKLESS_SUPPORT_FALSE@ fat_stage1_5.exec$(EXEEXT) \ +@DISKLESS_SUPPORT_FALSE@ ffs_stage1_5.exec$(EXEEXT) \ +@DISKLESS_SUPPORT_FALSE@ minix_stage1_5.exec$(EXEEXT) \ +@DISKLESS_SUPPORT_FALSE@ reiserfs_stage1_5.exec$(EXEEXT) \ +@DISKLESS_SUPPORT_FALSE@ vstafs_stage1_5.exec$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) am_diskless_exec_OBJECTS = diskless_exec-asm.$(OBJEXT) \ @@ -535,7 +544,7 @@ DATA = $(noinst_DATA) $(pkgdata_DATA) HEADERS = $(noinst_HEADERS) -DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in compile +DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in SOURCES = $(libgrub_a_SOURCES) $(diskless_exec_SOURCES) $(e2fs_stage1_5_exec_SOURCES) $(fat_stage1_5_exec_SOURCES) $(ffs_stage1_5_exec_SOURCES) $(minix_stage1_5_exec_SOURCES) $(nbloader_exec_SOURCES) $(pre_stage2_exec_SOURCES) $(pxeloader_exec_SOURCES) $(reiserfs_stage1_5_exec_SOURCES) $(start_exec_SOURCES) $(vstafs_stage1_5_exec_SOURCES) all: $(BUILT_SOURCES) @@ -570,7 +579,7 @@ libgrub_a-fsys_reiserfs.$(OBJEXT): fsys_reiserfs.c libgrub_a-fsys_vstafs.$(OBJEXT): fsys_vstafs.c libgrub_a-stage2.$(OBJEXT): stage2.c libgrub_a-md5.$(OBJEXT): md5.c -libgrub.a: $(libgrub_a_OBJECTS) $(libgrub_a_DEPENDENCIES) +libgrub.a: $(libgrub_a_OBJECTS) $(libgrub_a_DEPENDENCIES) -rm -f libgrub.a $(libgrub_a_AR) libgrub.a $(libgrub_a_OBJECTS) $(libgrub_a_LIBADD) $(RANLIB) libgrub.a @@ -597,7 +606,7 @@ diskless_exec-serial.$(OBJEXT): serial.c diskless_exec-smp-imps.$(OBJEXT): smp-imps.c diskless_exec-stage2.$(OBJEXT): stage2.c diskless_exec-md5.$(OBJEXT): md5.c -diskless.exec$(EXEEXT): $(diskless_exec_OBJECTS) $(diskless_exec_DEPENDENCIES) +diskless.exec$(EXEEXT): $(diskless_exec_OBJECTS) $(diskless_exec_DEPENDENCIES) @rm -f diskless.exec$(EXEEXT) $(LINK) $(diskless_exec_LDFLAGS) $(diskless_exec_OBJECTS) $(diskless_exec_LDADD) $(LIBS) e2fs_stage1_5_exec-start.$(OBJEXT): start.S @@ -608,7 +617,7 @@ e2fs_stage1_5_exec-disk_io.$(OBJEXT): disk_io.c e2fs_stage1_5_exec-stage1_5.$(OBJEXT): stage1_5.c e2fs_stage1_5_exec-fsys_ext2fs.$(OBJEXT): fsys_ext2fs.c e2fs_stage1_5_exec-bios.$(OBJEXT): bios.c -e2fs_stage1_5.exec$(EXEEXT): $(e2fs_stage1_5_exec_OBJECTS) $(e2fs_stage1_5_exec_DEPENDENCIES) +e2fs_stage1_5.exec$(EXEEXT): $(e2fs_stage1_5_exec_OBJECTS) $(e2fs_stage1_5_exec_DEPENDENCIES) @rm -f e2fs_stage1_5.exec$(EXEEXT) $(LINK) $(e2fs_stage1_5_exec_LDFLAGS) $(e2fs_stage1_5_exec_OBJECTS) $(e2fs_stage1_5_exec_LDADD) $(LIBS) fat_stage1_5_exec-start.$(OBJEXT): start.S @@ -619,7 +628,7 @@ fat_stage1_5_exec-disk_io.$(OBJEXT): disk_io.c fat_stage1_5_exec-stage1_5.$(OBJEXT): stage1_5.c fat_stage1_5_exec-fsys_fat.$(OBJEXT): fsys_fat.c fat_stage1_5_exec-bios.$(OBJEXT): bios.c -fat_stage1_5.exec$(EXEEXT): $(fat_stage1_5_exec_OBJECTS) $(fat_stage1_5_exec_DEPENDENCIES) +fat_stage1_5.exec$(EXEEXT): $(fat_stage1_5_exec_OBJECTS) $(fat_stage1_5_exec_DEPENDENCIES) @rm -f fat_stage1_5.exec$(EXEEXT) $(LINK) $(fat_stage1_5_exec_LDFLAGS) $(fat_stage1_5_exec_OBJECTS) $(fat_stage1_5_exec_LDADD) $(LIBS) ffs_stage1_5_exec-start.$(OBJEXT): start.S @@ -630,7 +639,7 @@ ffs_stage1_5_exec-disk_io.$(OBJEXT): disk_io.c ffs_stage1_5_exec-stage1_5.$(OBJEXT): stage1_5.c ffs_stage1_5_exec-fsys_ffs.$(OBJEXT): fsys_ffs.c ffs_stage1_5_exec-bios.$(OBJEXT): bios.c -ffs_stage1_5.exec$(EXEEXT): $(ffs_stage1_5_exec_OBJECTS) $(ffs_stage1_5_exec_DEPENDENCIES) +ffs_stage1_5.exec$(EXEEXT): $(ffs_stage1_5_exec_OBJECTS) $(ffs_stage1_5_exec_DEPENDENCIES) @rm -f ffs_stage1_5.exec$(EXEEXT) $(LINK) $(ffs_stage1_5_exec_LDFLAGS) $(ffs_stage1_5_exec_OBJECTS) $(ffs_stage1_5_exec_LDADD) $(LIBS) minix_stage1_5_exec-start.$(OBJEXT): start.S @@ -641,11 +650,11 @@ minix_stage1_5_exec-disk_io.$(OBJEXT): disk_io.c minix_stage1_5_exec-stage1_5.$(OBJEXT): stage1_5.c minix_stage1_5_exec-fsys_minix.$(OBJEXT): fsys_minix.c minix_stage1_5_exec-bios.$(OBJEXT): bios.c -minix_stage1_5.exec$(EXEEXT): $(minix_stage1_5_exec_OBJECTS) $(minix_stage1_5_exec_DEPENDENCIES) +minix_stage1_5.exec$(EXEEXT): $(minix_stage1_5_exec_OBJECTS) $(minix_stage1_5_exec_DEPENDENCIES) @rm -f minix_stage1_5.exec$(EXEEXT) $(LINK) $(minix_stage1_5_exec_LDFLAGS) $(minix_stage1_5_exec_OBJECTS) $(minix_stage1_5_exec_LDADD) $(LIBS) nbloader_exec-nbloader.$(OBJEXT): nbloader.S -nbloader.exec$(EXEEXT): $(nbloader_exec_OBJECTS) $(nbloader_exec_DEPENDENCIES) +nbloader.exec$(EXEEXT): $(nbloader_exec_OBJECTS) $(nbloader_exec_DEPENDENCIES) @rm -f nbloader.exec$(EXEEXT) $(LINK) $(nbloader_exec_LDFLAGS) $(nbloader_exec_OBJECTS) $(nbloader_exec_LDADD) $(LIBS) pre_stage2_exec-asm.$(OBJEXT): asm.S @@ -668,11 +677,11 @@ pre_stage2_exec-serial.$(OBJEXT): serial.c pre_stage2_exec-smp-imps.$(OBJEXT): smp-imps.c pre_stage2_exec-stage2.$(OBJEXT): stage2.c pre_stage2_exec-md5.$(OBJEXT): md5.c -pre_stage2.exec$(EXEEXT): $(pre_stage2_exec_OBJECTS) $(pre_stage2_exec_DEPENDENCIES) +pre_stage2.exec$(EXEEXT): $(pre_stage2_exec_OBJECTS) $(pre_stage2_exec_DEPENDENCIES) @rm -f pre_stage2.exec$(EXEEXT) $(LINK) $(pre_stage2_exec_LDFLAGS) $(pre_stage2_exec_OBJECTS) $(pre_stage2_exec_LDADD) $(LIBS) pxeloader_exec-pxeloader.$(OBJEXT): pxeloader.S -pxeloader.exec$(EXEEXT): $(pxeloader_exec_OBJECTS) $(pxeloader_exec_DEPENDENCIES) +pxeloader.exec$(EXEEXT): $(pxeloader_exec_OBJECTS) $(pxeloader_exec_DEPENDENCIES) @rm -f pxeloader.exec$(EXEEXT) $(LINK) $(pxeloader_exec_LDFLAGS) $(pxeloader_exec_OBJECTS) $(pxeloader_exec_LDADD) $(LIBS) reiserfs_stage1_5_exec-start.$(OBJEXT): start.S @@ -683,11 +692,11 @@ reiserfs_stage1_5_exec-disk_io.$(OBJEXT): disk_io.c reiserfs_stage1_5_exec-stage1_5.$(OBJEXT): stage1_5.c reiserfs_stage1_5_exec-fsys_reiserfs.$(OBJEXT): fsys_reiserfs.c reiserfs_stage1_5_exec-bios.$(OBJEXT): bios.c -reiserfs_stage1_5.exec$(EXEEXT): $(reiserfs_stage1_5_exec_OBJECTS) $(reiserfs_stage1_5_exec_DEPENDENCIES) +reiserfs_stage1_5.exec$(EXEEXT): $(reiserfs_stage1_5_exec_OBJECTS) $(reiserfs_stage1_5_exec_DEPENDENCIES) @rm -f reiserfs_stage1_5.exec$(EXEEXT) $(LINK) $(reiserfs_stage1_5_exec_LDFLAGS) $(reiserfs_stage1_5_exec_OBJECTS) $(reiserfs_stage1_5_exec_LDADD) $(LIBS) start_exec-start.$(OBJEXT): start.S -start.exec$(EXEEXT): $(start_exec_OBJECTS) $(start_exec_DEPENDENCIES) +start.exec$(EXEEXT): $(start_exec_OBJECTS) $(start_exec_DEPENDENCIES) @rm -f start.exec$(EXEEXT) $(LINK) $(start_exec_LDFLAGS) $(start_exec_OBJECTS) $(start_exec_LDADD) $(LIBS) vstafs_stage1_5_exec-start.$(OBJEXT): start.S @@ -698,7 +707,7 @@ vstafs_stage1_5_exec-disk_io.$(OBJEXT): disk_io.c vstafs_stage1_5_exec-stage1_5.$(OBJEXT): stage1_5.c vstafs_stage1_5_exec-fsys_vstafs.$(OBJEXT): fsys_vstafs.c vstafs_stage1_5_exec-bios.$(OBJEXT): bios.c -vstafs_stage1_5.exec$(EXEEXT): $(vstafs_stage1_5_exec_OBJECTS) $(vstafs_stage1_5_exec_DEPENDENCIES) +vstafs_stage1_5.exec$(EXEEXT): $(vstafs_stage1_5_exec_OBJECTS) $(vstafs_stage1_5_exec_DEPENDENCIES) @rm -f vstafs_stage1_5.exec$(EXEEXT) $(LINK) $(vstafs_stage1_5_exec_LDFLAGS) $(vstafs_stage1_5_exec_OBJECTS) $(vstafs_stage1_5_exec_LDADD) $(LIBS) @@ -708,95 +717,95 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/diskless_exec-bios.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/diskless_exec-boot.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/diskless_exec-builtins.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/diskless_exec-char_io.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/diskless_exec-cmdline.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/diskless_exec-common.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/diskless_exec-disk_io.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/diskless_exec-fsys_ext2fs.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/diskless_exec-fsys_fat.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/diskless_exec-fsys_ffs.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/diskless_exec-fsys_minix.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/diskless_exec-fsys_reiserfs.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/diskless_exec-fsys_vstafs.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/diskless_exec-gunzip.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/diskless_exec-hercules.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/diskless_exec-md5.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/diskless_exec-serial.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/diskless_exec-smp-imps.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/diskless_exec-stage2.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/e2fs_stage1_5_exec-bios.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/e2fs_stage1_5_exec-char_io.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/e2fs_stage1_5_exec-common.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/e2fs_stage1_5_exec-disk_io.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/e2fs_stage1_5_exec-fsys_ext2fs.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/e2fs_stage1_5_exec-stage1_5.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/fat_stage1_5_exec-bios.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/fat_stage1_5_exec-char_io.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/fat_stage1_5_exec-common.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/fat_stage1_5_exec-disk_io.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/fat_stage1_5_exec-fsys_fat.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/fat_stage1_5_exec-stage1_5.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/ffs_stage1_5_exec-bios.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/ffs_stage1_5_exec-char_io.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/ffs_stage1_5_exec-common.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/ffs_stage1_5_exec-disk_io.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/ffs_stage1_5_exec-fsys_ffs.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/ffs_stage1_5_exec-stage1_5.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libgrub_a-boot.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libgrub_a-builtins.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libgrub_a-char_io.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libgrub_a-cmdline.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libgrub_a-common.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libgrub_a-disk_io.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libgrub_a-fsys_ext2fs.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libgrub_a-fsys_fat.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libgrub_a-fsys_ffs.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libgrub_a-fsys_minix.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libgrub_a-fsys_reiserfs.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libgrub_a-fsys_vstafs.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libgrub_a-gunzip.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libgrub_a-md5.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/libgrub_a-stage2.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/minix_stage1_5_exec-bios.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/minix_stage1_5_exec-char_io.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/minix_stage1_5_exec-common.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/minix_stage1_5_exec-disk_io.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/minix_stage1_5_exec-fsys_minix.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/minix_stage1_5_exec-stage1_5.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/pre_stage2_exec-bios.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/pre_stage2_exec-boot.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/pre_stage2_exec-builtins.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/pre_stage2_exec-char_io.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/pre_stage2_exec-cmdline.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/pre_stage2_exec-common.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/pre_stage2_exec-disk_io.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/pre_stage2_exec-fsys_ext2fs.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/pre_stage2_exec-fsys_fat.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/pre_stage2_exec-fsys_ffs.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/pre_stage2_exec-fsys_minix.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/pre_stage2_exec-fsys_reiserfs.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/pre_stage2_exec-fsys_vstafs.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/pre_stage2_exec-gunzip.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/pre_stage2_exec-hercules.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/pre_stage2_exec-md5.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/pre_stage2_exec-serial.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/pre_stage2_exec-smp-imps.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/pre_stage2_exec-stage2.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/reiserfs_stage1_5_exec-bios.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/reiserfs_stage1_5_exec-char_io.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/reiserfs_stage1_5_exec-common.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/reiserfs_stage1_5_exec-disk_io.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/reiserfs_stage1_5_exec-fsys_reiserfs.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/reiserfs_stage1_5_exec-stage1_5.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/vstafs_stage1_5_exec-bios.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/vstafs_stage1_5_exec-char_io.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/vstafs_stage1_5_exec-common.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/vstafs_stage1_5_exec-disk_io.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/vstafs_stage1_5_exec-fsys_vstafs.Po@_am_quote@ -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/vstafs_stage1_5_exec-stage1_5.Po@_am_quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diskless_exec-bios.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diskless_exec-boot.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diskless_exec-builtins.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diskless_exec-char_io.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diskless_exec-cmdline.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diskless_exec-common.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diskless_exec-disk_io.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diskless_exec-fsys_ext2fs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diskless_exec-fsys_fat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diskless_exec-fsys_ffs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diskless_exec-fsys_minix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diskless_exec-fsys_reiserfs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diskless_exec-fsys_vstafs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diskless_exec-gunzip.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diskless_exec-hercules.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diskless_exec-md5.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diskless_exec-serial.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diskless_exec-smp-imps.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diskless_exec-stage2.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/e2fs_stage1_5_exec-bios.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/e2fs_stage1_5_exec-char_io.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/e2fs_stage1_5_exec-common.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/e2fs_stage1_5_exec-disk_io.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/e2fs_stage1_5_exec-fsys_ext2fs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/e2fs_stage1_5_exec-stage1_5.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fat_stage1_5_exec-bios.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fat_stage1_5_exec-char_io.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fat_stage1_5_exec-common.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fat_stage1_5_exec-disk_io.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fat_stage1_5_exec-fsys_fat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fat_stage1_5_exec-stage1_5.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ffs_stage1_5_exec-bios.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ffs_stage1_5_exec-char_io.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ffs_stage1_5_exec-common.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ffs_stage1_5_exec-disk_io.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ffs_stage1_5_exec-fsys_ffs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ffs_stage1_5_exec-stage1_5.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libgrub_a-boot.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libgrub_a-builtins.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libgrub_a-char_io.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libgrub_a-cmdline.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libgrub_a-common.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libgrub_a-disk_io.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libgrub_a-fsys_ext2fs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libgrub_a-fsys_fat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libgrub_a-fsys_ffs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libgrub_a-fsys_minix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libgrub_a-fsys_reiserfs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libgrub_a-fsys_vstafs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libgrub_a-gunzip.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libgrub_a-md5.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/libgrub_a-stage2.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/minix_stage1_5_exec-bios.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/minix_stage1_5_exec-char_io.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/minix_stage1_5_exec-common.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/minix_stage1_5_exec-disk_io.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/minix_stage1_5_exec-fsys_minix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/minix_stage1_5_exec-stage1_5.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pre_stage2_exec-bios.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pre_stage2_exec-boot.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pre_stage2_exec-builtins.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pre_stage2_exec-char_io.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pre_stage2_exec-cmdline.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pre_stage2_exec-common.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pre_stage2_exec-disk_io.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pre_stage2_exec-fsys_ext2fs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pre_stage2_exec-fsys_fat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pre_stage2_exec-fsys_ffs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pre_stage2_exec-fsys_minix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pre_stage2_exec-fsys_reiserfs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pre_stage2_exec-fsys_vstafs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pre_stage2_exec-gunzip.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pre_stage2_exec-hercules.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pre_stage2_exec-md5.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pre_stage2_exec-serial.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pre_stage2_exec-smp-imps.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pre_stage2_exec-stage2.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/reiserfs_stage1_5_exec-bios.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/reiserfs_stage1_5_exec-char_io.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/reiserfs_stage1_5_exec-common.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/reiserfs_stage1_5_exec-disk_io.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/reiserfs_stage1_5_exec-fsys_reiserfs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/reiserfs_stage1_5_exec-stage1_5.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vstafs_stage1_5_exec-bios.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vstafs_stage1_5_exec-char_io.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vstafs_stage1_5_exec-common.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vstafs_stage1_5_exec-disk_io.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vstafs_stage1_5_exec-fsys_vstafs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vstafs_stage1_5_exec-stage1_5.Po@am__quote@ distclean-depend: -rm -rf $(DEPDIR) @@ -2035,10 +2044,10 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ GTAGS: here=`CDPATH=: && cd $(top_builddir) && pwd` \ && cd $(top_srcdir) \ - && gtags -i $$here + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH check-TESTS: $(TESTS) @failed=0; all=0; xfail=0; xpass=0; \ @@ -2188,7 +2197,7 @@ mostlyclean-am: mostlyclean-compile mostlyclean-generic uninstall-am: uninstall-info-am uninstall-pkgdataDATA -.PHONY: all all-am check check-TESTS check-am clean clean-generic \ +.PHONY: GTAGS all all-am check check-TESTS check-am clean clean-generic \ clean-noinstLIBRARIES clean-noinstPROGRAMS distclean \ distclean-compile distclean-depend distclean-generic \ distclean-tags distdir dvi dvi-am info info-am install \ diff --git a/stage2/compile b/stage2/compile deleted file mode 100644 index d4a34aa0e..000000000 --- a/stage2/compile +++ /dev/null @@ -1,82 +0,0 @@ -#! /bin/sh - -# Wrapper for compilers which do not understand `-c -o'. - -# Copyright 1999, 2000 Free Software Foundation, Inc. -# Written by Tom Tromey . -# -# 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. - -# Usage: -# compile PROGRAM [ARGS]... -# `-o FOO.o' is removed from the args passed to the actual compile. - -prog=$1 -shift - -ofile= -cfile= -args= -while test $# -gt 0; do - case "$1" in - -o) - ofile=$2 - shift - ;; - *.c) - cfile=$1 - args="$args $1" - ;; - *) - args="$args $1" - ;; - esac - shift -done - -test -z "$ofile" && { - echo "compile: no \`-o' option seen" 1>&2 - exit 1 -} - -test -z "$cfile" && { - echo "compile: no \`.c' file seen" 1>&2 - exit 1 -} - -# Name of file we expect compiler to create. -cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'` - -# Create the lock directory. -lockdir=`echo $ofile | sed -e 's|/|_|g'` -while true; do - if mkdir $lockdir > /dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir $lockdir; exit 1" 1 2 15 - -# Run the compile. -"$prog" $args -status=$? - -if test -f "$cofile"; then - mv "$cofile" "$ofile" -fi - -rmdir $lockdir -exit $status diff --git a/util/Makefile.am b/util/Makefile.am index f84193c6a..2ac4de794 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -1,6 +1,9 @@ bin_PROGRAMS = mbchk sbin_SCRIPTS = grub-install grub-md5-crypt noinst_SCRIPTS = grub-image +noinst_DATA = menu.lst + +EXTRA_DIST = $(noinst_DATA) # XXX: Need to search for a header file in docs, because of multiboot.h. AM_CFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/docs diff --git a/util/Makefile.in b/util/Makefile.in index 716be9578..31ab7fbac 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4h from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -63,6 +63,7 @@ ASFLAGS = @ASFLAGS@ AWK = @AWK@ CC = @CC@ DEPDIR = @DEPDIR@ +EXEEXT = @EXEEXT@ FSYS_CFLAGS = @FSYS_CFLAGS@ GRUB_CFLAGS = @GRUB_CFLAGS@ GRUB_LIBS = @GRUB_LIBS@ @@ -72,14 +73,15 @@ NETBOOT_DRIVERS = @NETBOOT_DRIVERS@ NET_CFLAGS = @NET_CFLAGS@ NET_EXTRAFLAGS = @NET_EXTRAFLAGS@ OBJCOPY = @OBJCOPY@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ RANLIB = @RANLIB@ STAGE1_CFLAGS = @STAGE1_CFLAGS@ STAGE2_CFLAGS = @STAGE2_CFLAGS@ VERSION = @VERSION@ -_am_include = @_am_include@ -_am_quote = @_am_quote@ +am__include = @am__include@ +am__quote = @am__quote@ host_cpu = @host_cpu@ host_vendor = @host_vendor@ install_sh = @install_sh@ @@ -87,14 +89,15 @@ install_sh = @install_sh@ bin_PROGRAMS = mbchk sbin_SCRIPTS = grub-install grub-md5-crypt noinst_SCRIPTS = grub-image +noinst_DATA = menu.lst + +EXTRA_DIST = $(noinst_DATA) # XXX: Need to search for a header file in docs, because of multiboot.h. AM_CFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/docs mbchk_SOURCES = mbchk.c mbchk_LDADD = ../lib/libcommon.a -EXEEXT = -OBJEXT = o subdir = util mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h @@ -122,6 +125,8 @@ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ CFLAGS = @CFLAGS@ DIST_SOURCES = $(mbchk_SOURCES) +DATA = $(noinst_DATA) + DIST_COMMON = Makefile.am Makefile.in grub-image.in grub-install.in \ grub-md5-crypt.in SOURCES = $(mbchk_SOURCES) @@ -147,8 +152,10 @@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + ; then \ + f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ @@ -164,7 +171,7 @@ uninstall-binPROGRAMS: clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -mbchk$(EXEEXT): $(mbchk_OBJECTS) $(mbchk_DEPENDENCIES) +mbchk$(EXEEXT): $(mbchk_OBJECTS) $(mbchk_DEPENDENCIES) @rm -f mbchk$(EXEEXT) $(LINK) $(mbchk_LDFLAGS) $(mbchk_OBJECTS) $(mbchk_LDADD) $(LIBS) install-sbinSCRIPTS: $(sbin_SCRIPTS) @@ -195,7 +202,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@_am_include@ @_am_quote@$(DEPDIR)/mbchk.Po@_am_quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mbchk.Po@am__quote@ distclean-depend: -rm -rf $(DEPDIR) @@ -241,10 +248,10 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ GTAGS: here=`CDPATH=: && cd $(top_builddir) && pwd` \ && cd $(top_srcdir) \ - && gtags -i $$here + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -269,7 +276,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) $(SCRIPTS) +all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) installdirs: $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) @@ -335,13 +342,13 @@ mostlyclean-am: mostlyclean-compile mostlyclean-generic uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ uninstall-sbinSCRIPTS -.PHONY: all all-am check check-am clean clean-binPROGRAMS clean-generic \ - distclean distclean-compile distclean-depend distclean-generic \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-am install-binPROGRAMS install-data install-data-am \ - install-exec install-exec-am install-info install-info-am \ - install-man install-sbinSCRIPTS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ +.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic distclean distclean-compile distclean-depend \ + distclean-generic distclean-tags distdir dvi dvi-am info \ + info-am install install-am install-binPROGRAMS install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-sbinSCRIPTS install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic tags uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-info-am uninstall-sbinSCRIPTS