* dep-in.sed: Don't use \n in replacement part of s command.
* Makefile.am (DEP1): LC_ALL for uniq. Run "make dep-am". * Makefile.in: Regenerate.
This commit is contained in:
parent
a1ef399e23
commit
4b9d2a998b
4 changed files with 17 additions and 3 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2009-06-04 Alan Modra <amodra@bigpond.net.au>
|
||||||
|
|
||||||
|
* dep-in.sed: Don't use \n in replacement part of s command.
|
||||||
|
* Makefile.am (DEP1): LC_ALL for uniq.
|
||||||
|
Run "make dep-am".
|
||||||
|
* Makefile.in: Regenerate.
|
||||||
|
|
||||||
2009-06-03 Tristan Gingold <gingold@adacore.com>
|
2009-06-03 Tristan Gingold <gingold@adacore.com>
|
||||||
|
|
||||||
* MAINTAINERS: Add myself as Mach-O maintainer.
|
* MAINTAINERS: Add myself as Mach-O maintainer.
|
||||||
|
|
|
@ -411,7 +411,8 @@ DEP1: $(CFILES) $(GENERATED_CFILES)
|
||||||
for f in $?; do \
|
for f in $?; do \
|
||||||
$(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
|
$(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
|
||||||
sed -n -e '1s/: .*/: \\/p' -e q < DEPA >> DEP2; \
|
sed -n -e '1s/: .*/: \\/p' -e q < DEPA >> DEP2; \
|
||||||
sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
|
sed -e '1s/.*: //' -f dep.sed < DEPA | \
|
||||||
|
LC_ALL=C sort | LC_ALL=C uniq | \
|
||||||
sed -e 's/^[AB]/ /' -e '$$s/ \\$$//' >> DEP2; \
|
sed -e 's/^[AB]/ /' -e '$$s/ \\$$//' >> DEP2; \
|
||||||
done
|
done
|
||||||
rm -f DEPA
|
rm -f DEPA
|
||||||
|
@ -496,6 +497,7 @@ addr2line.o: \
|
||||||
ar.o: \
|
ar.o: \
|
||||||
ar.c \
|
ar.c \
|
||||||
$(BFDDIR)/libbfd.h \
|
$(BFDDIR)/libbfd.h \
|
||||||
|
$(BFDDIR)/plugin.h \
|
||||||
$(INCDIR)/alloca-conf.h \
|
$(INCDIR)/alloca-conf.h \
|
||||||
$(INCDIR)/ansidecl.h \
|
$(INCDIR)/ansidecl.h \
|
||||||
$(INCDIR)/aout/ar.h \
|
$(INCDIR)/aout/ar.h \
|
||||||
|
@ -764,6 +766,7 @@ nlmconv.o: \
|
||||||
nm.o: \
|
nm.o: \
|
||||||
nm.c \
|
nm.c \
|
||||||
$(BFDDIR)/elf-bfd.h \
|
$(BFDDIR)/elf-bfd.h \
|
||||||
|
$(BFDDIR)/plugin.h \
|
||||||
$(INCDIR)/alloca-conf.h \
|
$(INCDIR)/alloca-conf.h \
|
||||||
$(INCDIR)/ansidecl.h \
|
$(INCDIR)/ansidecl.h \
|
||||||
$(INCDIR)/aout/ranlib.h \
|
$(INCDIR)/aout/ranlib.h \
|
||||||
|
|
|
@ -1186,7 +1186,8 @@ DEP1: $(CFILES) $(GENERATED_CFILES)
|
||||||
for f in $?; do \
|
for f in $?; do \
|
||||||
$(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
|
$(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
|
||||||
sed -n -e '1s/: .*/: \\/p' -e q < DEPA >> DEP2; \
|
sed -n -e '1s/: .*/: \\/p' -e q < DEPA >> DEP2; \
|
||||||
sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
|
sed -e '1s/.*: //' -f dep.sed < DEPA | \
|
||||||
|
LC_ALL=C sort | LC_ALL=C uniq | \
|
||||||
sed -e 's/^[AB]/ /' -e '$$s/ \\$$//' >> DEP2; \
|
sed -e 's/^[AB]/ /' -e '$$s/ \\$$//' >> DEP2; \
|
||||||
done
|
done
|
||||||
rm -f DEPA
|
rm -f DEPA
|
||||||
|
@ -1264,6 +1265,7 @@ addr2line.o: \
|
||||||
ar.o: \
|
ar.o: \
|
||||||
ar.c \
|
ar.c \
|
||||||
$(BFDDIR)/libbfd.h \
|
$(BFDDIR)/libbfd.h \
|
||||||
|
$(BFDDIR)/plugin.h \
|
||||||
$(INCDIR)/alloca-conf.h \
|
$(INCDIR)/alloca-conf.h \
|
||||||
$(INCDIR)/ansidecl.h \
|
$(INCDIR)/ansidecl.h \
|
||||||
$(INCDIR)/aout/ar.h \
|
$(INCDIR)/aout/ar.h \
|
||||||
|
@ -1532,6 +1534,7 @@ nlmconv.o: \
|
||||||
nm.o: \
|
nm.o: \
|
||||||
nm.c \
|
nm.c \
|
||||||
$(BFDDIR)/elf-bfd.h \
|
$(BFDDIR)/elf-bfd.h \
|
||||||
|
$(BFDDIR)/plugin.h \
|
||||||
$(INCDIR)/alloca-conf.h \
|
$(INCDIR)/alloca-conf.h \
|
||||||
$(INCDIR)/ansidecl.h \
|
$(INCDIR)/ansidecl.h \
|
||||||
$(INCDIR)/aout/ranlib.h \
|
$(INCDIR)/aout/ranlib.h \
|
||||||
|
|
|
@ -15,5 +15,6 @@ s! \.\./intl/libintl\.h!!g
|
||||||
s/ *$//
|
s/ *$//
|
||||||
s/ */ /g
|
s/ */ /g
|
||||||
s/^ */A/
|
s/^ */A/
|
||||||
s/ / \\\nB/g
|
s/ / \\\
|
||||||
|
B/g
|
||||||
$s/$/ \\/
|
$s/$/ \\/
|
||||||
|
|
Loading…
Reference in a new issue