diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2017-04-06 18:08:43 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2017-04-06 18:08:43 -0700 |
| commit | 070508a5ae507f82b8c85285a2ede504c2be447d (patch) | |
| tree | 4f596b0b04538fb145a6bf8b84d52771cb7d0dbe /Makefile.in | |
| parent | 5d2e42e62139a50f38748adc78b5c88ef2053794 (diff) | |
| download | nasm-070508a5ae507f82b8c85285a2ede504c2be447d.tar.gz | |
Makefile.in: make rules for rdoff only define dependencies
MSVC command-line syntax doesn't allow us to share these rules if
explicit.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index 05ca2968..d716494c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -86,6 +86,10 @@ endif .xml.1: $(XMLTO) man --skip-validation $< 2>/dev/null +# This rule is only used for rdoff, to allow common rules +.$(O)$(X): + $(CC) $(LDFLAGS) -o $@ $(NDISASM) $(RDFLIB) $(NASMLIB) $(LIBS) + #-- Begin File Lists --# NASM = asm/nasm.$(O) NDISASM = disasm/ndisasm.$(O) @@ -146,10 +150,10 @@ $(NASMLIB): $(LIBOBJ) $(RANLIB) $(NASMLIB) nasm$(X): $(NASM) $(NASMLIB) - $(CC) $(LDFLAGS) -o nasm$(X) $(NASM) $(NASMLIB) $(LIBS) + $(LD) $(LDFLAGS) -o nasm$(X) $(NASM) $(NASMLIB) $(LIBS) ndisasm$(X): $(NDISASM) $(NASMLIB) - $(CC) $(LDFLAGS) -o ndisasm$(X) $(NDISASM) $(NASMLIB) $(LIBS) + $(LD) $(LDFLAGS) -o ndisasm$(X) $(NDISASM) $(NASMLIB) $(LIBS) #-- Begin Generated File Rules --# @@ -284,15 +288,10 @@ RDFLIB = rdoff/librdoff.$(A) RDFLIBS = $(RDFLIB) $(NASMLIB) rdoff/rdfdump$(X): rdoff/rdfdump.$(O) $(RDFLIBS) - $(CC) $(LDFLAGS) -o rdoff/rdfdump$(X) rdoff/rdfdump.$(O) $(RDFLIBS) $(LIBS) rdoff/ldrdf$(X): rdoff/ldrdf.$(O) $(RDFLIBS) - $(CC) $(LDFLAGS) -o rdoff/ldrdf$(X) rdoff/ldrdf.$(O) $(RDFLIBS) $(LIBS) rdoff/rdx$(X): rdoff/rdx.$(O) $(RDFLIBS) - $(CC) $(LDFLAGS) -o rdoff/rdx$(X) rdoff/rdx.$(O) $(RDFLIBS) $(LIBS) rdoff/rdflib$(X): rdoff/rdflib.$(O) $(RDFLIBS) - $(CC) $(LDFLAGS) -o rdoff/rdflib$(X) rdoff/rdflib.$(O) $(RDFLIBS) $(LIBS) rdoff/rdf2bin$(X): rdoff/rdf2bin.$(O) $(RDFLIBS) - $(CC) $(LDFLAGS) -o rdoff/rdf2bin$(X) rdoff/rdf2bin.$(O) $(RDFLIBS) $(LIBS) rdoff/rdf2com$(X): rdoff/rdf2bin$(X) $(RM_F) rdoff/rdf2com$(X) cd rdoff && $(LN_S) rdf2bin$(X) rdf2com$(X) |