diff options
-rw-r--r-- | doc/Makefile.in | 12 | ||||
-rw-r--r-- | lib/Makefile.in | 19 | ||||
-rw-r--r-- | m4/Makefile.in | 13 | ||||
-rw-r--r-- | tests/ls/Makefile.in | 32 |
4 files changed, 30 insertions, 46 deletions
diff --git a/doc/Makefile.in b/doc/Makefile.in index 28a1b9751..ed7b1078d 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.1p from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. @@ -49,10 +49,6 @@ POST_INSTALL = true NORMAL_UNINSTALL = true PRE_UNINSTALL = true POST_UNINSTALL = true -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -199,7 +195,7 @@ install-info-am: $(INFO_DEPS) @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ for file in $(INFO_DEPS); do \ echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\ - install-info --info-dir=$(infodir) $(infodir)/$$file; :;\ + install-info --info-dir=$(infodir) $(infodir)/$$file || :;\ done; \ else : ; fi @@ -278,7 +274,7 @@ uninstall: uninstall-info all: Makefile $(INFO_DEPS) install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: $(mkinstalldirs) $(infodir) diff --git a/lib/Makefile.in b/lib/Makefile.in index 49a47d553..73e2ddb4c 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.1p from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. @@ -49,10 +49,6 @@ POST_INSTALL = true NORMAL_UNINSTALL = true PRE_UNINSTALL = true POST_UNINSTALL = true -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -167,7 +163,7 @@ default: all $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnits lib/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -241,9 +237,10 @@ distdir: $(DISTFILES) MKDEP = gcc -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -include .deps/.P .deps/.P: $(BUILT_SOURCES) - test -d .deps || { mkdir .deps;echo > $@; } + echo > $@ -include $(DEP_FILES) @@ -260,7 +257,9 @@ maintainer-clean-depend: @echo "Computing dependencies for $<..." @o='o'; \ test -n "$o" && o='$$o'; \ - $(MKDEP) $< | sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," > $@ + $(MKDEP) $< >$@.tmp \ + && sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," < $@.tmp > $@ \ + && rm -f $@.tmp info: dvi: check: all @@ -280,7 +279,7 @@ uninstall: all: Makefile $(LIBRARIES) $(HEADERS) install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: diff --git a/m4/Makefile.in b/m4/Makefile.in index 820452881..651453abc 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -58,39 +58,32 @@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ +DF_PROG = @DF_PROG@ GENCAT = @GENCAT@ -GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNU_PACKAGE = @GNU_PACKAGE@ GT_NO = @GT_NO@ GT_YES = @GT_YES@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ -KMEM_GROUP = @KMEM_GROUP@ LIBOBJS = @LIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MAN = @MAN@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -NEED_SETGID = @NEED_SETGID@ -OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@ -OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@ +MVDIR_PROG = @MVDIR_PROG@ PACKAGE = @PACKAGE@ PERL = @PERL@ POFILES = @POFILES@ POSUB = @POSUB@ -POW_LIBM = @POW_LIBM@ RANLIB = @RANLIB@ -SEQ_LIBM = @SEQ_LIBM@ -SQRT_LIBM = @SQRT_LIBM@ U = @U@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +YACC = @YACC@ l = @l@ EXTRA_DIST = README \ diff --git a/tests/ls/Makefile.in b/tests/ls/Makefile.in index a607bded5..85bff025f 100644 --- a/tests/ls/Makefile.in +++ b/tests/ls/Makefile.in @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.1p from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. @@ -49,10 +49,6 @@ POST_INSTALL = true NORMAL_UNINSTALL = true PRE_UNINSTALL = true POST_UNINSTALL = true -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -69,18 +65,15 @@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ LIBOBJS = @LIBOBJS@ -LN = @LN@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MV = @MV@ MVDIR_PROG = @MVDIR_PROG@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ -RM = @RM@ U = @U@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -151,24 +144,27 @@ check-TESTS: $(TESTS) @failed=0; all=0; \ srcdir=$(srcdir); export srcdir; \ for tst in $(TESTS); do \ - all=`expr $$all + 1`; \ if test -f $$tst; then dir=.; \ else dir="$(srcdir)"; fi; \ if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \ + all=`expr $$all + 1`; \ echo "PASS: $$tst"; \ - else \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ failed=`expr $$failed + 1`; \ echo "FAIL: $$tst"; \ fi; \ done; \ if test "$$failed" -eq 0; then \ - echo "========================"; \ - echo "All $$all tests passed"; \ - echo "========================"; \ + banner="All $$all tests passed"; \ else \ - echo "$$failed of $$all tests failed"; \ - exit 1; \ - fi + banner="$$failed of $$all tests failed"; \ + fi; \ + dashes=`echo "$$banner" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0 info: dvi: check: all @@ -188,7 +184,7 @@ uninstall: all: Makefile $(SCRIPTS) install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: |