From 4e16ec15dcae4cc9d54bc4b578c0317f5239d649 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 22 Jun 2000 13:01:43 +0000 Subject: [PATCH] Ensure /usr/include and the like stay out of dependencies. --- bfd/ChangeLog | 7 +++++++ bfd/Makefile.am | 8 ++++++-- bfd/Makefile.in | 10 +++++++--- bfd/doc/Makefile.in | 2 +- opcodes/ChangeLog | 6 ++++++ opcodes/Makefile.am | 8 ++++++-- opcodes/Makefile.in | 10 +++++++--- 7 files changed, 40 insertions(+), 11 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index fe5606e5fb..edf5d212da 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2000-06-22 Alan Modra + + * Makefile.am (DEP): grep for leading `/' in DEP1, and fail if we + find one. + * Makefile.in: Regenerate. + * doc/Makefile.in: Regenerate. + 2000-06-20 H.J. Lu * Makefile.am: Rebuild dependency. diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 586c6174fa..114a6266d6 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -576,8 +576,12 @@ install-data-local: $(BFD_H) DEP: dep.sed $(CFILES) $(HFILES) bfd.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) echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2 diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 4aa68c53f9..7b31b59c96 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -671,7 +671,7 @@ configure.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best SOURCES = $(libbfd_a_SOURCES) $(libbfd_la_SOURCES) OBJECTS = $(libbfd_a_OBJECTS) $(libbfd_la_OBJECTS) @@ -1116,8 +1116,12 @@ install-data-local: $(BFD_H) DEP: dep.sed $(CFILES) $(HFILES) bfd.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) echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2 diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in index 80be82a2b5..e45ab482ca 100644 --- a/bfd/doc/Makefile.in +++ b/bfd/doc/Makefile.in @@ -188,7 +188,7 @@ DIST_COMMON = ChangeLog Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 676c97b72c..1060d30b75 100644 --- a/opcodes/ChangeLog +++ b/opcodes/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 H.J. Lu * Makefile.am: Rebuild dependency. diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index 565b1caf23..f4af0468a9 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -250,8 +250,12 @@ ia64-asmtab.c: @MAINT@ ia64-gen ia64-ic.tbl ia64-raw.tbl ia64-waw.tbl ia64-war.t DEP: dep.sed $(CFILES) $(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) echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2 diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index bf5f166753..d189e6aab2 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -334,7 +334,7 @@ acinclude.m4 aclocal.m4 config.in configure configure.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best SOURCES = libopcodes.a.c $(libopcodes_la_SOURCES) OBJECTS = libopcodes.a.o $(libopcodes_la_OBJECTS) @@ -748,8 +748,12 @@ ia64-asmtab.c: @MAINT@ ia64-gen ia64-ic.tbl ia64-raw.tbl ia64-waw.tbl ia64-war.t DEP: dep.sed $(CFILES) $(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) echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2 -- 2.11.0