From 6d5be9157ea05325728d90e08ca13b3589f941a5 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 22 Jun 2000 13:14:21 +0000 Subject: [PATCH] Check dependecies for leading `/' in this dir too. --- binutils/ChangeLog | 6 ++++++ binutils/Makefile.am | 8 ++++++-- binutils/Makefile.in | 10 +++++++--- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index ce7c8f55f4e..e1fc95b7c2d 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2000-06-22 Alan Modra + + * Makefile.am (DEP): grep for leading `/' in DEP1, and fail if we + find one. + * Makefile.in: Regenerate. + 2000-06-20 Alexander Aganichev * ar.c (normalize): Correct pointer comparison when checking for diff --git a/binutils/Makefile.am b/binutils/Makefile.am index 837f861330e..c3b09cd48e8 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -287,8 +287,12 @@ DISTCLEANFILES = stamp-under sysinfo underscore.c sysroff.c sysroff.h \ DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h rm -f DEP1 $(MAKE) MKDEP="$(MKDEP)" DEP1 - sed -f dep.sed < DEP1 > $@ - echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> $@ + if grep ' /' DEP1 > /dev/null 2> /dev/null; then \ + echo 'make DEP failed!'; exit 1; \ + else \ + sed -f dep.sed < DEP1 > $@; \ + echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> $@; \ + fi DEP1: $(CFILES) $(GENERATED_CFILES) echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2 diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 0e99f1bb6be..7e51ccce7d3 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -414,7 +414,7 @@ configure.in deflex.c defparse.c nlmheader.c rclex.c rcparse.c DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best SOURCES = $(nlmconv_SOURCES) $(srconv_SOURCES) $(sysdump_SOURCES) $(coffdump_SOURCES) $(dlltool_SOURCES) $(windres_SOURCES) $(dllwrap_SOURCES) $(size_SOURCES) $(objdump_SOURCES) $(ar_SOURCES) $(strings_SOURCES) $(ranlib_SOURCES) $(objcopy_SOURCES) $(addr2line_SOURCES) $(readelf_SOURCES) $(nm_new_SOURCES) $(strip_new_SOURCES) $(cxxfilt_SOURCES) OBJECTS = $(nlmconv_OBJECTS) $(srconv_OBJECTS) $(sysdump_OBJECTS) $(coffdump_OBJECTS) $(dlltool_OBJECTS) $(windres_OBJECTS) $(dllwrap_OBJECTS) $(size_OBJECTS) $(objdump_OBJECTS) $(ar_OBJECTS) $(strings_OBJECTS) $(ranlib_OBJECTS) $(objcopy_OBJECTS) $(addr2line_OBJECTS) $(readelf_OBJECTS) $(nm_new_OBJECTS) $(strip_new_OBJECTS) $(cxxfilt_OBJECTS) @@ -1150,8 +1150,12 @@ diststuff: $(DISTSTUFF) info DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h rm -f DEP1 $(MAKE) MKDEP="$(MKDEP)" DEP1 - sed -f dep.sed < DEP1 > $@ - echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> $@ + if grep ' /' DEP1 > /dev/null 2> /dev/null; then \ + echo 'make DEP failed!'; exit 1; \ + else \ + sed -f dep.sed < DEP1 > $@; \ + echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> $@; \ + fi DEP1: $(CFILES) $(GENERATED_CFILES) echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2 -- 2.30.2