aniani/nasm
0
0
Fork 1
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-09-22 10:43:39 -04:00
Code Activity

Merge branch 'nasm-2.09.xx'

Browse Source
This commit is contained in:
H. Peter Anvin
2011-06-23 13:27:43 -07:00
parent 95adeabff5 c050362865
commit 1f0e0bcf1f
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.in
View File

@@ -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) insnsd.$(O) insnsb.$(O) insnsn.$(O) regs.$(O) regdis.$(O)
#-- End File Lists --# #-- End File Lists --#
all: nasm$(X) ndisasm$(X) nasm.man ndisasm.man all: nasm$(X) ndisasm$(X) nasm.man ndisasm.man rdf
cd rdoff && $(MAKE) all
nasm$(X): $(NASM) $(XOBJS) nasm$(X): $(NASM) $(XOBJS)
$(CC) $(LDFLAGS) -o nasm$(X) $(NASM) $(XOBJS) $(LIBS) $(CC) $(LDFLAGS) -o nasm$(X) $(NASM) $(XOBJS) $(LIBS)
@@ -209,8 +208,8 @@ spotless: distclean cleaner
strip: strip:
$(STRIP) --strip-unneeded nasm$(X) ndisasm$(X) $(STRIP) --strip-unneeded nasm$(X) ndisasm$(X)
rdf: rdf: nasmlib.$(O)
cd rdoff && $(MAKE) cd rdoff && $(MAKE) all
TAGS: TAGS:
$(RM) -f TAGS $(RM) -f TAGS

20
rdoff/Makefile.in
View File

@@ -29,8 +29,10 @@ INSTALL_DATA = @INSTALL_DATA@
LN_S = @LN_S@ LN_S = @LN_S@
MKDIR = mkdir MKDIR = mkdir
LDRDFLIBS = rdoff.o nasmlib.o symtab.o collectn.o rdlib.o segtab.o hash.o LDRDFLIBS = rdoff.$(O) symtab.$(O) collectn.$(O) \
RDXLIBS = rdoff.o rdfload.o symtab.o collectn.o hash.o rdlib.$(O) segtab.$(O) hash.$(O)
RDXLIBS = rdoff.$(O) rdfload.$(O) symtab.$(O) collectn.$(O) hash.$(O)
NASMLIB = ../nasmlib.$(O)
# Binary suffixes # Binary suffixes
O = @OBJEXT@ O = @OBJEXT@
@@ -49,13 +51,13 @@ all: $(PROGRAMS)
rdfdump$(X): rdfdump.$(O) rdoff.$(O) rdfdump$(X): rdfdump.$(O) rdoff.$(O)
$(CC) $(LDFLAGS) -o rdfdump$(X) rdfdump.$(O) rdoff.$(O) $(CC) $(LDFLAGS) -o rdfdump$(X) rdfdump.$(O) rdoff.$(O)
ldrdf$(X): ldrdf.$(O) $(LDRDFLIBS) ldrdf$(X): ldrdf.$(O) $(LDRDFLIBS)
$(CC) $(LDFLAGS) -o ldrdf$(X) ldrdf.$(O) $(LDRDFLIBS) $(CC) $(LDFLAGS) -o ldrdf$(X) ldrdf.$(O) $(LDRDFLIBS) $(NASMLIB)
rdx$(X): rdx.$(O) $(RDXLIBS) rdx$(X): rdx.$(O) $(RDXLIBS) $(NASMLIB)
$(CC) $(LDFLAGS) -o rdx$(X) rdx.$(O) $(RDXLIBS) $(CC) $(LDFLAGS) -o rdx$(X) rdx.$(O) $(RDXLIBS) $(NASMLIB)
rdflib$(X): rdflib.$(O) rdflib$(X): rdflib.$(O)
$(CC) $(LDFLAGS) -o rdflib$(X) rdflib.$(O) $(CC) $(LDFLAGS) -o rdflib$(X) rdflib.$(O)
rdf2bin$(X): rdf2bin.$(O) $(RDXLIBS) nasmlib.$(O) rdf2bin$(X): rdf2bin.$(O) $(RDXLIBS) $(NASMLIB)
$(CC) $(LDFLAGS) -o rdf2bin$(X) rdf2bin.$(O) $(RDXLIBS) nasmlib.$(O) $(CC) $(LDFLAGS) -o rdf2bin$(X) rdf2bin.$(O) $(RDXLIBS) $(NASMLIB)
rdf2com$(X): rdf2com$(X):
rm -f rdf2com$(X) && $(LN_S) rdf2bin$(X) rdf2com$(X) rm -f rdf2com$(X) && $(LN_S) rdf2bin$(X) rdf2com$(X)
rdf2ith$(X): rdf2ith$(X):
@@ -78,10 +80,6 @@ rdlib.$(O): rdlib.c rdlib.h
rdflib.$(O): rdflib.c rdflib.$(O): rdflib.c
segtab.$(O): segtab.c segtab.$(O): segtab.c
nasmlib.$(O): $(top_srcdir)/nasmlib.c
cd .. && $(MAKE) nasmlib.$(O)
cp ../nasmlib.$(O) .
clean: clean:
rm -f *.$(O) $(PROGRAMS) rm -f *.$(O) $(PROGRAMS)