* Makefile.am: Rename .dep* files to DEP*. Change DEP variable to

MKDEP.
	* Makefile.in: Rebuild.
This commit is contained in:
Ian Lance Taylor 1999-08-08 17:26:50 +00:00
parent 46eec08e57
commit 74eeebeafb
3 changed files with 48 additions and 42 deletions

View file

@ -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.
* Makefile.in: Rebuild.
1999-08-08 Mumit Khan <khan@xraylith.wisc.edu> 1999-08-08 Mumit Khan <khan@xraylith.wisc.edu>
* section.c (SEC_SHARED): Define. * section.c (SEC_SHARED): Define.

View file

@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
INCDIR = $(srcdir)/../include INCDIR = $(srcdir)/../include
CSEARCH = -I. -I$(srcdir) -I$(INCDIR) CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
DEP = mkdep MKDEP = mkdep
SUBDIRS = doc po SUBDIRS = doc po
@ -520,25 +520,25 @@ install-data-local: $(BFD_H)
$(INSTALL_DATA) $(INCDIR)/ansidecl.h $(includedir)/ansidecl.h $(INSTALL_DATA) $(INCDIR)/ansidecl.h $(includedir)/ansidecl.h
$(INSTALL_DATA) $(INCDIR)/bfdlink.h $(includedir)/bfdlink.h $(INSTALL_DATA) $(INCDIR)/bfdlink.h $(includedir)/bfdlink.h
# 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) bfd.h DEP: dep.sed $(CFILES) $(HFILES) bfd.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".
# The NetBSD mkdep overwrites any existing file contents, and doesn't insert # The NetBSD mkdep overwrites any existing file contents, and doesn't insert
# the "DO NOT DELETE" line. # the "DO NOT DELETE" line.
# Other mkdep versions require a file that already exists, and do insert it. # Other mkdep versions require a file that already exists, and do insert it.
# Hence the weirdness.... # Hence the weirdness....
.dep1: $(CFILES) DEP1: $(CFILES)
rm -f .dep2 .dep2a rm -f DEP2 DEP2a
echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > .dep2 echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2
echo > .dep2a echo > DEP2a
$(DEP) -f .dep2a $(INCLUDES) $(CFLAGS) $? $(MKDEP) -f DEP2a $(INCLUDES) $(CFLAGS) $?
sed -e '/DO NOT DELETE/d' -e '/^$$/d' < .dep2a >> .dep2 sed -e '/DO NOT DELETE/d' -e '/^$$/d' < DEP2a >> DEP2
rm -f .dep2a rm -f DEP2a
$(SHELL) $(srcdir)/../move-if-change .dep2 .dep1 $(SHELL) $(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 \
@ -546,19 +546,19 @@ dep.sed: dep-in.sed config.status
-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
$(SHELL) $(srcdir)/../move-if-change tmp-Makefile Makefile $(SHELL) $(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
$(SHELL) $(srcdir)/../move-if-change tmp-Makefile.in $(srcdir)/Makefile.in $(SHELL) $(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
$(SHELL) $(srcdir)/../move-if-change tmp-Makefile.am $(srcdir)/Makefile.am $(SHELL) $(srcdir)/../move-if-change tmp-Makefile.am $(srcdir)/Makefile.am
host-aout.lo: Makefile host-aout.lo: Makefile
@ -621,7 +621,7 @@ stmp-lcoff-h: $(LIBCOFF_H_FILES)
MOSTLYCLEANFILES = elf32-target.h elf64-target.h ofiles stamp-ofiles \ MOSTLYCLEANFILES = elf32-target.h elf64-target.h ofiles stamp-ofiles \
targmatch.h targmatch.h
CLEANFILES = bfd.h dep.sed stmp-bfd-h .dep .dep1 libbfd.a stamp-lib \ CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEP1 libbfd.a stamp-lib \
stmp-bin2-h stmp-lbfd-h stmp-lcoff-h stmp-bin2-h stmp-lbfd-h stmp-lcoff-h
# We want to rerun configure if config.bfd or configure.host change. # We want to rerun configure if config.bfd or configure.host change.

View file

@ -119,7 +119,7 @@ AUTOMAKE_OPTIONS = cygnus
INCDIR = $(srcdir)/../include INCDIR = $(srcdir)/../include
CSEARCH = -I. -I$(srcdir) -I$(INCDIR) CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
DEP = mkdep MKDEP = mkdep
SUBDIRS = doc po SUBDIRS = doc po
@ -588,7 +588,7 @@ MOSTLYCLEANFILES = elf32-target.h elf64-target.h ofiles stamp-ofiles \
targmatch.h targmatch.h
CLEANFILES = bfd.h dep.sed stmp-bfd-h .dep .dep1 libbfd.a stamp-lib \ CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEP1 libbfd.a stamp-lib \
stmp-bin2-h stmp-lbfd-h stmp-lcoff-h stmp-bin2-h stmp-lbfd-h stmp-lcoff-h
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -1062,25 +1062,25 @@ install-data-local: $(BFD_H)
$(INSTALL_DATA) $(INCDIR)/ansidecl.h $(includedir)/ansidecl.h $(INSTALL_DATA) $(INCDIR)/ansidecl.h $(includedir)/ansidecl.h
$(INSTALL_DATA) $(INCDIR)/bfdlink.h $(includedir)/bfdlink.h $(INSTALL_DATA) $(INCDIR)/bfdlink.h $(includedir)/bfdlink.h
# 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) bfd.h DEP: dep.sed $(CFILES) $(HFILES) bfd.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".
# The NetBSD mkdep overwrites any existing file contents, and doesn't insert # The NetBSD mkdep overwrites any existing file contents, and doesn't insert
# the "DO NOT DELETE" line. # the "DO NOT DELETE" line.
# Other mkdep versions require a file that already exists, and do insert it. # Other mkdep versions require a file that already exists, and do insert it.
# Hence the weirdness.... # Hence the weirdness....
.dep1: $(CFILES) DEP1: $(CFILES)
rm -f .dep2 .dep2a rm -f DEP2 DEP2a
echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > .dep2 echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2
echo > .dep2a echo > DEP2a
$(DEP) -f .dep2a $(INCLUDES) $(CFLAGS) $? $(MKDEP) -f DEP2a $(INCLUDES) $(CFLAGS) $?
sed -e '/DO NOT DELETE/d' -e '/^$$/d' < .dep2a >> .dep2 sed -e '/DO NOT DELETE/d' -e '/^$$/d' < DEP2a >> DEP2
rm -f .dep2a rm -f DEP2a
$(SHELL) $(srcdir)/../move-if-change .dep2 .dep1 $(SHELL) $(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 \
@ -1088,19 +1088,19 @@ dep.sed: dep-in.sed config.status
-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
$(SHELL) $(srcdir)/../move-if-change tmp-Makefile Makefile $(SHELL) $(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
$(SHELL) $(srcdir)/../move-if-change tmp-Makefile.in $(srcdir)/Makefile.in $(SHELL) $(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
$(SHELL) $(srcdir)/../move-if-change tmp-Makefile.am $(srcdir)/Makefile.am $(SHELL) $(srcdir)/../move-if-change tmp-Makefile.am $(srcdir)/Makefile.am
host-aout.lo: Makefile host-aout.lo: Makefile