diff options
| author | H. Peter Anvin (Intel) <hpa@zytor.com> | 2018-12-13 16:43:43 -0800 |
|---|---|---|
| committer | H. Peter Anvin (Intel) <hpa@zytor.com> | 2018-12-13 16:43:43 -0800 |
| commit | df2195b6a978448f640cae552858740d214886a4 (patch) | |
| tree | ad9a7198f2b89ad36e6d06fc7bfb560b3fc0ce74 /Makefile.in | |
| parent | fef75c265a2dafb6482ffd4078f74f2a66fa2535 (diff) | |
| parent | 3b91f4c117003a9f42717fe88257b6025790169e (diff) | |
| download | nasm-df2195b6a978448f640cae552858740d214886a4.tar.gz | |
Merge remote-tracking branch 'origin/nasm-2.14.xx'
Resolved Conflicts:
Makefile.in
Mkfiles/msvc.mak
Mkfiles/openwcom.mak
asm/nasm.c
nasmlib/alloc.c
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 8e55e83e..78eaffe2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -96,8 +96,9 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \ stdlib/strnlen.$(O) stdlib/strrchrnul.$(O) \ \ nasmlib/ver.$(O) \ - nasmlib/crc64.$(O) nasmlib/alloc.$(O) nasmlib/asprintf.$(O) \ - nasmlib/md5c.$(O) nasmlib/string.$(O) nasmlib/nctype.$(O) \ + nasmlib/alloc.$(O) nasmlib/asprintf.$(O) nasmlib/errfile.$(O) \ + nasmlib/crc64.$(O) nasmlib/md5c.$(O) \ + nasmlib/string.$(O) nasmlib/nctype.$(O) \ nasmlib/file.$(O) nasmlib/mmap.$(O) nasmlib/ilog2.$(O) \ nasmlib/realpath.$(O) nasmlib/path.$(O) \ nasmlib/filename.$(O) \ |