* Makefile.am: Rename .dep* files to DEP*. Change DEP variable to
MKDEP. Rebuild dependencies. * Makefile.in: Rebuild.
This commit is contained in:
parent
c278c1507b
commit
f4162f5cef
@ -1,3 +1,9 @@
|
|||||||
|
1999-08-08 Ian Lance Taylor <ian@zembu.com>
|
||||||
|
|
||||||
|
* Makefile.am: Rename .dep* files to DEP*. Change DEP variable to
|
||||||
|
MKDEP. Rebuild dependencies.
|
||||||
|
* Makefile.in: Rebuild.
|
||||||
|
|
||||||
1999-08-08 Jakub Jelinek <jj@ultra.linux.cz>
|
1999-08-08 Jakub Jelinek <jj@ultra.linux.cz>
|
||||||
|
|
||||||
* configure.host (sparc-*-linux-gnu*): New host.
|
* configure.host (sparc-*-linux-gnu*): New host.
|
||||||
|
@ -33,7 +33,7 @@ LIB_PATH =
|
|||||||
BASEDIR = $(srcdir)/..
|
BASEDIR = $(srcdir)/..
|
||||||
BFDDIR = $(BASEDIR)/bfd
|
BFDDIR = $(BASEDIR)/bfd
|
||||||
INCDIR = $(BASEDIR)/include
|
INCDIR = $(BASEDIR)/include
|
||||||
DEP = mkdep
|
MKDEP = mkdep
|
||||||
|
|
||||||
# What version of the manual to build
|
# What version of the manual to build
|
||||||
DOCVER = gen
|
DOCVER = gen
|
||||||
@ -742,7 +742,7 @@ MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) \
|
|||||||
ldemul-list.h crtbegin.o crtend.o ld.log ld.sum
|
ldemul-list.h crtbegin.o crtend.o ld.log ld.sum
|
||||||
mostlyclean-local:
|
mostlyclean-local:
|
||||||
-rm -rf tmpdir
|
-rm -rf tmpdir
|
||||||
CLEANFILES = dep.sed .dep .dep1
|
CLEANFILES = dep.sed DEP DEP1
|
||||||
|
|
||||||
.PHONY: install-exec-local install-data-local
|
.PHONY: install-exec-local install-data-local
|
||||||
|
|
||||||
@ -777,37 +777,37 @@ distclean-local:
|
|||||||
rm -rf ldscripts
|
rm -rf ldscripts
|
||||||
|
|
||||||
# Targets to rebuild dependencies in this Makefile.
|
# Targets to rebuild dependencies in this Makefile.
|
||||||
# Have to get rid of .dep1 here so that "$?" later includes all of $(CFILES).
|
# Have to get rid of DEP1 here so that "$?" later includes all of $(CFILES).
|
||||||
.dep: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h
|
DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h
|
||||||
rm -f .dep1
|
rm -f DEP1
|
||||||
$(MAKE) DEP=$(DEP) .dep1
|
$(MAKE) MKDEP=$(MKDEP) DEP1
|
||||||
sed -f dep.sed <.dep1 >.dep
|
sed -f dep.sed <DEP1 >DEP
|
||||||
|
|
||||||
# This rule really wants a mkdep that runs "gcc -MM".
|
# This rule really wants a mkdep that runs "gcc -MM".
|
||||||
.dep1: $(CFILES) $(GENERATED_CFILES)
|
DEP1: $(CFILES) $(GENERATED_CFILES)
|
||||||
rm -f .dep2
|
rm -f DEP2
|
||||||
echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > .dep2
|
echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2
|
||||||
$(DEP) -f .dep2 $(INCLUDES) $?
|
$(MKDEP) -f DEP2 $(INCLUDES) $?
|
||||||
$(srcdir)/../move-if-change .dep2 .dep1
|
$(srcdir)/../move-if-change DEP2 DEP1
|
||||||
|
|
||||||
dep.sed: dep-in.sed config.status
|
dep.sed: dep-in.sed config.status
|
||||||
sed <$(srcdir)/dep-in.sed >dep.sed \
|
sed <$(srcdir)/dep-in.sed >dep.sed \
|
||||||
-e 's!@INCDIR@!$(INCDIR)!' \
|
-e 's!@INCDIR@!$(INCDIR)!' \
|
||||||
-e 's!@SRCDIR@!$(srcdir)!'
|
-e 's!@SRCDIR@!$(srcdir)!'
|
||||||
|
|
||||||
dep: .dep
|
dep: DEP
|
||||||
sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < Makefile > tmp-Makefile
|
sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < Makefile > tmp-Makefile
|
||||||
cat .dep >> tmp-Makefile
|
cat DEP >> tmp-Makefile
|
||||||
$(srcdir)/../move-if-change tmp-Makefile Makefile
|
$(srcdir)/../move-if-change tmp-Makefile Makefile
|
||||||
|
|
||||||
dep-in: .dep
|
dep-in: DEP
|
||||||
sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.in > tmp-Makefile.in
|
sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.in > tmp-Makefile.in
|
||||||
cat .dep >> tmp-Makefile.in
|
cat DEP >> tmp-Makefile.in
|
||||||
$(srcdir)/../move-if-change tmp-Makefile.in $(srcdir)/Makefile.in
|
$(srcdir)/../move-if-change tmp-Makefile.in $(srcdir)/Makefile.in
|
||||||
|
|
||||||
dep-am: .dep
|
dep-am: DEP
|
||||||
sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.am > tmp-Makefile.am
|
sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.am > tmp-Makefile.am
|
||||||
cat .dep >> tmp-Makefile.am
|
cat DEP >> tmp-Makefile.am
|
||||||
$(srcdir)/../move-if-change tmp-Makefile.am $(srcdir)/Makefile.am
|
$(srcdir)/../move-if-change tmp-Makefile.am $(srcdir)/Makefile.am
|
||||||
|
|
||||||
.PHONY: dep dep-in dep-am
|
.PHONY: dep dep-in dep-am
|
||||||
@ -834,7 +834,7 @@ ldlang.o: ldlang.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
|
|||||||
sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \
|
sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \
|
||||||
$(INCDIR)/obstack.h $(INCDIR)/bfdlink.h ld.h ldmain.h \
|
$(INCDIR)/obstack.h $(INCDIR)/bfdlink.h ld.h ldmain.h \
|
||||||
ldgram.h ldexp.h ldlang.h ldemul.h ldlex.h ldmisc.h \
|
ldgram.h ldexp.h ldlang.h ldemul.h ldlex.h ldmisc.h \
|
||||||
ldctor.h ldfile.h $(INCDIR)/fnmatch.h
|
ldctor.h ldfile.h $(INCDIR)/fnmatch.h $(INCDIR)/demangle.h
|
||||||
ldmain.o: ldmain.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
|
ldmain.o: ldmain.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
|
||||||
sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \
|
sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \
|
||||||
$(INCDIR)/progress.h $(INCDIR)/bfdlink.h ld.h ldmain.h \
|
$(INCDIR)/progress.h $(INCDIR)/bfdlink.h ld.h ldmain.h \
|
||||||
|
@ -134,7 +134,7 @@ LIB_PATH =
|
|||||||
BASEDIR = $(srcdir)/..
|
BASEDIR = $(srcdir)/..
|
||||||
BFDDIR = $(BASEDIR)/bfd
|
BFDDIR = $(BASEDIR)/bfd
|
||||||
INCDIR = $(BASEDIR)/include
|
INCDIR = $(BASEDIR)/include
|
||||||
DEP = mkdep
|
MKDEP = mkdep
|
||||||
|
|
||||||
# What version of the manual to build
|
# What version of the manual to build
|
||||||
DOCVER = gen
|
DOCVER = gen
|
||||||
@ -368,7 +368,7 @@ MAINTAINERCLEANFILES = ldver.texi
|
|||||||
MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) \
|
MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) \
|
||||||
ldemul-list.h crtbegin.o crtend.o ld.log ld.sum
|
ldemul-list.h crtbegin.o crtend.o ld.log ld.sum
|
||||||
|
|
||||||
CLEANFILES = dep.sed .dep .dep1
|
CLEANFILES = dep.sed DEP DEP1
|
||||||
|
|
||||||
# Stuff that should be included in a distribution. The diststuff
|
# Stuff that should be included in a distribution. The diststuff
|
||||||
# target is run by the taz target in ../Makefile.in.
|
# target is run by the taz target in ../Makefile.in.
|
||||||
@ -1458,37 +1458,37 @@ distclean-local:
|
|||||||
rm -rf ldscripts
|
rm -rf ldscripts
|
||||||
|
|
||||||
# Targets to rebuild dependencies in this Makefile.
|
# Targets to rebuild dependencies in this Makefile.
|
||||||
# Have to get rid of .dep1 here so that "$?" later includes all of $(CFILES).
|
# Have to get rid of DEP1 here so that "$?" later includes all of $(CFILES).
|
||||||
.dep: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h
|
DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h
|
||||||
rm -f .dep1
|
rm -f DEP1
|
||||||
$(MAKE) DEP=$(DEP) .dep1
|
$(MAKE) MKDEP=$(MKDEP) DEP1
|
||||||
sed -f dep.sed <.dep1 >.dep
|
sed -f dep.sed <DEP1 >DEP
|
||||||
|
|
||||||
# This rule really wants a mkdep that runs "gcc -MM".
|
# This rule really wants a mkdep that runs "gcc -MM".
|
||||||
.dep1: $(CFILES) $(GENERATED_CFILES)
|
DEP1: $(CFILES) $(GENERATED_CFILES)
|
||||||
rm -f .dep2
|
rm -f DEP2
|
||||||
echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > .dep2
|
echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2
|
||||||
$(DEP) -f .dep2 $(INCLUDES) $?
|
$(MKDEP) -f DEP2 $(INCLUDES) $?
|
||||||
$(srcdir)/../move-if-change .dep2 .dep1
|
$(srcdir)/../move-if-change DEP2 DEP1
|
||||||
|
|
||||||
dep.sed: dep-in.sed config.status
|
dep.sed: dep-in.sed config.status
|
||||||
sed <$(srcdir)/dep-in.sed >dep.sed \
|
sed <$(srcdir)/dep-in.sed >dep.sed \
|
||||||
-e 's!@INCDIR@!$(INCDIR)!' \
|
-e 's!@INCDIR@!$(INCDIR)!' \
|
||||||
-e 's!@SRCDIR@!$(srcdir)!'
|
-e 's!@SRCDIR@!$(srcdir)!'
|
||||||
|
|
||||||
dep: .dep
|
dep: DEP
|
||||||
sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < Makefile > tmp-Makefile
|
sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < Makefile > tmp-Makefile
|
||||||
cat .dep >> tmp-Makefile
|
cat DEP >> tmp-Makefile
|
||||||
$(srcdir)/../move-if-change tmp-Makefile Makefile
|
$(srcdir)/../move-if-change tmp-Makefile Makefile
|
||||||
|
|
||||||
dep-in: .dep
|
dep-in: DEP
|
||||||
sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.in > tmp-Makefile.in
|
sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.in > tmp-Makefile.in
|
||||||
cat .dep >> tmp-Makefile.in
|
cat DEP >> tmp-Makefile.in
|
||||||
$(srcdir)/../move-if-change tmp-Makefile.in $(srcdir)/Makefile.in
|
$(srcdir)/../move-if-change tmp-Makefile.in $(srcdir)/Makefile.in
|
||||||
|
|
||||||
dep-am: .dep
|
dep-am: DEP
|
||||||
sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.am > tmp-Makefile.am
|
sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.am > tmp-Makefile.am
|
||||||
cat .dep >> tmp-Makefile.am
|
cat DEP >> tmp-Makefile.am
|
||||||
$(srcdir)/../move-if-change tmp-Makefile.am $(srcdir)/Makefile.am
|
$(srcdir)/../move-if-change tmp-Makefile.am $(srcdir)/Makefile.am
|
||||||
|
|
||||||
.PHONY: dep dep-in dep-am
|
.PHONY: dep dep-in dep-am
|
||||||
@ -1515,7 +1515,7 @@ ldlang.o: ldlang.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
|
|||||||
sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \
|
sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \
|
||||||
$(INCDIR)/obstack.h $(INCDIR)/bfdlink.h ld.h ldmain.h \
|
$(INCDIR)/obstack.h $(INCDIR)/bfdlink.h ld.h ldmain.h \
|
||||||
ldgram.h ldexp.h ldlang.h ldemul.h ldlex.h ldmisc.h \
|
ldgram.h ldexp.h ldlang.h ldemul.h ldlex.h ldmisc.h \
|
||||||
ldctor.h ldfile.h $(INCDIR)/fnmatch.h
|
ldctor.h ldfile.h $(INCDIR)/fnmatch.h $(INCDIR)/demangle.h
|
||||||
ldmain.o: ldmain.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
|
ldmain.o: ldmain.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
|
||||||
sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \
|
sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \
|
||||||
$(INCDIR)/progress.h $(INCDIR)/bfdlink.h ld.h ldmain.h \
|
$(INCDIR)/progress.h $(INCDIR)/bfdlink.h ld.h ldmain.h \
|
||||||
|
Loading…
Reference in New Issue
Block a user