Re: dependency tracking in gas

[Ralf Wildenhues <Ralf.Wildenhues@gmx.de>]

* Ralf Wildenhues wrote on Sat, Aug 15, 2009 at 02:45:35PM CEST:
> gas/ChangeLog:
> 2009-08-15  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
> 
> 	* Makefile.am (AUTOMAKE_OPTIONS): Remove 1.8 cygnus, add 1.11,
> 	foreign and no-dist.
> 	(all): Remove now-unneeded dependency upon info.
> 	(DIST_SUBDIRS, MKDEP, DEP_INCLUDES, DEP_FLAGS, CLEANFILES)
> 	(DEP_FILE_DEPS): Remove variables.
> 	($(OBJS), ecoff.o): Remove now-unneeded manual dependencies.
> 	($(TARG_CPU_O), $(ATOF_TARG_O), obj-aout.o, obj-coff.o obj-ecoff.o)
> 	(obj-elf.o obj-evax.o, obj-fdpicelf.o, obj-multi.o, obj-som.o)
> 	(e-mipself.o, e-mipsecoff.o, e-i386aout.o, e-i386coff.o, e-i386elf.o)
> 	(e-crisaout.o, e-criself.o, tc-i386.o, xtensa-relax.o): Remove
> 	now-unneeded rules.
> 	(EXTRA_as_new_SOURCES): Add $(CFILES), $(HFILES), $(TARGET_CPU_CFILES),
> 	$(TARGET_CPU_HFILES), $(OBJ_FORMAT_CFILES), $(OBJ_FORMAT_HFILES),
> 	$(CONFIG_ATOF_CFILES), so their dependency fragments are picked up
> 	in the Makefile.
> 	(itbl-lex.c, itbl-ops.o): Remove manual dependencies.
> 	(m68k-parse.o, bfin-lex.o, itbl-lex.o, itbl-parse.o, itbl-tops.o)
> 	(itbl-test.o): Rewrite using automake-style dependency
> 	tracking rules; only list the dependency upon the primary source
> 	file, but no included headers.
> 	(DEP, DEP1, DEPTC, DEPOBJ, DEP2, dep.sed, dep, dep-in, dep-am):
> 	Remove.
> 	(mkdep section): Remove.
> 	* Makefile.in: Regenerate.

I accidentally posted an old version of the above patch that was missing
a few entries; please consider the following additional changes to be
squashed in with the above.  (I did test the combined version of these
patches.)  The changes are needed so that dependency files below .deps
are created for all of the source files.

(The other posts in this thread contain up to date patches.)

Thanks,
Ralf
	* Makefile.am: [...]
	(OBJ_FORMAT_CFILES): Add config/obj-multi.c.
	(OBJ_FORMAT_HFILES): Add config/obj-multi.h.
	(EXTRA_as_new_SOURCES): Add $(MULTI_CFILES).

diff --git a/gas/Makefile.am b/gas/Makefile.am
index b8bbbf8..177e7f3 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -372,6 +372,7 @@ OBJ_FORMAT_CFILES = \
 	config/obj-evax.c \
 	config/obj-fdpicelf.c \
 	config/obj-macho.c \
+	config/obj-multi.c \
 	config/obj-som.c
 
 OBJ_FORMAT_HFILES = \
@@ -382,6 +383,7 @@ OBJ_FORMAT_HFILES = \
 	config/obj-evax.h \
 	config/obj-fdpicelf.h \
 	config/obj-macho.h \
+	config/obj-multi.h \
 	config/obj-som.h
 
 # Emulation header files in config
@@ -527,7 +529,7 @@ as_new_DEPENDENCIES = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \
 	$(extra_objects) $(GASLIBS) $(LIBINTL_DEP)
 EXTRA_as_new_SOURCES = $(CFILES) $(HFILES) $(TARGET_CPU_CFILES) \
 	$(TARGET_CPU_HFILES) $(OBJ_FORMAT_CFILES) $(OBJ_FORMAT_HFILES) \
-	$(CONFIG_ATOF_CFILES)
+	$(CONFIG_ATOF_CFILES) $(MULTI_CFILES)
 
 EXPECT = expect
 RUNTEST = runtest