From 3a7edd73a35ee09ee3cbf783f4d7b7148884603a Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Mon, 17 Sep 2007 13:56:26 -0700 Subject: [PATCH] Sort dependency lists Sort the dependency lists generated by "mkdep.pl", to make sure that re-running "make alldeps" doesn't change anything unless there has been real dependency changes. The previous version could produce different output between runs and across platforms. --- Makefile.in | 117 +++++++++++++++++++++++++++---------------------------- Mkfiles/msvc.mak | 112 ++++++++++++++++++++++++++-------------------------- mkdep.pl | 2 +- 3 files changed, 115 insertions(+), 116 deletions(-) diff --git a/Makefile.in b/Makefile.in index ffc99a8..0dc6aed 100644 --- a/Makefile.in +++ b/Makefile.in @@ -207,72 +207,71 @@ alldeps: perlreq # @object-ending: ".$(O)" # @path-separator: "/" #-- Everything below is generated by mkdep.pl - do not edit --# -assemble.$(O): assemble.c preproc.h insns.h compiler.h pptok.h regs.h \ - regflags.c config.h version.h nasmlib.h nasm.h regvals.c insnsi.h \ - assemble.h +assemble.$(O): assemble.c assemble.h compiler.h config.h insns.h insnsi.h \ + nasm.h nasmlib.h pptok.h preproc.h regflags.c regs.h regvals.c version.h crc64.$(O): crc64.c -disasm.$(O): disasm.c insns.h sync.h compiler.h regdis.c regs.h config.h \ - regs.c version.h nasm.h insnsn.c names.c insnsi.h disasm.h -eval.$(O): eval.c labels.h eval.h compiler.h regs.h config.h version.h \ - nasmlib.h nasm.h insnsi.h -float.$(O): float.c compiler.h regs.h config.h version.h nasm.h insnsi.h -hashtbl.$(O): hashtbl.c compiler.h regs.h config.h version.h nasmlib.h \ - hashtbl.h nasm.h insnsi.h -insnsa.$(O): insnsa.c insns.h compiler.h regs.h config.h version.h nasm.h \ - insnsi.h -insnsd.$(O): insnsd.c insns.h compiler.h regs.h config.h version.h nasm.h \ - insnsi.h +disasm.$(O): disasm.c compiler.h config.h disasm.h insns.h insnsi.h insnsn.c \ + names.c nasm.h regdis.c regs.c regs.h sync.h version.h +eval.$(O): eval.c compiler.h config.h eval.h insnsi.h labels.h nasm.h \ + nasmlib.h regs.h version.h +float.$(O): float.c compiler.h config.h insnsi.h nasm.h regs.h version.h +hashtbl.$(O): hashtbl.c compiler.h config.h hashtbl.h insnsi.h nasm.h \ + nasmlib.h regs.h version.h +insnsa.$(O): insnsa.c compiler.h config.h insns.h insnsi.h nasm.h regs.h \ + version.h +insnsd.$(O): insnsd.c compiler.h config.h insns.h insnsi.h nasm.h regs.h \ + version.h insnsn.$(O): insnsn.c -labels.$(O): labels.c compiler.h regs.h config.h version.h hashtbl.h \ - nasmlib.h nasm.h insnsi.h -listing.$(O): listing.c compiler.h regs.h config.h version.h nasmlib.h \ - nasm.h insnsi.h listing.h +labels.$(O): labels.c compiler.h config.h hashtbl.h insnsi.h nasm.h \ + nasmlib.h regs.h version.h +listing.$(O): listing.c compiler.h config.h insnsi.h listing.h nasm.h \ + nasmlib.h regs.h version.h macros.$(O): macros.c -names.$(O): names.c regs.c insnsn.c -nasm.$(O): nasm.c preproc.h insns.h eval.h config.h nasmlib.h nasm.h \ - stdscan.h assemble.h insnsi.h labels.h parser.h compiler.h regs.h pptok.h \ - outform.h version.h listing.h -nasmlib.$(O): nasmlib.c insns.h config.h nasmlib.h nasm.h insnsi.h \ - compiler.h regs.h version.h -ndisasm.$(O): ndisasm.c insns.h config.h nasmlib.h nasm.h insnsi.h disasm.h \ - sync.h compiler.h regs.h version.h -outform.$(O): outform.c config.h nasm.h insnsi.h compiler.h regs.h outform.h \ +names.$(O): names.c insnsn.c regs.c +nasm.$(O): nasm.c assemble.h compiler.h config.h eval.h insns.h insnsi.h \ + labels.h listing.h nasm.h nasmlib.h outform.h parser.h pptok.h preproc.h \ + regs.h stdscan.h version.h +nasmlib.$(O): nasmlib.c compiler.h config.h insns.h insnsi.h nasm.h \ + nasmlib.h regs.h version.h +ndisasm.$(O): ndisasm.c compiler.h config.h disasm.h insns.h insnsi.h nasm.h \ + nasmlib.h regs.h sync.h version.h +outform.$(O): outform.c compiler.h config.h insnsi.h nasm.h outform.h regs.h \ version.h -output/outaout.$(O): output/outaout.c config.h nasmlib.h nasm.h stdscan.h \ - insnsi.h compiler.h regs.h outform.h version.h -output/outas86.$(O): output/outas86.c config.h nasmlib.h nasm.h insnsi.h \ - compiler.h regs.h outform.h version.h -output/outbin.$(O): output/outbin.c eval.h config.h nasmlib.h nasm.h \ - stdscan.h insnsi.h labels.h compiler.h regs.h outform.h version.h -output/outcoff.$(O): output/outcoff.c config.h nasmlib.h nasm.h insnsi.h \ - compiler.h regs.h outform.h version.h -output/outdbg.$(O): output/outdbg.c config.h nasmlib.h nasm.h insnsi.h \ - compiler.h regs.h outform.h version.h -output/outelf32.$(O): output/outelf32.c config.h nasmlib.h nasm.h stdscan.h \ - insnsi.h compiler.h regs.h outform.h version.h -output/outelf64.$(O): output/outelf64.c config.h nasmlib.h nasm.h stdscan.h \ - insnsi.h compiler.h regs.h outform.h version.h -output/outieee.$(O): output/outieee.c config.h nasmlib.h nasm.h insnsi.h \ - compiler.h regs.h outform.h version.h -output/outmacho.$(O): output/outmacho.c config.h nasmlib.h nasm.h insnsi.h \ - compiler.h regs.h outform.h version.h -output/outobj.$(O): output/outobj.c config.h nasmlib.h nasm.h stdscan.h \ - insnsi.h compiler.h regs.h outform.h version.h -output/outrdf.$(O): output/outrdf.c config.h nasmlib.h nasm.h insnsi.h \ - compiler.h regs.h outform.h version.h -output/outrdf2.$(O): output/outrdf2.c config.h nasmlib.h nasm.h insnsi.h \ - rdoff/rdoff.h compiler.h regs.h outform.h version.h -parser.$(O): parser.c insns.h regflags.c config.h nasmlib.h nasm.h stdscan.h \ - insnsi.h parser.h float.h compiler.h regs.h version.h -pptok.$(O): pptok.c preproc.h config.h nasmlib.h compiler.h pptok.h -preproc.$(O): preproc.c preproc.h config.h hashtbl.h nasmlib.h nasm.h \ - insnsi.h macros.c compiler.h pptok.h regs.h version.h +output/outaout.$(O): output/outaout.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h outform.h regs.h stdscan.h version.h +output/outas86.$(O): output/outas86.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h outform.h regs.h version.h +output/outbin.$(O): output/outbin.c compiler.h config.h eval.h insnsi.h \ + labels.h nasm.h nasmlib.h outform.h regs.h stdscan.h version.h +output/outcoff.$(O): output/outcoff.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h outform.h regs.h version.h +output/outdbg.$(O): output/outdbg.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h outform.h regs.h version.h +output/outelf32.$(O): output/outelf32.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h outform.h regs.h stdscan.h version.h +output/outelf64.$(O): output/outelf64.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h outform.h regs.h stdscan.h version.h +output/outieee.$(O): output/outieee.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h outform.h regs.h version.h +output/outmacho.$(O): output/outmacho.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h outform.h regs.h version.h +output/outobj.$(O): output/outobj.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h outform.h regs.h stdscan.h version.h +output/outrdf.$(O): output/outrdf.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h outform.h regs.h version.h +output/outrdf2.$(O): output/outrdf2.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h outform.h rdoff/rdoff.h regs.h version.h +parser.$(O): parser.c compiler.h config.h float.h insns.h insnsi.h nasm.h \ + nasmlib.h parser.h regflags.c regs.h stdscan.h version.h +pptok.$(O): pptok.c compiler.h config.h nasmlib.h pptok.h preproc.h +preproc.$(O): preproc.c compiler.h config.h hashtbl.h insnsi.h macros.c \ + nasm.h nasmlib.h pptok.h preproc.h regs.h version.h regdis.$(O): regdis.c regflags.$(O): regflags.c regs.$(O): regs.c regvals.$(O): regvals.c -stdscan.$(O): stdscan.c insns.h config.h nasmlib.h nasm.h stdscan.h insnsi.h \ - compiler.h regs.h version.h +stdscan.$(O): stdscan.c compiler.h config.h insns.h insnsi.h nasm.h \ + nasmlib.h regs.h stdscan.h version.h sync.$(O): sync.c sync.h -tokhash.$(O): tokhash.c insns.h config.h nasm.h insnsi.h compiler.h regs.h \ +tokhash.$(O): tokhash.c compiler.h config.h insns.h insnsi.h nasm.h regs.h \ version.h diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak index 3f3ff3a..d70973d 100644 --- a/Mkfiles/msvc.mak +++ b/Mkfiles/msvc.mak @@ -165,71 +165,71 @@ everything: all doc rdf # @object-ending: ".$(O)" # @path-separator: "/" #-- Everything below is generated by mkdep.pl - do not edit --# -assemble.$(O): assemble.c preproc.h insns.h regflags.c config.h nasmlib.h \ - nasm.h assemble.h insnsi.h compiler.h pptok.h regs.h version.h regvals.c +assemble.$(O): assemble.c assemble.h compiler.h config.h insns.h insnsi.h \ + nasm.h nasmlib.h pptok.h preproc.h regflags.c regs.h regvals.c version.h crc64.$(O): crc64.c -disasm.$(O): disasm.c insns.h regdis.c config.h regs.c nasm.h names.c \ - insnsi.h disasm.h sync.h compiler.h regs.h version.h insnsn.c -eval.$(O): eval.c eval.h config.h nasmlib.h nasm.h insnsi.h labels.h \ - compiler.h regs.h version.h -float.$(O): float.c config.h nasm.h insnsi.h compiler.h regs.h version.h -hashtbl.$(O): hashtbl.c config.h nasmlib.h hashtbl.h nasm.h insnsi.h \ - compiler.h regs.h version.h -insnsa.$(O): insnsa.c insns.h config.h nasm.h insnsi.h compiler.h regs.h \ +disasm.$(O): disasm.c compiler.h config.h disasm.h insns.h insnsi.h insnsn.c \ + names.c nasm.h regdis.c regs.c regs.h sync.h version.h +eval.$(O): eval.c compiler.h config.h eval.h insnsi.h labels.h nasm.h \ + nasmlib.h regs.h version.h +float.$(O): float.c compiler.h config.h insnsi.h nasm.h regs.h version.h +hashtbl.$(O): hashtbl.c compiler.h config.h hashtbl.h insnsi.h nasm.h \ + nasmlib.h regs.h version.h +insnsa.$(O): insnsa.c compiler.h config.h insns.h insnsi.h nasm.h regs.h \ version.h -insnsd.$(O): insnsd.c insns.h config.h nasm.h insnsi.h compiler.h regs.h \ +insnsd.$(O): insnsd.c compiler.h config.h insns.h insnsi.h nasm.h regs.h \ version.h insnsn.$(O): insnsn.c -labels.$(O): labels.c config.h hashtbl.h nasmlib.h nasm.h insnsi.h \ - compiler.h regs.h version.h -listing.$(O): listing.c config.h nasmlib.h nasm.h insnsi.h compiler.h regs.h \ - version.h listing.h +labels.$(O): labels.c compiler.h config.h hashtbl.h insnsi.h nasm.h \ + nasmlib.h regs.h version.h +listing.$(O): listing.c compiler.h config.h insnsi.h listing.h nasm.h \ + nasmlib.h regs.h version.h macros.$(O): macros.c -names.$(O): names.c regs.c insnsn.c -nasm.$(O): nasm.c preproc.h insns.h eval.h config.h nasmlib.h nasm.h \ - stdscan.h assemble.h insnsi.h labels.h parser.h compiler.h pptok.h regs.h \ - outform.h version.h listing.h -nasmlib.$(O): nasmlib.c insns.h config.h nasmlib.h nasm.h insnsi.h \ - compiler.h regs.h version.h -ndisasm.$(O): ndisasm.c insns.h config.h nasmlib.h nasm.h insnsi.h disasm.h \ - sync.h compiler.h regs.h version.h -outform.$(O): outform.c config.h nasm.h insnsi.h compiler.h regs.h outform.h \ +names.$(O): names.c insnsn.c regs.c +nasm.$(O): nasm.c assemble.h compiler.h config.h eval.h insns.h insnsi.h \ + labels.h listing.h nasm.h nasmlib.h outform.h parser.h pptok.h preproc.h \ + regs.h stdscan.h version.h +nasmlib.$(O): nasmlib.c compiler.h config.h insns.h insnsi.h nasm.h \ + nasmlib.h regs.h version.h +ndisasm.$(O): ndisasm.c compiler.h config.h disasm.h insns.h insnsi.h nasm.h \ + nasmlib.h regs.h sync.h version.h +outform.$(O): outform.c compiler.h config.h insnsi.h nasm.h outform.h regs.h \ version.h -output/outaout.$(O): output/outaout.c config.h nasmlib.h nasm.h stdscan.h \ - insnsi.h compiler.h regs.h outform.h version.h -output/outas86.$(O): output/outas86.c config.h nasmlib.h nasm.h insnsi.h \ - compiler.h regs.h outform.h version.h -output/outbin.$(O): output/outbin.c eval.h config.h nasmlib.h nasm.h \ - stdscan.h insnsi.h labels.h compiler.h regs.h outform.h version.h -output/outcoff.$(O): output/outcoff.c config.h nasmlib.h nasm.h insnsi.h \ - compiler.h regs.h outform.h version.h -output/outdbg.$(O): output/outdbg.c config.h nasmlib.h nasm.h insnsi.h \ - compiler.h regs.h outform.h version.h -output/outelf32.$(O): output/outelf32.c config.h nasmlib.h nasm.h stdscan.h \ - insnsi.h compiler.h regs.h outform.h version.h -output/outelf64.$(O): output/outelf64.c config.h nasmlib.h nasm.h stdscan.h \ - insnsi.h compiler.h regs.h outform.h version.h -output/outieee.$(O): output/outieee.c config.h nasmlib.h nasm.h insnsi.h \ - compiler.h regs.h outform.h version.h -output/outmacho.$(O): output/outmacho.c config.h nasmlib.h nasm.h insnsi.h \ - compiler.h regs.h outform.h version.h -output/outobj.$(O): output/outobj.c config.h nasmlib.h nasm.h stdscan.h \ - insnsi.h compiler.h regs.h outform.h version.h -output/outrdf.$(O): output/outrdf.c config.h nasmlib.h nasm.h insnsi.h \ - compiler.h regs.h outform.h version.h -output/outrdf2.$(O): output/outrdf2.c config.h nasmlib.h nasm.h insnsi.h \ - rdoff/rdoff.h compiler.h regs.h outform.h version.h -parser.$(O): parser.c insns.h regflags.c config.h nasmlib.h nasm.h stdscan.h \ - insnsi.h parser.h float.h compiler.h regs.h version.h -pptok.$(O): pptok.c preproc.h config.h nasmlib.h compiler.h pptok.h -preproc.$(O): preproc.c preproc.h config.h hashtbl.h nasmlib.h nasm.h \ - insnsi.h macros.c compiler.h pptok.h regs.h version.h +output/outaout.$(O): output/outaout.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h outform.h regs.h stdscan.h version.h +output/outas86.$(O): output/outas86.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h outform.h regs.h version.h +output/outbin.$(O): output/outbin.c compiler.h config.h eval.h insnsi.h \ + labels.h nasm.h nasmlib.h outform.h regs.h stdscan.h version.h +output/outcoff.$(O): output/outcoff.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h outform.h regs.h version.h +output/outdbg.$(O): output/outdbg.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h outform.h regs.h version.h +output/outelf32.$(O): output/outelf32.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h outform.h regs.h stdscan.h version.h +output/outelf64.$(O): output/outelf64.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h outform.h regs.h stdscan.h version.h +output/outieee.$(O): output/outieee.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h outform.h regs.h version.h +output/outmacho.$(O): output/outmacho.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h outform.h regs.h version.h +output/outobj.$(O): output/outobj.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h outform.h regs.h stdscan.h version.h +output/outrdf.$(O): output/outrdf.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h outform.h regs.h version.h +output/outrdf2.$(O): output/outrdf2.c compiler.h config.h insnsi.h nasm.h \ + nasmlib.h outform.h rdoff/rdoff.h regs.h version.h +parser.$(O): parser.c compiler.h config.h float.h insns.h insnsi.h nasm.h \ + nasmlib.h parser.h regflags.c regs.h stdscan.h version.h +pptok.$(O): pptok.c compiler.h config.h nasmlib.h pptok.h preproc.h +preproc.$(O): preproc.c compiler.h config.h hashtbl.h insnsi.h macros.c \ + nasm.h nasmlib.h pptok.h preproc.h regs.h version.h regdis.$(O): regdis.c regflags.$(O): regflags.c regs.$(O): regs.c regvals.$(O): regvals.c -stdscan.$(O): stdscan.c insns.h config.h nasmlib.h nasm.h stdscan.h insnsi.h \ - compiler.h regs.h version.h +stdscan.$(O): stdscan.c compiler.h config.h insns.h insnsi.h nasm.h \ + nasmlib.h regs.h stdscan.h version.h sync.$(O): sync.c sync.h -tokhash.$(O): tokhash.c insns.h config.h nasm.h insnsi.h compiler.h regs.h \ +tokhash.$(O): tokhash.c compiler.h config.h insns.h insnsi.h nasm.h regs.h \ version.h diff --git a/mkdep.pl b/mkdep.pl index 65a6d10..31eb88d 100755 --- a/mkdep.pl +++ b/mkdep.pl @@ -54,7 +54,7 @@ sub alldeps($) { $adeps{$idep} = 1; } } - return keys(%adeps); + return sort(keys(%adeps)); } # This converts a filename from host syntax to target syntax -- 2.7.4