aboutsummaryrefslogtreecommitdiffstats
path: root/rdoff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2011-06-23 13:26:59 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2011-06-23 13:26:59 -0700
commitc05036286581dbed486f00c012db7ec65de39c8a (patch)
tree645e4bfc8cf67959b4d46b52c0b94e0f13f861ab /rdoff
parenta4b1c5c68e05e210780481a48eddf54b73289c21 (diff)
downloadnasm-c05036286581dbed486f00c012db7ec65de39c8a.tar.gz
nasm-c05036286581dbed486f00c012db7ec65de39c8a.tar.xz
nasm-c05036286581dbed486f00c012db7ec65de39c8a.zip
Makefile: hopefully fix rdoff parallel build problems
The strange dependency on nasmlib.o causes serious issues in parallel build; hopefully fix it. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'rdoff')
-rw-r--r--rdoff/Makefile.in20
1 files changed, 9 insertions, 11 deletions
diff --git a/rdoff/Makefile.in b/rdoff/Makefile.in
index 93f2e2af..7795ab7a 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)