diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2017-02-28 18:08:21 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2017-02-28 18:08:21 -0800 |
| commit | 4d58a8fef5fd5d492a76521a5b4446f64069d2e2 (patch) | |
| tree | 30332e13bce266f1a6af5389d8a293d357058e3a /Makefile.in | |
| parent | 87646096a9c7afa39e581dbc236c5f77d39ba8b1 (diff) | |
| download | nasm-4d58a8fef5fd5d492a76521a5b4446f64069d2e2.tar.gz | |
Makefile: move all non-main objects into libnasm.a
There is no fundamental reason for all objects that don't contain a
main() function to not be part of libnasm.a; this allows the linker to
do its job optimally, especially in the presence of debugging code
which may not be needed under normal conditions.
If we do end up with function name conflicts the library might have to
be split, but it would be better to simply avoid that case.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/Makefile.in b/Makefile.in index 03160aba..ca1bcd44 100644 --- a/Makefile.in +++ b/Makefile.in @@ -85,7 +85,25 @@ endif $(XMLTO) man --skip-validation $< 2>/dev/null #-- Begin File Lists --# -NASM = asm/nasm.$(O) \ +NASM = asm/nasm.$(O) +NDISASM = disasm/ndisasm.$(O) + +LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \ + stdlib/strnlen.$(O) \ + nasmlib/ver.$(O) \ + nasmlib/crc64.$(O) nasmlib/malloc.$(O) \ + nasmlib/error.$(O) nasmlib/md5c.$(O) nasmlib/string.$(O) \ + nasmlib/file.$(O) nasmlib/mmap.$(O) nasmlib/ilog2.$(O) \ + nasmlib/realpath.$(O) nasmlib/filename.$(O) nasmlib/srcfile.$(O) \ + nasmlib/zerobuf.$(O) nasmlib/readnum.$(O) nasmlib/bsi.$(O) \ + nasmlib/rbtree.$(O) nasmlib/hashtbl.$(O) \ + nasmlib/raa.$(O) nasmlib/saa.$(O) \ + nasmlib/strlist.$(O) \ + common/common.$(O) \ + x86/insnsa.$(O) x86/insnsb.$(O) x86/insnsd.$(O) x86/insnsn.$(O) \ + x86/regs.$(O) x86/regvals.$(O) x86/regflags.$(O) x86/regdis.$(O) \ + x86/disp8.$(O) x86/iflag.$(O) \ + \ asm/float.$(O) \ asm/directiv.$(O) \ asm/assemble.$(O) asm/labels.$(O) asm/parser.$(O) \ @@ -105,25 +123,9 @@ NASM = asm/nasm.$(O) \ output/outelf.$(O) \ output/outobj.$(O) output/outas86.$(O) output/outrdf2.$(O) \ output/outdbg.$(O) output/outieee.$(O) output/outmacho.$(O) \ - output/codeview.$(O) - -NDISASM = disasm/ndisasm.$(O) disasm/disasm.$(O) disasm/sync.$(O) - -LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \ - stdlib/strnlen.$(O) \ - nasmlib/ver.$(O) \ - nasmlib/crc64.$(O) nasmlib/malloc.$(O) \ - nasmlib/error.$(O) nasmlib/md5c.$(O) nasmlib/string.$(O) \ - nasmlib/file.$(O) nasmlib/mmap.$(O) nasmlib/ilog2.$(O) \ - nasmlib/realpath.$(O) nasmlib/filename.$(O) nasmlib/srcfile.$(O) \ - nasmlib/zerobuf.$(O) nasmlib/readnum.$(O) nasmlib/bsi.$(O) \ - nasmlib/rbtree.$(O) nasmlib/hashtbl.$(O) \ - nasmlib/raa.$(O) nasmlib/saa.$(O) \ - nasmlib/strlist.$(O) \ - common/common.$(O) \ - x86/insnsa.$(O) x86/insnsb.$(O) x86/insnsd.$(O) x86/insnsn.$(O) \ - x86/regs.$(O) x86/regvals.$(O) x86/regflags.$(O) x86/regdis.$(O) \ - x86/disp8.$(O) x86/iflag.$(O) + output/codeview.$(O) \ + \ + disasm/disasm.$(O) disasm/sync.$(O) #-- End File Lists --# all: nasm$(X) ndisasm$(X) rdf |