Skip to content

Commit f4162f5

Browse files
ianlancetaylorianlancetaylor
committed
* Makefile.am: Rename .dep* files to DEP*. Change DEP variable to
 MKDEP. Rebuild dependencies. * Makefile.in: Rebuild.
1 parent c278c15 commit f4162f5

File tree

3 files changed

+44
-38
lines changed

3 files changed

+44
-38
lines changed

‎ld/ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
1999-08-08 Ian Lance Taylor <[email protected]>
2+
3+
* Makefile.am: Rename .dep* files to DEP*. Change DEP variable to
4+
MKDEP. Rebuild dependencies.
5+
* Makefile.in: Rebuild.
6+
17
1999-08-08 Jakub Jelinek <[email protected]>
28

39
* configure.host (sparc-*-linux-gnu*): New host.

‎ld/Makefile.am

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ LIB_PATH =
3333
BASEDIR = $(srcdir)/..
3434
BFDDIR = $(BASEDIR)/bfd
3535
INCDIR = $(BASEDIR)/include
36-
DEP = mkdep
36+
MKDEP = mkdep
3737

3838
# What version of the manual to build
3939
DOCVER = gen
@@ -742,7 +742,7 @@ MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) \
742742
ldemul-list.h crtbegin.o crtend.o ld.log ld.sum
743743
mostlyclean-local:
744744
-rm -rf tmpdir
745-
CLEANFILES = dep.sed .dep .dep1
745+
CLEANFILES = dep.sed DEP DEP1
746746
747747
.PHONY: install-exec-local install-data-local
748748
@@ -777,37 +777,37 @@ distclean-local:
777777
rm -rf ldscripts
778778
779779
# Targets to rebuild dependencies in this Makefile.
780-
# Have to get rid of .dep1 here so that "$?" later includes all of $(CFILES).
781-
.dep: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h
782-
rm -f .dep1
783-
$(MAKE) DEP=$(DEP) .dep1
784-
sed -f dep.sed <.dep1 >.dep
780+
# Have to get rid of DEP1 here so that "$?" later includes all of $(CFILES).
781+
DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h
782+
rm -f DEP1
783+
$(MAKE) MKDEP=$(MKDEP) DEP1
784+
sed -f dep.sed <DEP1 >DEP
785785
786786
# This rule really wants a mkdep that runs "gcc -MM".
787-
.dep1: $(CFILES) $(GENERATED_CFILES)
788-
rm -f .dep2
789-
echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > .dep2
790-
$(DEP) -f .dep2 $(INCLUDES) $?
791-
$(srcdir)/../move-if-change .dep2 .dep1
787+
DEP1: $(CFILES) $(GENERATED_CFILES)
788+
rm -f DEP2
789+
echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2
790+
$(MKDEP) -f DEP2 $(INCLUDES) $?
791+
$(srcdir)/../move-if-change DEP2 DEP1
792792
793793
dep.sed: dep-in.sed config.status
794794
sed <$(srcdir)/dep-in.sed >dep.sed \
795795
-e 's!@INCDIR@!$(INCDIR)!' \
796796
-e 's!@SRCDIR@!$(srcdir)!'
797797
798-
dep: .dep
798+
dep: DEP
799799
sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < Makefile > tmp-Makefile
800-
cat .dep >> tmp-Makefile
800+
cat DEP >> tmp-Makefile
801801
$(srcdir)/../move-if-change tmp-Makefile Makefile
802802
803-
dep-in: .dep
803+
dep-in: DEP
804804
sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.in > tmp-Makefile.in
805-
cat .dep >> tmp-Makefile.in
805+
cat DEP >> tmp-Makefile.in
806806
$(srcdir)/../move-if-change tmp-Makefile.in $(srcdir)/Makefile.in
807807
808-
dep-am: .dep
808+
dep-am: DEP
809809
sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.am > tmp-Makefile.am
810-
cat .dep >> tmp-Makefile.am
810+
cat DEP >> tmp-Makefile.am
811811
$(srcdir)/../move-if-change tmp-Makefile.am $(srcdir)/Makefile.am
812812
813813
.PHONY: dep dep-in dep-am
@@ -834,7 +834,7 @@ ldlang.o: ldlang.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
834834
sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \
835835
$(INCDIR)/obstack.h $(INCDIR)/bfdlink.h ld.h ldmain.h \
836836
ldgram.h ldexp.h ldlang.h ldemul.h ldlex.h ldmisc.h \
837-
ldctor.h ldfile.h $(INCDIR)/fnmatch.h
837+
ldctor.h ldfile.h $(INCDIR)/fnmatch.h $(INCDIR)/demangle.h
838838
ldmain.o: ldmain.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
839839
sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \
840840
$(INCDIR)/progress.h $(INCDIR)/bfdlink.h ld.h ldmain.h \

‎ld/Makefile.in

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ LIB_PATH =
134134
BASEDIR = $(srcdir)/..
135135
BFDDIR = $(BASEDIR)/bfd
136136
INCDIR = $(BASEDIR)/include
137-
DEP = mkdep
137+
MKDEP = mkdep
138138

139139
# What version of the manual to build
140140
DOCVER = gen
@@ -368,7 +368,7 @@ MAINTAINERCLEANFILES = ldver.texi
368368
MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) \
369369
ldemul-list.h crtbegin.o crtend.o ld.log ld.sum
370370
371-
CLEANFILES = dep.sed .dep .dep1
371+
CLEANFILES = dep.sed DEP DEP1
372372
373373
# Stuff that should be included in a distribution. The diststuff
374374
# target is run by the taz target in ../Makefile.in.
@@ -1458,37 +1458,37 @@ distclean-local:
14581458
rm -rf ldscripts
14591459
14601460
# Targets to rebuild dependencies in this Makefile.
1461-
# Have to get rid of .dep1 here so that "$?" later includes all of $(CFILES).
1462-
.dep: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h
1463-
rm -f .dep1
1464-
$(MAKE) DEP=$(DEP) .dep1
1465-
sed -f dep.sed <.dep1 >.dep
1461+
# Have to get rid of DEP1 here so that "$?" later includes all of $(CFILES).
1462+
DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h
1463+
rm -f DEP1
1464+
$(MAKE) MKDEP=$(MKDEP) DEP1
1465+
sed -f dep.sed <DEP1 >DEP
14661466
14671467
# This rule really wants a mkdep that runs "gcc -MM".
1468-
.dep1: $(CFILES) $(GENERATED_CFILES)
1469-
rm -f .dep2
1470-
echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > .dep2
1471-
$(DEP) -f .dep2 $(INCLUDES) $?
1472-
$(srcdir)/../move-if-change .dep2 .dep1
1468+
DEP1: $(CFILES) $(GENERATED_CFILES)
1469+
rm -f DEP2
1470+
echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2
1471+
$(MKDEP) -f DEP2 $(INCLUDES) $?
1472+
$(srcdir)/../move-if-change DEP2 DEP1
14731473
14741474
dep.sed: dep-in.sed config.status
14751475
sed <$(srcdir)/dep-in.sed >dep.sed \
14761476
-e 's!@INCDIR@!$(INCDIR)!' \
14771477
-e 's!@SRCDIR@!$(srcdir)!'
14781478
1479-
dep: .dep
1479+
dep: DEP
14801480
sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < Makefile > tmp-Makefile
1481-
cat .dep >> tmp-Makefile
1481+
cat DEP >> tmp-Makefile
14821482
$(srcdir)/../move-if-change tmp-Makefile Makefile
14831483
1484-
dep-in: .dep
1484+
dep-in: DEP
14851485
sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.in > tmp-Makefile.in
1486-
cat .dep >> tmp-Makefile.in
1486+
cat DEP >> tmp-Makefile.in
14871487
$(srcdir)/../move-if-change tmp-Makefile.in $(srcdir)/Makefile.in
14881488
1489-
dep-am: .dep
1489+
dep-am: DEP
14901490
sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.am > tmp-Makefile.am
1491-
cat .dep >> tmp-Makefile.am
1491+
cat DEP >> tmp-Makefile.am
14921492
$(srcdir)/../move-if-change tmp-Makefile.am $(srcdir)/Makefile.am
14931493
14941494
.PHONY: dep dep-in dep-am
@@ -1515,7 +1515,7 @@ ldlang.o: ldlang.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
15151515
sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \
15161516
$(INCDIR)/obstack.h $(INCDIR)/bfdlink.h ld.h ldmain.h \
15171517
ldgram.h ldexp.h ldlang.h ldemul.h ldlex.h ldmisc.h \
1518-
ldctor.h ldfile.h $(INCDIR)/fnmatch.h
1518+
ldctor.h ldfile.h $(INCDIR)/fnmatch.h $(INCDIR)/demangle.h
15191519
ldmain.o: ldmain.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
15201520
sysdep.h config.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \
15211521
$(INCDIR)/progress.h $(INCDIR)/bfdlink.h ld.h ldmain.h \

0 commit comments

Comments
 (0)