diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2017-11-06 22:37:37 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2017-11-06 22:37:37 -0800 |
| commit | ceeaf11e66d7e1b7ad511446f308337981f71a71 (patch) | |
| tree | 944768624006cd475296e3d7575bcac4ead0e1e7 /Mkfiles | |
| parent | ad4016952d566ca5f95566676b2d4d126da92e54 (diff) | |
| download | nasm-ceeaf11e66d7e1b7ad511446f308337981f71a71.tar.gz | |
Make dependency generation a bit more robust
Improve the corner cases where we might end up with bogus
dependencies.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'Mkfiles')
| -rw-r--r-- | Mkfiles/msvc.mak | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak index 4f0ba32b..d77d822b 100644 --- a/Mkfiles/msvc.mak +++ b/Mkfiles/msvc.mak @@ -263,11 +263,19 @@ RDF2BINLINKS = rdoff\rdf2com$(X) rdoff\rdf2ith$(X) \ RDFLIB = rdoff\librdoff.$(A) RDFLIBS = $(RDFLIB) $(NASMLIB) +# This rule is only used for rdoff, to allow common rules +MAKERDF = $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $< $(RDFLIB) $(NASMLIB) $(LIBS) + rdoff\rdfdump$(X): rdoff\rdfdump.$(O) $(RDFLIBS) + $(MAKERDF) rdoff\ldrdf$(X): rdoff\ldrdf.$(O) $(RDFLIBS) + $(MAKERDF) rdoff\rdx$(X): rdoff\rdx.$(O) $(RDFLIBS) + $(MAKERDF) rdoff\rdflib$(X): rdoff\rdflib.$(O) $(RDFLIBS) + $(MAKERDF) rdoff\rdf2bin$(X): rdoff\rdf2bin.$(O) $(RDFLIBS) + $(MAKERDF) rdoff\rdf2com$(X): rdoff\rdf2bin$(X) $(RM_F) rdoff\rdf2com$(X) cd rdoff && $(LN_S) rdf2bin$(X) rdf2com$(X) @@ -366,7 +374,5 @@ everything: all docs nsis # @object-ending: ".$(O)" # @path-separator: "\" # @exclude: "config/config.h" -# @external: "msvc.dep" # @include-command: "!INCLUDE" #-- Everything below is generated by mkdep.pl - do not edit --# -!INCLUDE msvc.dep |