diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2017-04-23 23:52:32 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2017-04-23 23:52:32 -0700 |
| commit | e0172d58706ccbe740bd153c38da42d18f306ade (patch) | |
| tree | 44c64d97aff1e1a3f7871443f058e1c37068347e /Makefile.in | |
| parent | 28b588b91e8afc7d31e6d7c2560e214f049801a3 (diff) | |
| parent | 4b177bfb0373e7c8309be5841d9a13664b643d22 (diff) | |
| download | nasm-e0172d58706ccbe740bd153c38da42d18f306ade.tar.gz nasm-e0172d58706ccbe740bd153c38da42d18f306ade.tar.xz nasm-e0172d58706ccbe740bd153c38da42d18f306ade.zip | |
Merge branch 'master' into elf
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index f5505a67..71783af4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -100,7 +100,8 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \ nasmlib/crc64.$(O) nasmlib/malloc.$(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/realpath.$(O) nasmlib/path.$(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) \ @@ -348,6 +349,7 @@ clean: $(RM_F) nasm-*-installer-*.exe $(RM_F) tags TAGS $(RM_F) nsis/arch.nsh + $(RM_F) perlbreq.si $(RM_F) $(RDFPROGS) $(RDF2BINLINKS) distclean: clean @@ -417,8 +419,16 @@ tar: dist spec: nasm.spec -nasm.spec: nasm.spec.in version.sed - sed -f version.sed < nasm.spec.in > nasm.spec +ALLPERLSRC := $(shell find $(srcdir) -type f -name '*.p[lh]') + +perlbreq.si: $(ALLPERLSRC) + sed -n -r -e 's/^use[[:space:]]+([^[:space:];]+).*$$/BuildRequires: perl(\1)/p' $(ALLPERLSRC) | \ + sed -r -e '/perl\((strict|warnings)\)/d' | \ + sort | uniq > perlbreq.si || ( rm -f perlbreq.si ; false ) + +nasm.spec: nasm.spec.in nasm.spec.sed version.sed perlbreq.si + sed -f version.sed -f nasm.spec.sed \ + < nasm.spec.in > nasm.spec || ( rm -f nasm.spec ; false ) splint: splint -weak *.c @@ -619,6 +629,9 @@ nasmlib/md5c.$(O): nasmlib/md5c.c config/config.h config/msvc.h \ nasmlib/mmap.$(O): nasmlib/mmap.c config/config.h config/msvc.h \ config/unknown.h config/watcom.h include/compiler.h include/error.h \ include/nasmint.h include/nasmlib.h nasmlib/file.h +nasmlib/path.$(O): nasmlib/path.c config/config.h config/msvc.h \ + config/unknown.h config/watcom.h include/compiler.h include/error.h \ + include/nasmint.h include/nasmlib.h nasmlib/perfhash.$(O): nasmlib/perfhash.c config/config.h config/msvc.h \ config/unknown.h config/watcom.h include/compiler.h include/hashtbl.h \ include/nasmint.h include/nasmlib.h include/perfhash.h |