From 16adf8441d8d4ede5c77aabf4afbee3988f8035b Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 19 Apr 2000 09:28:52 +0000 Subject: [PATCH] Fix the multi-obj dependency rules. --- gas/ChangeLog | 14 +++++- gas/Makefile.am | 103 +++++++++++++++++++++++++++----------------- gas/Makefile.in | 112 +++++++++++++++++++++++++++++++----------------- 3 files changed, 147 insertions(+), 82 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 175b90e2f92..3b49ba7c2d0 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,7 +1,17 @@ +2000-04-19 Alan Modra + + * Makefile.am: (CPU_MULTI_VALID): Remove. + (MULTI_CPU_TYPES): Define. + (MULTI_CPU_OBJ_VALID): Define. + (DEPTC): Use the above. + (DEPOBJ): Same here. + (DEP2): And here. + Regenerate dependencies. + * Makefile.in: Regenerate. + 2000-04-19 Michael Sokolov * Makefile.am (FLEX, LEX): Get them from configure. - * Makefile.in: Regenerate. 2000-04-18 H.J. Lu (hjl@gnu.org) @@ -59,7 +69,7 @@ (TARGET_CPU_CFILES): Add 'tc-avr.c'. (TARGET_CPU_HFILES): Add 'tc-avr.h'. - * makefine.in: Regenerate. + * Makefile.in: Regenerate. * doc/as.texinfo: Add M32R documentation. diff --git a/gas/Makefile.am b/gas/Makefile.am index 469ae53243a..12f8caac128 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -123,12 +123,23 @@ CPU_OBJ_VALID = \ esac ;; \ esac; -# This is like CPU_OBJ_VALID, for the obj=multi case. +# These are like CPU_TYPES and CPU_OBJ_VALID, for the obj=multi case. -CPU_MULTI_VALID = \ +MULTI_CPU_TYPES = i386 mips + +MULTI_CPU_OBJ_VALID = \ valid= ; \ - case $$c in \ - i386 | mips) valid=yes ;; \ + case $$o in \ + aout) \ + case $$c in \ + i386) valid=yes ;; \ + esac ;; \ + coff) valid=yes ;; \ + ecoff) \ + case $$c in \ + mips) valid=yes ;; \ + esac ;; \ + elf) valid=yes ;; \ esac; # Regular source files. @@ -763,19 +774,15 @@ DEPTC: $(TARGET_CPU_CFILES) echo 'DEPTC_hppa_som = $$(srcdir)/config/tc-hppa.h subsegs.h \' >> DEPTCA echo ' $$(INCDIR)/obstack.h $$(BFDDIR)/libhppa.h \' >> DEPTCA echo ' $$(INCDIR)/opcode/hppa.h $$(BFDDIR)/som.h' >> DEPTCA -# We don't try to handle all multi cases. - for c in $(CPU_TYPES); do \ - $(CPU_MULTI_VALID) \ - if [ x$${valid} = xyes ]; then \ - o=ecoff; \ - $(CPU_OBJ_VALID) \ - echo 'DEPTC_'"$${c}"'_multi = \' >> DEPTCA; \ - echo '$$(DEPTC_'"$${c}"'_coff) \' >> DEPTCA; \ + for c in $(MULTI_CPU_TYPES); do \ + echo 'DEPTC_'"$${c}"'_multi = \' >> DEPTCA; \ + for o in $(OBJ_FORMATS); do \ + $(MULTI_CPU_OBJ_VALID) \ if [ x$${valid} = xyes ]; then \ - echo '$$(DEPTC_'"$${c}"'_ecoff) \' >> DEPTCA; \ + echo '$$(DEPTC_'"$${c}_$${o}"') \' >> DEPTCA; \ else true; fi; \ - echo '$$(DEPTC_'"$${c}"'_elf)' >> DEPTCA; \ - else true; fi; \ + done; \ + echo '' >> DEPTCA; \ done mv -f DEPTCA DEPTC @@ -806,19 +813,15 @@ DEPOBJ: $(OBJ_FORMAT_CFILES) echo ' $$(INCDIR)/obstack.h $$(BFDDIR)/libhppa.h \' >> DEPOBJA echo ' $$(BFDDIR)/som.h $$(INCDIR)/aout/stab_gnu.h \' >> DEPOBJA echo ' $$(INCDIR)/aout/stab.def' >> DEPOBJA -# We don't try to handle all multi cases. - for c in $(CPU_TYPES); do \ - $(CPU_MULTI_VALID) \ - if [ x$${valid} = xyes ]; then \ - o=ecoff; \ - $(CPU_OBJ_VALID) \ - echo 'DEPOBJ_'"$${c}"'_multi = \' >> DEPOBJA; \ - echo '$$(DEPOBJ_'"$${c}"'_coff) \' >> DEPOBJA; \ + for c in $(MULTI_CPU_TYPES); do \ + echo 'DEPOBJ_'"$${c}"'_multi = \' >> DEPOBJA; \ + for o in $(OBJ_FORMATS); do \ + $(MULTI_CPU_OBJ_VALID) \ if [ x$${valid} = xyes ]; then \ - echo '$$(DEPOBJ_'"$${c}"'_ecoff) \' >> DEPOBJA; \ + echo '$$(DEPOBJ_'"$${c}_$${o}"') \' >> DEPOBJA; \ else true; fi; \ - echo '$$(DEPOBJ_'"$${c}"'_elf)' >> DEPOBJA; \ - else true; fi; \ + done; \ + echo '' >> DEPOBJA; \ done mv -f DEPOBJA DEPOBJ @@ -841,19 +844,15 @@ DEP2: $(TARGET_CPU_HFILES) $(OBJ_FORMAT_HFILES) done; \ done echo 'DEP_hppa_som = $$(BFDDIR)/som.h' >> DEP2a -# We don't try to handle all multi cases. - for c in $(CPU_TYPES); do \ - $(CPU_MULTI_VALID) \ - if [ x$${valid} = xyes ]; then \ - o=ecoff; \ - $(CPU_OBJ_VALID) \ - echo 'DEP_'"$${c}"'_multi = \' >> DEP2a; \ - echo '$$(DEP_'"$${c}"'_coff) \' >> DEP2a; \ + for c in $(MULTI_CPU_TYPES); do \ + echo 'DEP_'"$${c}"'_multi = \' >> DEP2a; \ + for o in $(OBJ_FORMATS); do \ + $(MULTI_CPU_OBJ_VALID) \ if [ x$${valid} = xyes ]; then \ - echo '$$(DEP_'"$${c}"'_ecoff) \' >> DEP2a; \ + echo '$$(DEP_'"$${c}_$${o}"') \' >> DEP2a; \ else true; fi; \ - echo '$$(DEP_'"$${c}"'_elf)' >> DEP2a; \ - else true; fi; \ + done; \ + echo '' >> DEP2a; \ done mv -f DEP2a DEP2 @@ -992,6 +991,14 @@ DEPTC_arm_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-arm.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/arm.h \ $(INCDIR)/elf/reloc-macros.h +DEPTC_avr_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ + $(srcdir)/config/tc-avr.h $(INCDIR)/coff/internal.h \ + $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ + $(INCDIR)/obstack.h +DEPTC_avr_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ + $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-avr.h \ + emul.h subsegs.h $(INCDIR)/obstack.h DEPTC_d10v_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ $(srcdir)/config/tc-d10v.h $(INCDIR)/coff/internal.h \ $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ @@ -1298,7 +1305,8 @@ DEPTC_z8k_elf = $(srcdir)/../opcodes/z8k-opc.h $(INCDIR)/bin-bugs.h \ DEPTC_hppa_som = $(srcdir)/config/tc-hppa.h subsegs.h \ $(INCDIR)/obstack.h $(BFDDIR)/libhppa.h $(INCDIR)/opcode/hppa.h \ $(BFDDIR)/som.h -DEPTC_i386_multi = $(DEPTC_i386_coff) $(DEPTC_i386_elf) +DEPTC_i386_multi = $(DEPTC_i386_aout) $(DEPTC_i386_coff) \ + $(DEPTC_i386_elf) DEPTC_mips_multi = $(DEPTC_mips_coff) $(DEPTC_mips_ecoff) \ $(DEPTC_mips_elf) DEPOBJ_a29k_aout = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-aout.h \ @@ -1347,6 +1355,14 @@ DEPOBJ_arm_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-arm.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_avr_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ + $(srcdir)/config/tc-avr.h $(INCDIR)/coff/internal.h \ + $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ + subsegs.h +DEPOBJ_avr_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ + $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-avr.h \ + emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h DEPOBJ_d10v_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ $(srcdir)/config/tc-d10v.h $(INCDIR)/coff/internal.h \ $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ @@ -1622,7 +1638,8 @@ DEPOBJ_z8k_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ DEPOBJ_hppa_som = $(srcdir)/config/obj-som.h subsegs.h \ $(INCDIR)/obstack.h $(BFDDIR)/libhppa.h $(BFDDIR)/som.h \ $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def -DEPOBJ_i386_multi = $(DEPOBJ_i386_coff) $(DEPOBJ_i386_elf) +DEPOBJ_i386_multi = $(DEPOBJ_i386_aout) $(DEPOBJ_i386_coff) \ + $(DEPOBJ_i386_elf) DEPOBJ_mips_multi = $(DEPOBJ_mips_coff) $(DEPOBJ_mips_ecoff) \ $(DEPOBJ_mips_elf) DEP_a29k_aout = $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-a29k.h \ @@ -1654,6 +1671,11 @@ DEP_arm_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-arm.h \ DEP_arm_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ $(INCDIR)/bfdlink.h $(srcdir)/config/tc-arm.h +DEP_avr_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-avr.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h +DEP_avr_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(srcdir)/config/tc-avr.h DEP_d10v_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-d10v.h \ $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h DEP_d10v_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \ @@ -1837,7 +1859,8 @@ DEP_z8k_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ $(INCDIR)/bfdlink.h $(srcdir)/config/tc-z8k.h DEP_hppa_som = $(BFDDIR)/som.h -DEP_i386_multi = $(DEP_i386_coff) $(DEP_i386_elf) +DEP_i386_multi = $(DEP_i386_aout) $(DEP_i386_coff) \ + $(DEP_i386_elf) DEP_mips_multi = $(DEP_mips_coff) $(DEP_mips_ecoff) \ $(DEP_mips_elf) $(OBJS): $(DEP_@target_cpu_type@_@obj_format@) diff --git a/gas/Makefile.in b/gas/Makefile.in index da15e66a993..d3237c01338 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -230,12 +230,23 @@ CPU_OBJ_VALID = \ esac; -# This is like CPU_OBJ_VALID, for the obj=multi case. +# These are like CPU_TYPES and CPU_OBJ_VALID, for the obj=multi case. -CPU_MULTI_VALID = \ +MULTI_CPU_TYPES = i386 mips + +MULTI_CPU_OBJ_VALID = \ valid= ; \ - case $$c in \ - i386 | mips) valid=yes ;; \ + case $$o in \ + aout) \ + case $$c in \ + i386) valid=yes ;; \ + esac ;; \ + coff) valid=yes ;; \ + ecoff) \ + case $$c in \ + mips) valid=yes ;; \ + esac ;; \ + elf) valid=yes ;; \ esac; @@ -653,6 +664,16 @@ DEPTC_arm_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/elf/arm.h \ $(INCDIR)/elf/reloc-macros.h +DEPTC_avr_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ + $(srcdir)/config/tc-avr.h $(INCDIR)/coff/internal.h \ + $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ + $(INCDIR)/obstack.h + +DEPTC_avr_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ + $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-avr.h \ + emul.h subsegs.h $(INCDIR)/obstack.h + DEPTC_d10v_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ $(srcdir)/config/tc-d10v.h $(INCDIR)/coff/internal.h \ $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h subsegs.h \ @@ -1030,7 +1051,9 @@ DEPTC_hppa_som = $(srcdir)/config/tc-hppa.h subsegs.h \ $(INCDIR)/obstack.h $(BFDDIR)/libhppa.h $(INCDIR)/opcode/hppa.h \ $(BFDDIR)/som.h -DEPTC_i386_multi = $(DEPTC_i386_coff) $(DEPTC_i386_elf) +DEPTC_i386_multi = $(DEPTC_i386_aout) $(DEPTC_i386_coff) \ + $(DEPTC_i386_elf) + DEPTC_mips_multi = $(DEPTC_mips_coff) $(DEPTC_mips_ecoff) \ $(DEPTC_mips_elf) @@ -1092,6 +1115,16 @@ DEPOBJ_arm_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-arm.h \ emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h +DEPOBJ_avr_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ + $(srcdir)/config/tc-avr.h $(INCDIR)/coff/internal.h \ + $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ + subsegs.h + +DEPOBJ_avr_elf = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-elf.h \ + $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-avr.h \ + emul.h subsegs.h $(INCDIR)/obstack.h $(INCDIR)/aout/aout64.h + DEPOBJ_d10v_coff = $(INCDIR)/bin-bugs.h $(srcdir)/config/obj-coff.h \ $(srcdir)/config/tc-d10v.h $(INCDIR)/coff/internal.h \ $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h emul.h $(INCDIR)/obstack.h \ @@ -1438,7 +1471,9 @@ DEPOBJ_hppa_som = $(srcdir)/config/obj-som.h subsegs.h \ $(INCDIR)/obstack.h $(BFDDIR)/libhppa.h $(BFDDIR)/som.h \ $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def -DEPOBJ_i386_multi = $(DEPOBJ_i386_coff) $(DEPOBJ_i386_elf) +DEPOBJ_i386_multi = $(DEPOBJ_i386_aout) $(DEPOBJ_i386_coff) \ + $(DEPOBJ_i386_elf) + DEPOBJ_mips_multi = $(DEPOBJ_mips_coff) $(DEPOBJ_mips_ecoff) \ $(DEPOBJ_mips_elf) @@ -1482,6 +1517,13 @@ DEP_arm_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ $(INCDIR)/bfdlink.h $(srcdir)/config/tc-arm.h +DEP_avr_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-avr.h \ + $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h + +DEP_avr_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + $(INCDIR)/bfdlink.h $(srcdir)/config/tc-avr.h + DEP_d10v_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-d10v.h \ $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h @@ -1734,7 +1776,9 @@ DEP_z8k_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \ $(INCDIR)/bfdlink.h $(srcdir)/config/tc-z8k.h DEP_hppa_som = $(BFDDIR)/som.h -DEP_i386_multi = $(DEP_i386_coff) $(DEP_i386_elf) +DEP_i386_multi = $(DEP_i386_aout) $(DEP_i386_coff) \ + $(DEP_i386_elf) + DEP_mips_multi = $(DEP_mips_coff) $(DEP_mips_ecoff) \ $(DEP_mips_elf) @@ -2462,19 +2506,15 @@ DEPTC: $(TARGET_CPU_CFILES) echo 'DEPTC_hppa_som = $$(srcdir)/config/tc-hppa.h subsegs.h \' >> DEPTCA echo ' $$(INCDIR)/obstack.h $$(BFDDIR)/libhppa.h \' >> DEPTCA echo ' $$(INCDIR)/opcode/hppa.h $$(BFDDIR)/som.h' >> DEPTCA -# We don't try to handle all multi cases. - for c in $(CPU_TYPES); do \ - $(CPU_MULTI_VALID) \ - if [ x$${valid} = xyes ]; then \ - o=ecoff; \ - $(CPU_OBJ_VALID) \ - echo 'DEPTC_'"$${c}"'_multi = \' >> DEPTCA; \ - echo '$$(DEPTC_'"$${c}"'_coff) \' >> DEPTCA; \ + for c in $(MULTI_CPU_TYPES); do \ + echo 'DEPTC_'"$${c}"'_multi = \' >> DEPTCA; \ + for o in $(OBJ_FORMATS); do \ + $(MULTI_CPU_OBJ_VALID) \ if [ x$${valid} = xyes ]; then \ - echo '$$(DEPTC_'"$${c}"'_ecoff) \' >> DEPTCA; \ + echo '$$(DEPTC_'"$${c}_$${o}"') \' >> DEPTCA; \ else true; fi; \ - echo '$$(DEPTC_'"$${c}"'_elf)' >> DEPTCA; \ - else true; fi; \ + done; \ + echo '' >> DEPTCA; \ done mv -f DEPTCA DEPTC @@ -2505,19 +2545,15 @@ DEPOBJ: $(OBJ_FORMAT_CFILES) echo ' $$(INCDIR)/obstack.h $$(BFDDIR)/libhppa.h \' >> DEPOBJA echo ' $$(BFDDIR)/som.h $$(INCDIR)/aout/stab_gnu.h \' >> DEPOBJA echo ' $$(INCDIR)/aout/stab.def' >> DEPOBJA -# We don't try to handle all multi cases. - for c in $(CPU_TYPES); do \ - $(CPU_MULTI_VALID) \ - if [ x$${valid} = xyes ]; then \ - o=ecoff; \ - $(CPU_OBJ_VALID) \ - echo 'DEPOBJ_'"$${c}"'_multi = \' >> DEPOBJA; \ - echo '$$(DEPOBJ_'"$${c}"'_coff) \' >> DEPOBJA; \ + for c in $(MULTI_CPU_TYPES); do \ + echo 'DEPOBJ_'"$${c}"'_multi = \' >> DEPOBJA; \ + for o in $(OBJ_FORMATS); do \ + $(MULTI_CPU_OBJ_VALID) \ if [ x$${valid} = xyes ]; then \ - echo '$$(DEPOBJ_'"$${c}"'_ecoff) \' >> DEPOBJA; \ + echo '$$(DEPOBJ_'"$${c}_$${o}"') \' >> DEPOBJA; \ else true; fi; \ - echo '$$(DEPOBJ_'"$${c}"'_elf)' >> DEPOBJA; \ - else true; fi; \ + done; \ + echo '' >> DEPOBJA; \ done mv -f DEPOBJA DEPOBJ @@ -2540,19 +2576,15 @@ DEP2: $(TARGET_CPU_HFILES) $(OBJ_FORMAT_HFILES) done; \ done echo 'DEP_hppa_som = $$(BFDDIR)/som.h' >> DEP2a -# We don't try to handle all multi cases. - for c in $(CPU_TYPES); do \ - $(CPU_MULTI_VALID) \ - if [ x$${valid} = xyes ]; then \ - o=ecoff; \ - $(CPU_OBJ_VALID) \ - echo 'DEP_'"$${c}"'_multi = \' >> DEP2a; \ - echo '$$(DEP_'"$${c}"'_coff) \' >> DEP2a; \ + for c in $(MULTI_CPU_TYPES); do \ + echo 'DEP_'"$${c}"'_multi = \' >> DEP2a; \ + for o in $(OBJ_FORMATS); do \ + $(MULTI_CPU_OBJ_VALID) \ if [ x$${valid} = xyes ]; then \ - echo '$$(DEP_'"$${c}"'_ecoff) \' >> DEP2a; \ + echo '$$(DEP_'"$${c}_$${o}"') \' >> DEP2a; \ else true; fi; \ - echo '$$(DEP_'"$${c}"'_elf)' >> DEP2a; \ - else true; fi; \ + done; \ + echo '' >> DEP2a; \ done mv -f DEP2a DEP2