diff --git a/warden/.gitignore b/warden/.gitignore index 4bf7a7ef..7fb5c715 100644 --- a/warden/.gitignore +++ b/warden/.gitignore @@ -2,7 +2,7 @@ .bundle pkg/* /tmp -root/linux/skeleton/bin/wshc +root/linux/skeleton/bin/wsh root/linux/skeleton/bin/wshd root/linux/skeleton/bin/iomux-link root/linux/skeleton/bin/iomux-spawn diff --git a/warden/src/wsh/.gitignore b/warden/src/wsh/.gitignore index 12c9ae2b..d13d915a 100644 --- a/warden/src/wsh/.gitignore +++ b/warden/src/wsh/.gitignore @@ -1,3 +1,3 @@ wshd -wshc +wsh *.o diff --git a/warden/src/wsh/Makefile b/warden/src/wsh/Makefile index 410e594e..08de775f 100644 --- a/warden/src/wsh/Makefile +++ b/warden/src/wsh/Makefile @@ -1,20 +1,20 @@ OPTIMIZATION?=-O0 DEBUG?=-g -ggdb -rdynamic -all: wshd wshc +all: wshd wsh clean: - rm -f *.o clone wshd wshc + rm -f *.o clone wshd wsh install: all - cp wshd wshc ../../root/linux/skeleton/bin/ + cp wshd wsh ../../root/linux/skeleton/bin/ .PHONY: all clean wshd: wshd.o barrier.o mount.o un.o util.o msg.o $(CC) -o $@ $^ -lutil -wshc: wshc.o pump.o un.o util.o msg.o +wsh: wsh.o pump.o un.o util.o msg.o $(CC) -o $@ $^ -lutil %.o: %.c diff --git a/warden/src/wsh/Makefile.dep b/warden/src/wsh/Makefile.dep index ea003eef..3db88459 100644 --- a/warden/src/wsh/Makefile.dep +++ b/warden/src/wsh/Makefile.dep @@ -4,5 +4,5 @@ msg.o: msg.c msg.h pump.o: pump.c pump.h util.h un.o: un.c un.h util.h util.o: util.c util.h -wshc.o: wshc.c msg.h pump.h un.h +wsh.o: wsh.c msg.h pump.h un.h wshd.o: wshd.c barrier.h msg.h mount.h un.h util.h diff --git a/warden/src/wsh/wshc.c b/warden/src/wsh/wsh.c similarity index 100% rename from warden/src/wsh/wshc.c rename to warden/src/wsh/wsh.c