summaryrefslogtreecommitdiff
path: root/Mkfiles
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2002-05-10 19:51:48 +0000
committerH. Peter Anvin <hpa@zytor.com>2002-05-10 19:51:48 +0000
commit918af68255e733415366315b0e4c8180d1862c6e (patch)
treeca1b372a5aeb41b576edaebafd84cf2124aa4d80 /Mkfiles
parenteffc271151c1fd69e5e4d00b5420e826a56b16e3 (diff)
downloadnasm-918af68255e733415366315b0e4c8180d1862c6e.tar.gz
nasm-918af68255e733415366315b0e4c8180d1862c6e.tar.bz2
nasm-918af68255e733415366315b0e4c8180d1862c6e.zip
Handle the "output" directory correctly (patch from John Coffman.)
Diffstat (limited to 'Mkfiles')
-rw-r--r--Mkfiles/Makefile.dj4
1 files changed, 2 insertions, 2 deletions
diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index 40a5bc8..d46b3b6 100644
--- a/Mkfiles/Makefile.dj
+++ b/Mkfiles/Makefile.dj
@@ -19,7 +19,7 @@ CFLAGS = -O2 -I.
# You _shouldn't_ need to adjust anything below this line.
.c.o:
- $(CC) -c $(CFLAGS) $*.c
+ $(CC) -c $(CFLAGS) -o $@ $*.c
NASM = nasm.o nasmlib.o float.o insnsa.o assemble.o labels.o \
parser.o outform.o output/outbin.o output/outaout.o output/outcoff.o output/outelf.o \
@@ -92,5 +92,5 @@ macros.c: macros.pl standard.mac version.mac
perl macros.pl standard.mac version.mac
clean:
- rm -f *.o nasm ndisasm
+ rm -f *.o *.exe output/*.o