Handle separate source and object directories correctly.

This commit is contained in:
H. Peter Anvin 2002-05-04 00:15:02 +00:00
parent 7f66b7797b
commit 4b563afc81
3 changed files with 5 additions and 5 deletions

View file

@ -49,7 +49,7 @@ NASM = nasm.o nasmlib.o float.o insnsa.o assemble.o labels.o \
NDISASM = ndisasm.o disasm.o sync.o nasmlib.o insnsd.o
all: nasm ndisasm nasm.man ndisasm.man
cd rdoff; $(MAKE) all
cd rdoff && $(MAKE) all
nasm: $(NASM)
$(CC) $(LDFLAGS) -o nasm $(NASM)

View file

@ -112,3 +112,4 @@ if test $ac_cv_prog_make_vpathok = no; then
fi
AC_OUTPUT(Makefile rdoff/Makefile doc/Makefile)
AC_OUTPUT_COMMANDS([mkdir -p output])

View file

@ -52,7 +52,7 @@ rdf2ihx.o: rdf2ihx.c
rdf2bin.o: rdf2bin.c
rdfdump.o: rdfdump.c
rdoff.o: rdoff.c rdoff.h
ldrdf.o: ldrdf.c rdoff.h $(top_srcdir)/nasmlib.h symtab.h collectn.h rdlib.h
ldrdf.o: ldrdf.c rdoff.h ../nasmlib.h symtab.h collectn.h rdlib.h
symtab.o: symtab.c symtab.h
collectn.o: collectn.c collectn.h
rdx.o: rdx.c rdoff.h rdfload.h symtab.h
@ -62,9 +62,8 @@ rdflib.o: rdflib.c
segtab.o: segtab.c
nasmlib.o: $(top_srcdir)/nasmlib.c
## $(CC) -c $(CFLAGS) $(top_srcdir)/nasmlib.c
cd $(top_srcdir);make nasmlib.o
cp $(top_srcdir)/nasmlib.o $(srcdir)
cd .. && $(MAKE) nasmlib.o
cp ../nasmlib.o .
clean:
rm -f *.o rdfdump ldrdf rdx rdflib rdf2bin rdf2com rdf2ihx