diff options
| author | Alan Modra <amodra@gmail.com> | 2000-06-22 13:01:43 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2000-06-22 13:01:43 +0000 |
| commit | 1581f8c9feb992568c0f36d2c76d43f7a75a4750 (patch) | |
| tree | fd86b2f947da0e879eae266d65bddf7d3470dae9 /ld | |
| parent | 45288df104aeefbd6fb98ac40659b1aec6b6bb65 (diff) | |
| download | gdb-1581f8c9feb992568c0f36d2c76d43f7a75a4750.zip gdb-1581f8c9feb992568c0f36d2c76d43f7a75a4750.tar.gz gdb-1581f8c9feb992568c0f36d2c76d43f7a75a4750.tar.bz2 | |
Ensure /usr/include and the like stay out of dependencies.
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/Makefile.am | 8 | ||||
| -rw-r--r-- | ld/Makefile.in | 10 |
3 files changed, 19 insertions, 5 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 104eab9..e4ec1f3 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2000-06-22 Alan Modra <alan@linuxcare.com.au> + + * Makefile.am (DEP): grep for leading `/' in DEP1, and fail if we + find one. + * Makefile.in: Regenerate. + 2000-06-21 H.J. Lu <hjl@gnu.org> * Makefile.am: Rebuild dependency. diff --git a/ld/Makefile.am b/ld/Makefile.am index ec708df..beb6580 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -892,8 +892,12 @@ distclean-local: 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/ld/Makefile.in b/ld/Makefile.in index fc229e5..1ecd920 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -441,7 +441,7 @@ ldgram.c ldlex.c DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best SOURCES = $(ld_new_SOURCES) OBJECTS = $(ld_new_OBJECTS) @@ -1571,8 +1571,12 @@ distclean-local: 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 |