From: "H . J . Lu" <hjl@valinux.com>
To: alan@linuxcare.com.au, nickc@cygnus.com
Cc: binutils@sourceware.cygnus.com
Subject: Patch for bogus DEP check in Makefile.am
Date: Fri, 30 Jun 2000 12:21:00 -0000 [thread overview]
Message-ID: <20000630122129.A7152@valinux.com> (raw)
Most of DEP check in Makefile.am:
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.
are bogus since dep.sed is used to strip those leading `/' in DEP1. As long
as DEP has leading `/', we are fine. Could I check my patch in? I will add
ChangeLog entries when I check them in.
Nick, I sent a patch last night for ld/Makefile.am. Can I check it in also?
Thanks.
--
H.J. Lu (hjl@gnu.org)
--
Index: bfd/Makefile.am
===================================================================
RCS file: /work/cvs/gnu/binutils/bfd/Makefile.am,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile.am
--- bfd/Makefile.am 2000/06/23 19:11:21 1.24
+++ bfd/Makefile.am 2000/06/30 18:41:45
@@ -576,10 +576,10 @@ install-data-local: $(BFD_H)
DEP: dep.sed $(CFILES) $(HFILES) bfd.h
rm -f DEP1
$(MAKE) MKDEP="$(MKDEP)" DEP1
- if grep ' /' DEP1 > /dev/null 2> /dev/null; then \
+ sed -f dep.sed < DEP1 > $@
+ if grep ' /' $@ > /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
Index: binutils/Makefile.am
===================================================================
RCS file: /work/cvs/gnu/binutils/binutils/Makefile.am,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile.am
--- binutils/Makefile.am 2000/06/23 19:11:24 1.12
+++ binutils/Makefile.am 2000/06/30 18:41:51
@@ -287,10 +287,10 @@ DISTCLEANFILES = stamp-under sysinfo und
DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h
rm -f DEP1
$(MAKE) MKDEP="$(MKDEP)" DEP1
- if grep ' /' DEP1 > /dev/null 2> /dev/null; then \
- echo 'make DEP failed!'; exit 1; \
+ sed -f dep.sed < DEP1 > $@
+ if grep ' /' DEP > /dev/null 2> /dev/null; then \
+ echo 'make $@ failed!'; exit 1; \
else \
- sed -f dep.sed < DEP1 > $@; \
echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> $@; \
fi
Index: gprof/Makefile.am
===================================================================
RCS file: /work/cvs/gnu/binutils/gprof/Makefile.am,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.am
--- gprof/Makefile.am 2000/06/23 19:11:24 1.8
+++ gprof/Makefile.am 2000/06/30 18:42:02
@@ -57,10 +57,10 @@ man_MANS = gprof.1
DEP: dep.sed $(gprof_SOURCES) $(noinst_HEADERS) gconfig.h
rm -f DEP1
$(MAKE) MKDEP="$(MKDEP)" DEP1
- if grep ' /' DEP1 > /dev/null 2> /dev/null; then \
+ sed -f dep.sed < DEP1 > $@
+ if grep ' /' DEP > /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
Index: ld/Makefile.am
===================================================================
RCS file: /work/cvs/gnu/binutils/ld/Makefile.am,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile.am
--- ld/Makefile.am 2000/06/23 19:11:25 1.27
+++ ld/Makefile.am 2000/06/30 18:42:10
@@ -892,10 +895,10 @@ distclean-local:
DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h
rm -f DEP1
$(MAKE) MKDEP="$(MKDEP)" DEP1
- if grep ' /' DEP1 > /dev/null 2> /dev/null; then \
+ sed -f dep.sed < DEP1 > $@
+ if grep ' /' $@ > /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
Index: opcodes/Makefile.am
===================================================================
RCS file: /work/cvs/gnu/binutils/opcodes/Makefile.am,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile.am
--- opcodes/Makefile.am 2000/06/23 19:11:25 1.17
+++ opcodes/Makefile.am 2000/06/30 18:42:22
@@ -250,10 +250,10 @@ ia64-asmtab.c: @MAINT@ ia64-gen ia64-ic.
DEP: dep.sed $(CFILES) $(HFILES) config.h
rm -f DEP1
$(MAKE) MKDEP="$(MKDEP)" DEP1
- if grep ' /' DEP1 > /dev/null 2> /dev/null; then \
+ sed -f dep.sed < DEP1 > $@
+ if grep ' /' $@ > /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
next reply other threads:[~2000-06-30 12:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2000-06-30 12:21 H . J . Lu [this message]
2000-06-30 18:43 ` Alan Modra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20000630122129.A7152@valinux.com \
--to=hjl@valinux.com \
--cc=alan@linuxcare.com.au \
--cc=binutils@sourceware.cygnus.com \
--cc=nickc@cygnus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).