diff options
| -rw-r--r-- | Makefile.in | 7 | ||||
| -rw-r--r-- | rdoff/Makefile.in | 20 |
2 files changed, 12 insertions, 15 deletions
diff --git a/Makefile.in b/Makefile.in index 8370d9a..54fafe9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -81,8 +81,7 @@ NDISASM = ndisasm.$(O) disasm.$(O) sync.$(O) nasmlib.$(O) ver.$(O) \ insnsd.$(O) insnsb.$(O) insnsn.$(O) regs.$(O) regdis.$(O) #-- End File Lists --# -all: nasm$(X) ndisasm$(X) nasm.man ndisasm.man - cd rdoff && $(MAKE) all +all: nasm$(X) ndisasm$(X) nasm.man ndisasm.man rdf nasm$(X): $(NASM) $(XOBJS) $(CC) $(LDFLAGS) -o nasm$(X) $(NASM) $(XOBJS) $(LIBS) @@ -209,8 +208,8 @@ spotless: distclean cleaner strip: $(STRIP) --strip-unneeded nasm$(X) ndisasm$(X) -rdf: - cd rdoff && $(MAKE) +rdf: nasmlib.$(O) + cd rdoff && $(MAKE) all TAGS: $(RM) -f TAGS diff --git a/rdoff/Makefile.in b/rdoff/Makefile.in index 93f2e2a..7795ab7 100644 --- a/rdoff/Makefile.in +++ b/rdoff/Makefile.in @@ -29,8 +29,10 @@ INSTALL_DATA = @INSTALL_DATA@ LN_S = @LN_S@ MKDIR = mkdir -LDRDFLIBS = rdoff.o nasmlib.o symtab.o collectn.o rdlib.o segtab.o hash.o -RDXLIBS = rdoff.o rdfload.o symtab.o collectn.o hash.o +LDRDFLIBS = rdoff.$(O) symtab.$(O) collectn.$(O) \ + rdlib.$(O) segtab.$(O) hash.$(O) +RDXLIBS = rdoff.$(O) rdfload.$(O) symtab.$(O) collectn.$(O) hash.$(O) +NASMLIB = ../nasmlib.$(O) # Binary suffixes O = @OBJEXT@ @@ -49,13 +51,13 @@ all: $(PROGRAMS) rdfdump$(X): rdfdump.$(O) rdoff.$(O) $(CC) $(LDFLAGS) -o rdfdump$(X) rdfdump.$(O) rdoff.$(O) ldrdf$(X): ldrdf.$(O) $(LDRDFLIBS) - $(CC) $(LDFLAGS) -o ldrdf$(X) ldrdf.$(O) $(LDRDFLIBS) -rdx$(X): rdx.$(O) $(RDXLIBS) - $(CC) $(LDFLAGS) -o rdx$(X) rdx.$(O) $(RDXLIBS) + $(CC) $(LDFLAGS) -o ldrdf$(X) ldrdf.$(O) $(LDRDFLIBS) $(NASMLIB) +rdx$(X): rdx.$(O) $(RDXLIBS) $(NASMLIB) + $(CC) $(LDFLAGS) -o rdx$(X) rdx.$(O) $(RDXLIBS) $(NASMLIB) rdflib$(X): rdflib.$(O) $(CC) $(LDFLAGS) -o rdflib$(X) rdflib.$(O) -rdf2bin$(X): rdf2bin.$(O) $(RDXLIBS) nasmlib.$(O) - $(CC) $(LDFLAGS) -o rdf2bin$(X) rdf2bin.$(O) $(RDXLIBS) nasmlib.$(O) +rdf2bin$(X): rdf2bin.$(O) $(RDXLIBS) $(NASMLIB) + $(CC) $(LDFLAGS) -o rdf2bin$(X) rdf2bin.$(O) $(RDXLIBS) $(NASMLIB) rdf2com$(X): rm -f rdf2com$(X) && $(LN_S) rdf2bin$(X) rdf2com$(X) rdf2ith$(X): @@ -78,10 +80,6 @@ rdlib.$(O): rdlib.c rdlib.h rdflib.$(O): rdflib.c segtab.$(O): segtab.c -nasmlib.$(O): $(top_srcdir)/nasmlib.c - cd .. && $(MAKE) nasmlib.$(O) - cp ../nasmlib.$(O) . - clean: rm -f *.$(O) $(PROGRAMS) |