From eb91e2d147ea9bb68caa88847afbdf5fdb083d05 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 26 Aug 2000 20:20:50 +0000 Subject: [PATCH] * m4/depend.m4 (depcpp): Use `-o conftest.o'. Fix for PR automake/74. From js pendry. --- ChangeLog | 5 +++++ Makefile.in | 24 ++++++++++++------------ THANKS | 1 + m4/Makefile.in | 17 +++++++++-------- m4/depend.m4 | 5 ++++- stamp-vti | 2 +- version.texi | 2 +- 7 files changed, 33 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 08984c78e..e6bac223c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-08-26 Tom Tromey + + * m4/depend.m4 (depcpp): Use `-o conftest.o'. + Fix for PR automake/74. From js pendry. + 2000-08-20 Eli Zaretskii * depcomp (gcc): Support DOS-style absolute file names with drive diff --git a/Makefile.in b/Makefile.in index 3d18f6b5c..ab724b943 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ # Makefile.in generated automatically by automake 1.4a from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -31,8 +31,6 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -135,7 +133,7 @@ all: all-redirect $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnits Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -177,9 +175,11 @@ $(srcdir)/version.texi: stamp-vti @: $(srcdir)/stamp-vti: automake.texi $(top_srcdir)/configure.in - @echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/automake.texi`" > vti.tmp - @echo "@set EDITION $(VERSION)" >> vti.tmp - @echo "@set VERSION $(VERSION)" >> vti.tmp + @(set `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/automake.texi`; \ + echo "@set UPDATED $$1 $$2 $$3"; \ + echo "@set UPDATED-MONTH $$2 $$3"; \ + echo "@set EDITION $(VERSION)"; \ + echo "@set VERSION $(VERSION)") > vti.tmp @cmp -s vti.tmp $(srcdir)/version.texi \ || (echo "Updating $(srcdir)/version.texi"; \ cp vti.tmp $(srcdir)/version.texi) @@ -292,7 +292,6 @@ dist-info: $(INFO_DEPS) d=$(srcdir); \ for file in `CDPATH=: && cd $$d && eval echo $$base*`; do \ test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done; \ done @@ -414,7 +413,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - mkid -f$$here/ID $$unique $(LISP) + mkid -fID $$unique $(LISP) TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -503,11 +502,12 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir); \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ else \ test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done for subdir in $(SUBDIRS); do \ diff --git a/THANKS b/THANKS index c6c6d0188..ffae4535e 100644 --- a/THANKS +++ b/THANKS @@ -57,6 +57,7 @@ John Pierce hawkfan@pyrotechnics.com John W. Coomes jcoomes@eng.Sun.COM Josh MacDonald jmacd@cs.berkeley.edu Joshua Cowan jcowan@jcowan.reslife.okstate.edu +js pendry js.pendry@msdw.com Juergen A. Erhard jae@laden.ilk.de Karl Berry kb@cs.umb.edu Karl Heuer kwzh@gnu.org diff --git a/m4/Makefile.in b/m4/Makefile.in index ef2764121..3d288c8bb 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -1,6 +1,6 @@ # Makefile.in generated automatically by automake 1.4a from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -31,8 +31,6 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -57,6 +55,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : + +@SET_MAKE@ AMTAR = @AMTAR@ AMTARFLAGS = @AMTARFLAGS@ AWK = @AWK@ @@ -84,7 +84,7 @@ CONFIG_CLEAN_FILES = DIST_SOURCES = DATA = $(m4data_DATA) -DIST_COMMON = $(m4data_DATA) Makefile.am Makefile.in +DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -95,7 +95,7 @@ all: all-redirect $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnits m4/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 @@ -127,11 +127,12 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir); \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ else \ test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done info-am: diff --git a/m4/depend.m4 b/m4/depend.m4 index fb8f07ebe..0f004f993 100644 --- a/m4/depend.m4 +++ b/m4/depend.m4 @@ -41,10 +41,13 @@ if test -z "$AMDEP"; then ;; 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 $am_depcomp $depcc -c conftest.c 2>/dev/null && + $SHELL $am_depcomp $depcc -c conftest.c -o conftest.o 2>/dev/null && grep conftest.h conftest.Po > /dev/null 2>&1; then am_cv_[$1]_dependencies_compiler_type="$depmode" break diff --git a/stamp-vti b/stamp-vti index fb6d9865c..8099d4120 100644 --- a/stamp-vti +++ b/stamp-vti @@ -1,3 +1,3 @@ -@set UPDATED 8 May 2000 +@set UPDATED 4 August 2000 @set EDITION 1.4a @set VERSION 1.4a diff --git a/version.texi b/version.texi index fb6d9865c..8099d4120 100644 --- a/version.texi +++ b/version.texi @@ -1,3 +1,3 @@ -@set UPDATED 8 May 2000 +@set UPDATED 4 August 2000 @set EDITION 1.4a @set VERSION 1.4a -- 2.47.2