xv6

commit c36c8960ba9d06ffb00a7d6e89d81ddf2d31f8ea
parent aa6706cc7d7257c59b342ad934ec65a72223b151
Author: Brian Swetland <swetland@frotz.net>
Date:   Fri, 27 Dec 2013 10:10:49 -0800

move userspace tools to user/ directory

Diffstat:
M
Makefile
 | 
6
+++---
R
cat.c -> user/cat.c
 | 
0

R
echo.c -> user/echo.c
 | 
0

R
forktest.c -> user/forktest.c
 | 
0

R
grep.c -> user/grep.c
 | 
0

R
init.c -> user/init.c
 | 
0

R
kill.c -> user/kill.c
 | 
0

R
ln.c -> user/ln.c
 | 
0

R
ls.c -> user/ls.c
 | 
0

R
mkdir.c -> user/mkdir.c
 | 
0

R
rm.c -> user/rm.c
 | 
0

R
sh.c -> user/sh.c
 | 
0

R
stressfs.c -> user/stressfs.c
 | 
0

R
usertests.c -> user/usertests.c
 | 
0

R
wc.c -> user/wc.c
 | 
0

R
zombie.c -> user/zombie.c
 | 
0

16 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
@@ -137,15 +137,15 @@ vectors.S: vectors.pl
 
 ULIB = ulib.o usys.o printf.o umalloc.o
 
-_%: %.o $(ULIB)
+_%: user/%.o $(ULIB)
 	$(LD) $(LDFLAGS) -N -e main -Ttext 0 -o $@ $^
 	$(OBJDUMP) -S $@ > $*.asm
 	$(OBJDUMP) -t $@ | sed '1,/SYMBOL TABLE/d; s/ .* / /; /^$$/d' > $*.sym
 
-_forktest: forktest.o $(ULIB)
+_forktest: user/forktest.o $(ULIB)
 	# forktest has less library code linked in - needs to be small
 	# in order to be able to max out the proc table.
-	$(LD) $(LDFLAGS) -N -e main -Ttext 0 -o _forktest forktest.o ulib.o usys.o
+	$(LD) $(LDFLAGS) -N -e main -Ttext 0 -o _forktest user/forktest.o ulib.o usys.o
 	$(OBJDUMP) -S _forktest > forktest.asm
 
 mkfs: mkfs.c include/fs.h
diff --git a/cat.c b/user/cat.c
diff --git a/echo.c b/user/echo.c
diff --git a/forktest.c b/user/forktest.c
diff --git a/grep.c b/user/grep.c
diff --git a/init.c b/user/init.c
diff --git a/kill.c b/user/kill.c
diff --git a/ln.c b/user/ln.c
diff --git a/ls.c b/user/ls.c
diff --git a/mkdir.c b/user/mkdir.c
diff --git a/rm.c b/user/rm.c
diff --git a/sh.c b/user/sh.c
diff --git a/stressfs.c b/user/stressfs.c
diff --git a/usertests.c b/user/usertests.c
diff --git a/wc.c b/user/wc.c
diff --git a/zombie.c b/user/zombie.c