create test.ffs in makefile instead of buildxen.sh

diff --git a/Makefile b/Makefile
index 3c9bcbdd07745ddf12cf7a4f7b46211791417061..18f3359d691d2fe736bc8f143d46164eea73b2d0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ $(OBJ_DIR)/%.o: %.c $(HDRS) $(EXTRA_DEPS)
        $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 
 .PHONY: default
-default: prepare mini-os rumprun app-tools tests rump-kernel
+default: prepare mini-os rumprun app-tools tests rump-kernel img/test.ffs
 
 .PHONY: prepare
 prepare:
@@ -123,6 +123,9 @@ STDTESTS=tests/libstdtests/rumpkern_demo.c tests/libstdtests/pthread_test.c
 rump-kernel: ${STDTESTS} httpd
        app-tools/rumpapp-xen-cc -o $@ ${STDTESTS} httpd/*.o
 
+img/test.ffs:
+       cp img/test_clean.ffs img/test.ffs
+
 .PHONY: clean arch_clean app-tools_clean
 
 clean: app-tools_clean

diff --git a/buildxen.sh b/buildxen.sh
index 44af209e6cbe52a9076dfe28c78155a64a4726af..6f1f65d8a3cbe9bf3c72dfc75231d9934b666c4f 100755 (executable)
--- a/buildxen.sh
+++ b/buildxen.sh
@@ -78,8 +78,6 @@ for lib in ${LIBS}; do
        makeuserlib ${lib}
 done
 
-[ ! -f img/test.ffs ] && cp img/test_clean.ffs img/test.ffs
-
 # build the domU image
 make