diff options
author | Ian Lance Taylor <ian@airs.com> | 1994-09-28 19:53:22 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@airs.com> | 1994-09-28 19:53:22 +0000 |
commit | 3bbea7af281dcd8ebd320a036fa56f5883815159 (patch) | |
tree | 1d67d3c3590d7729f790889bed224935ad406556 | |
parent | 620a590eed13f15ef4cfb5b9e8dbc070dea79ba3 (diff) | |
download | gdb-3bbea7af281dcd8ebd320a036fa56f5883815159.zip gdb-3bbea7af281dcd8ebd320a036fa56f5883815159.tar.gz gdb-3bbea7af281dcd8ebd320a036fa56f5883815159.tar.bz2 |
* Makefile.in (arparse.c): Don't ignore errors from mv.
(sysinfo.c): Likewise. Also, depend upon arparse.c, to prevent a
parallel make from trying to build both arparse.c and sysinfo.c
simultaneously.
(nlmheader.c): Similar change.
(arparse.h): Separate target from arparse.c, so that a parallel
make does not try to build both at once. Depend upon arparse.c.
(sysinfo.h): Similar change.
-rw-r--r-- | binutils/ChangeLog | 9 | ||||
-rw-r--r-- | binutils/Makefile.in | 44 |
2 files changed, 41 insertions, 12 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 224678f..2d9a000 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,14 @@ Wed Sep 28 13:04:34 1994 Ian Lance Taylor (ian@sanguine.cygnus.com) + * Makefile.in (arparse.c): Don't ignore errors from mv. + (sysinfo.c): Likewise. Also, depend upon arparse.c, to prevent a + parallel make from trying to build both arparse.c and sysinfo.c + simultaneously. + (nlmheader.c): Similar change. + (arparse.h): Separate target from arparse.c, so that a parallel + make does not try to build both at once. Depend upon arparse.c. + (sysinfo.h): Similar change. + * objdump.c (disassemble_data): Pass the reloc buffer to free, not the pointer used to loop over the relocs. diff --git a/binutils/Makefile.in b/binutils/Makefile.in index b0e8fc5..280d443 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -210,7 +210,7 @@ underscore.c: Makefile echo "int prepends_underscore = $(UNDERSCORE);" >>underscore.t mv -f underscore.t underscore.c -version.o: version.c +version.o: version.c Makefile $(CC) $(INCLUDES) $(HDEFINES) $(TDEFINES) -DVERSION='"$(VERSION)"' $(CFLAGS) -c $(srcdir)/version.c cplus-dem.o: $(BASEDIR)/libiberty/cplus-dem.c $(INCDIR)/getopt.h @@ -219,10 +219,14 @@ cplus-dem.o: $(BASEDIR)/libiberty/cplus-dem.c $(INCDIR)/getopt.h $(DEMANGLER_PROG): cplus-dem.o $(LIBIBERTY) underscore.o version.o $(CC) $(CFLAGS) $(LDFLAGS) -o $(DEMANGLER_PROG) cplus-dem.o $(LIBIBERTY) $(EXTRALIBS) underscore.o version.o -arparse.h arparse.c: arparse.y +arparse.c: arparse.y $(BISON) $(BISONFLAGS) $(srcdir)/arparse.y - -mv y.tab.c arparse.c - -mv y.tab.h arparse.h + mv -f y.tab.c arparse.c + mv -f y.tab.h arparse.h + +# Separate from arparse.c so that a parallel make doesn't try to build +# both arparse.c and arparse.h simultaneously. +arparse.h: arparse.c arlex.c: arlex.l $(LEX) $(LEX_OPTIONS) $(srcdir)/arlex.l @@ -259,24 +263,38 @@ sysroff.c: sysinfo sysroff.info ./sysinfo -g <$(srcdir)/sysroff.info >>sysroff.c ./sysinfo -d <$(srcdir)/sysroff.info >sysroff.h -sysinfo.h sysinfo.c: sysinfo.y +# Depend upon arparse.c to avoid building both arparse.c and sysinfo.c +# simultaneously. +sysinfo.c: sysinfo.y arparse.c $(BISON) -tvd $(srcdir)/sysinfo.y rm -f sysinfo.c - -mv y.tab.c sysinfo.c - -mv y.tab.h sysinfo.h + mv -f y.tab.c sysinfo.c + mv -f y.tab.h sysinfo.h + +# Separate from sysinfo.c so that a parallel make doesn't try to build +# both sysinfo.c and sysinfo.h simultaneously. +sysinfo.h: sysinfo.c syslex.c : syslex.l $(LEX) $(LEX_OPTIONS) $(srcdir)/syslex.l mv lex.yy.c syslex.c -sysinfo: sysinfo.o syslex.o $(ADDL_LIBS) +sysinfo: sysinfo.o syslex.o $(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) -o $@ sysinfo.o syslex.o syslex.o: syslex.c sysinfo.h - $(CC_FOR_BUILD) -c -I. $(CFLAGS) syslex.c + if [ -r syslex.c ]; then \ + $(CC_FOR_BUILD) -c -I. $(CFLAGS) syslex.c ; \ + else \ + $(CC_FOR_BUILD) -c -I. $(CFLAGS) $(srcdir)/syslex.c ;\ + fi sysinfo.o: sysinfo.c - $(CC_FOR_BUILD) -c -I. $(CFLAGS) sysinfo.c + if [ -r sysinfo.c ]; then \ + $(CC_FOR_BUILD) -c -I. $(CFLAGS) sysinfo.c ; \ + else \ + $(CC_FOR_BUILD) -c -I. $(CFLAGS) $(srcdir)/sysinfo.c ; \ + fi srconv: sysroff.c srconv.o sysroff.c coffgrok.o $(ADDL_LIBS) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ srconv.o coffgrok.o $(ADDL_LIBS) $(EXTRALIBS) @@ -287,10 +305,12 @@ coffdump: coffdump.o coffgrok.o $(ADDL_LIBS) sysdump: sysroff.c sysdump.o $(ADDL_LIBS) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ sysdump.o $(ADDL_LIBS) $(EXTRALIBS) -nlmheader.c: nlmheader.y +# Depend upon sysinfo.c to avoid building both nlmheader.c and sysinfo.c +# simultaneously. +nlmheader.c: nlmheader.y sysinfo.c $(BISON) $(srcdir)/nlmheader.y rm -f nlmheader.c - -mv y.tab.c nlmheader.c + mv -f y.tab.c nlmheader.c nlmconv.o: nlmconv.c ldname=`t='$(program_transform_name)'; echo ld | sed -e "s/brokensed/brokensed/" $$t`; \ |