From: Jim Meyering Date: Sun, 23 Mar 1997 02:56:47 +0000 (+0000) Subject: . X-Git-Tag: SH-UTILS-1_16a~149 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=c7b5fd24230e667e3590e53883bb8f6f2b35ee54;p=thirdparty%2Fcoreutils.git . --- diff --git a/doc/Makefile.in b/doc/Makefile.in index eedf707d5e..8cd2e8fdc1 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.1l from Makefile.am +# Makefile.in generated automatically by automake 1.1m from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -32,20 +32,32 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -YACC = @YACC@ -GENCAT = @GENCAT@ -PERL = @PERL@ -MV = @MV@ -GMSGFMT = @GMSGFMT@ +ANSI2KNR = @ANSI2KNR@ CC = @CC@ -RANLIB = @RANLIB@ +DF_PROG = @DF_PROG@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +LIBOBJS = @LIBOBJS@ LN = @LN@ +MAINT = @MAINT@ +MV = @MV@ +MVDIR_PROG = @MVDIR_PROG@ +PACKAGE = @PACKAGE@ +PERL = @PERL@ +RANLIB = @RANLIB@ RM = @RM@ +U = @U@ +VERSION = @VERSION@ +YACC = @YACC@ info_TEXINFOS = fileutils.texi @@ -69,19 +81,16 @@ DIST_COMMON = Makefile.am Makefile.in mdate-sh stamp-vti texinfo.tex \ version.texi -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ - $(TEXINFOS) $(MANS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar +GZIP = --best default: all .SUFFIXES: .SUFFIXES: .texi .texinfo .info .dvi .ps -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) - cd $(top_srcdir) && automake --gnu doc/Makefile +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ @@ -89,15 +98,16 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) version.texi: @MAINT@stamp-vti + cp $(srcdir)/stamp-vti $(srcdir)/version.texi stamp-vti: fileutils.texi $(top_srcdir)/configure.in echo "@set UPDATED `cd $(srcdir) \ && $(SHELL) ./mdate-sh fileutils.texi`" > vti.tmp echo "@set EDITION $(VERSION)" >> vti.tmp echo "@set VERSION $(VERSION)" >> vti.tmp - cmp -s vti.tmp $(srcdir)/version.texi || cp vti.tmp $(srcdir)/version.texi - rm vti.tmp - echo timestamp > $(srcdir)/stamp-vti + cmp -s vti.tmp $(srcdir)/stamp-vti \ + || cp vti.tmp $(srcdir)/stamp-vti + rm -f vti.tmp mostlyclean-vti: rm -f vti.tmp @@ -123,10 +133,18 @@ DVIPS = dvips TEXINPUTS=$(srcdir):$$TEXINPUTS \ MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< +.texi: + cd $(srcdir) \ + && $(MAKEINFO) `echo $< | sed 's,.*/,,'` + .texinfo.info: cd $(srcdir) \ && $(MAKEINFO) `echo $< | sed 's,.*/,,'` +.texinfo: + cd $(srcdir) \ + && $(MAKEINFO) `echo $< | sed 's,.*/,,'` + .texinfo.dvi: TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $< .dvi.ps: @@ -138,7 +156,7 @@ install-info-am: $(INFO_DEPS) @for file in $(INFO_DEPS); do \ for ifile in `cd $(srcdir) && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \ if test -f $(srcdir)/$$ifile; then \ - echo "$(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile"; \ + echo " $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile"; \ $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \ else : ; fi; \ done; \ @@ -146,7 +164,7 @@ install-info-am: $(INFO_DEPS) $(POST_INSTALL) @if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ for file in $(INFO_DEPS); do \ - echo "install-info --info-dir=$(infodir) $(infodir)/$$file";\ + echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\ install-info --info-dir=$(infodir) $(infodir)/$$file; :;\ done; \ else : ; fi @@ -173,8 +191,9 @@ dist-info: $(INFO_DEPS) mostlyclean-info: rm -f fileutils.aux fileutils.cp fileutils.cps fileutils.dvi \ fileutils.fn fileutils.fns fileutils.ky fileutils.log \ - fileutils.pg fileutils.toc fileutils.tp fileutils.vr \ - fileutils.op + fileutils.pg fileutils.toc fileutils.tp fileutils.tps \ + fileutils.vr fileutils.vrs fileutils.op fileutils.tr \ + fileutils.cv clean-info: diff --git a/lib/Makefile.in b/lib/Makefile.in index 3ba5ee0cf4..f3bbbaa1d9 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.1l from Makefile.am +# Makefile.in generated automatically by automake 1.1m from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -32,20 +32,32 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -YACC = @YACC@ -GENCAT = @GENCAT@ -PERL = @PERL@ -MV = @MV@ -GMSGFMT = @GMSGFMT@ +ANSI2KNR = @ANSI2KNR@ CC = @CC@ -RANLIB = @RANLIB@ +DF_PROG = @DF_PROG@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +LIBOBJS = @LIBOBJS@ LN = @LN@ +MAINT = @MAINT@ +MV = @MV@ +MVDIR_PROG = @MVDIR_PROG@ +PACKAGE = @PACKAGE@ +PERL = @PERL@ +RANLIB = @RANLIB@ RM = @RM@ +U = @U@ +VERSION = @VERSION@ +YACC = @YACC@ noinst_LIBRARIES = libfu.a @@ -85,44 +97,39 @@ isdir.o long-options.o makepath.o modechange.o path-concat.o \ safe-read.o save-cwd.o savedir.o stripslash.o userspec.o xgetcwd.o \ xmalloc.o xstrdup.o xstrtol.o xstrtoul.o yesno.o AR = ar -INTERLOCK = ./interlock -YLWRAP = ./ylwrap +INTERLOCK = $(srcdir)/interlock +YLWRAP = $(srcdir)/ylwrap CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) LINK = $(CC) $(LDFLAGS) -o $@ HEADERS = $(noinst_HEADERS) -DIST_COMMON = Makefile.am Makefile.in alloca.c basename.c chown.c \ -error.c error.h euidaccess.c fileblocks.c fnmatch.c fsusage.c \ -ftruncate.c getdate.c getgroups.c getline.c group-member.c interlock \ -memcmp.c memcpy.c memset.c mkdir.c mktime.c mountlist.c obstack.c \ -obstack.h posixtm.c regex.c regex.h rename.c rmdir.c rpmatch.c rx.c \ -rx.h stpcpy.c strcasecmp.c strdup.c strftime.c strndup.c strstr.c \ -strtol.c strtoul.c ylwrap +DIST_COMMON = Makefile.am Makefile.in alloca.c basename.c error.c \ +error.h euidaccess.c fileblocks.c fnmatch.c fsusage.c ftruncate.c \ +getdate.c group-member.c interlock memcmp.c memcpy.c memset.c mkdir.c \ +mountlist.c obstack.c obstack.h posixtm.c regex.c regex.h rename.c \ +rmdir.c rpmatch.c rx.c rx.h stpcpy.c strcasecmp.c strdup.c strndup.c \ +strstr.c strtol.c strtoul.c ylwrap -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ - $(TEXINFOS) $(MANS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar +GZIP = --best DEP_FILES = .deps/alloca.P .deps/argmatch.P .deps/backupfile.P \ -.deps/basename.P .deps/chown.P .deps/dirname.P .deps/error.P \ -.deps/euidaccess.P .deps/fileblocks.P .deps/filemode.P .deps/fnmatch.P \ -.deps/fsusage.P .deps/ftruncate.P .deps/full-write.P .deps/getdate.P \ -.deps/getgroups.P .deps/getline.P .deps/getopt.P .deps/getopt1.P \ -.deps/getversion.P .deps/group-member.P .deps/idcache.P .deps/isdir.P \ -.deps/long-options.P .deps/makepath.P .deps/memcmp.P .deps/memcpy.P \ -.deps/memset.P .deps/mkdir.P .deps/mktime.P .deps/modechange.P \ +.deps/basename.P .deps/dirname.P .deps/error.P .deps/euidaccess.P \ +.deps/fileblocks.P .deps/filemode.P .deps/fnmatch.P .deps/fsusage.P \ +.deps/ftruncate.P .deps/full-write.P .deps/getdate.P .deps/getopt.P \ +.deps/getopt1.P .deps/getversion.P .deps/group-member.P .deps/idcache.P \ +.deps/isdir.P .deps/long-options.P .deps/makepath.P .deps/memcmp.P \ +.deps/memcpy.P .deps/memset.P .deps/mkdir.P .deps/modechange.P \ .deps/mountlist.P .deps/obstack.P .deps/path-concat.P .deps/posixtm.P \ .deps/regex.P .deps/rename.P .deps/rmdir.P .deps/rpmatch.P .deps/rx.P \ .deps/safe-read.P .deps/save-cwd.P .deps/savedir.P .deps/stpcpy.P \ -.deps/strcasecmp.P .deps/strdup.P .deps/strftime.P .deps/stripslash.P \ -.deps/strndup.P .deps/strstr.P .deps/strtol.P .deps/strtoul.P \ -.deps/userspec.P .deps/xgetcwd.P .deps/xmalloc.P .deps/xstrdup.P \ -.deps/xstrtol.P .deps/xstrtoul.P .deps/yesno.P +.deps/strcasecmp.P .deps/strdup.P .deps/stripslash.P .deps/strndup.P \ +.deps/strstr.P .deps/strtol.P .deps/strtoul.P .deps/userspec.P \ +.deps/xgetcwd.P .deps/xmalloc.P .deps/xstrdup.P .deps/xstrtol.P \ +.deps/xstrtoul.P .deps/yesno.P SOURCES = $(libfu_a_SOURCES) OBJECTS = $(libfu_a_OBJECTS) @@ -130,8 +137,8 @@ default: all .SUFFIXES: .SUFFIXES: .c .o .y -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) - cd $(top_srcdir) && automake --gnu lib/Makefile +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ diff --git a/tests/ls/Makefile.in b/tests/ls/Makefile.in index 0cbc8e872f..8a7c8f0269 100644 --- a/tests/ls/Makefile.in +++ b/tests/ls/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.1l from Makefile.am +# Makefile.in generated automatically by automake 1.1m from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -32,19 +32,31 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -YACC = @YACC@ -GENCAT = @GENCAT@ -MV = @MV@ -GMSGFMT = @GMSGFMT@ +ANSI2KNR = @ANSI2KNR@ CC = @CC@ -RANLIB = @RANLIB@ +DF_PROG = @DF_PROG@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +LIBOBJS = @LIBOBJS@ LN = @LN@ +MAINT = @MAINT@ +MV = @MV@ +MVDIR_PROG = @MVDIR_PROG@ +PACKAGE = @PACKAGE@ +RANLIB = @RANLIB@ RM = @RM@ +U = @U@ +VERSION = @VERSION@ +YACC = @YACC@ x = ls explicit = '""""" "' b @@ -71,19 +83,16 @@ SCRIPTS = $(noinst_SCRIPTS) DIST_COMMON = Makefile.am Makefile.in -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ - $(TEXINFOS) $(MANS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar +GZIP = --best default: all .SUFFIXES: .SUFFIXES: .pl -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) - cd $(top_srcdir) && automake --gnu tests/ls/Makefile +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/ls/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ diff --git a/tests/ls/ls-tests b/tests/ls/ls-tests new file mode 100755 index 0000000000..ad18446671 --- /dev/null +++ b/tests/ls/ls-tests @@ -0,0 +1,52 @@ +#! /bin/sh +# This script was generated automatically by build-script. +case $# in + 0) xx='../../src/ls';; + *) xx="$1";; +esac +test "$VERBOSE" && echo=echo || echo=: +$echo testing program: $xx +errors=0 +test "$srcdir" || srcdir=. +test "$VERBOSE" && $xx --version 2> /dev/null +$xx -b $srcdir/'""""" "' $srcdir/b > q1.O 2> q1.E +code=$? +if test $code != 0 ; then + $echo "Test q1 failed: ../../src/ls return code $code differs from expected value 0" 1>&2 + errors=`expr $errors + 1` +else + cmp q1.O $srcdir/q1.X + case $? in + 0) if test "$VERBOSE" ; then $echo "passed q1"; fi ;; + 1) $echo "Test q1 failed: files q1.O and $srcdir/q1.X differ" 1>&2; + errors=`expr $errors + 1` ;; + 2) $echo "Test q1 may have failed." 1>&2; + $echo The command "cmp q1.O $srcdir/q1.X" failed. 1>&2 ; + errors=`expr $errors + 1` ;; + esac +fi +test -s q1.E || rm -f q1.E +$xx -b -Q $srcdir/'""""" "' $srcdir/b > q2.O 2> q2.E +code=$? +if test $code != 0 ; then + $echo "Test q2 failed: ../../src/ls return code $code differs from expected value 0" 1>&2 + errors=`expr $errors + 1` +else + cmp q2.O $srcdir/q2.X + case $? in + 0) if test "$VERBOSE" ; then $echo "passed q2"; fi ;; + 1) $echo "Test q2 failed: files q2.O and $srcdir/q2.X differ" 1>&2; + errors=`expr $errors + 1` ;; + 2) $echo "Test q2 may have failed." 1>&2; + $echo The command "cmp q2.O $srcdir/q2.X" failed. 1>&2 ; + errors=`expr $errors + 1` ;; + esac +fi +test -s q2.E || rm -f q2.E +if test $errors = 0 ; then + $echo Passed all 2 tests. 1>&2 +else + $echo Failed $errors tests. 1>&2 +fi +test $errors = 0 || errors=1 +exit $errors