Browse Source

[Makefile] Fix missing cleans

Simon Gaiser 4 years ago
parent
commit
13cac1df92

+ 1 - 1
LibOS/Makefile

@@ -129,7 +129,7 @@ $(GLIBC_SRC)/dlfcn/Versions: $(GLIBC_SRC)/configure
 .PHONY: clean
 clean:
 	$(MAKE) -C $(SHIM_DIR) clean
-	rm -rf $(BUILD_DIR)
+	rm -rf $(BUILD_DIR) $(GLIBC_SRC) build.log
 
 else
 .IGNORE: $(GLIBC_TARGET)

+ 2 - 1
LibOS/shim/test/Makefile.Test

@@ -86,4 +86,5 @@ endif
 
 .PHONY: clean
 clean: $(clean-extra)
-	rm -rf pal_loader $(call expand_target,$(exec_target)) $(target) $(wildcard *.d) .output.*
+	rm -rf pal_loader $(call expand_target,$(exec_target)) $(target) $(wildcard *.d) .output.* \
+	       *.sig *.token *.manifest.sgx

+ 1 - 1
LibOS/shim/test/apps

@@ -1 +1 @@
-Subproject commit c8062b70fb795b8257e6153d15d7fa1781297c5a
+Subproject commit b3e6679fab7e06aed518aa49b41d3e6edf85ddec

+ 1 - 1
LibOS/shim/test/regression/Makefile

@@ -45,4 +45,4 @@ libos-regression.xml:
 
 .PHONY: clean-tmp
 clean-tmp:
-	rm -rf *.tmp ../apps/ltp/*.csv *.cached *.manifest.sgx *~ *.sig *.token
+	rm -rf *.tmp *.cached *.manifest.sgx *~ *.sig *.token .cache __pycache__ libos-regression.xml testfile tmp/*

+ 1 - 0
Makefile

@@ -5,6 +5,7 @@ targets = all clean format test
 
 .PHONY: $(targets)
 $(targets):
+	$(MAKE) -C Scripts $@
 	$(MAKE) -C Pal $@
 	$(MAKE) -C LibOS $@
 	$(MAKE) -C Runtime $@

+ 1 - 0
Pal/ipc/linux/Makefile

@@ -18,5 +18,6 @@ graphene-ipc.i: graphene-ipc.c
 .PHONY: clean
 clean:
 	$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
+	rm -rf *.o.ur-safe
 
 endif

+ 1 - 1
Pal/regression/Makefile

@@ -109,4 +109,4 @@ pal-regression.xml: test_pal.py $(call expand_target,$(target))
 
 .PHONY: clean
 clean:
-	rm -rf $(call expand_target,$(target)) $(preloads) *.tmp .lib *.cached *.sig *.d .output.*
+	rm -rf $(call expand_target,$(target)) $(preloads) *.tmp .lib *.cached *.sig *.d .output.* *.token .*.d .*.sig .*.token __pycache__ .cache pal-regression.xml

+ 3 - 2
Pal/src/host/Linux-SGX/Makefile

@@ -94,12 +94,13 @@ include ../../../../Makefile.rules
 
 CLEAN_FILES += $(notdir $(pal_static) $(pal_lib) $(pal_loader))
 CLEAN_FILES += debugger/sgx_gdb.o
-CLEAN_FILES += quote/aesm.pb-c.c quote/aesm.pb-c.h
+CLEAN_FILES += quote/aesm.pb-c.c quote/aesm.pb-c.h quote/aesm.pb-c.d quote/aesm.pb-c.o
 CLEAN_FILES += $(ias_cert_file) quote/generated-cacert.h
 
 .PHONY: clean
 clean:
-	rm -f *.o *.e *.i *.s $(host_files) $(CLEAN_FILES) *.d debugger/*.d
+	rm -rf *.o *.e *.i *.s $(host_files) $(CLEAN_FILES) *.d debugger/*.d signer/*.pyc __pycache__ \
+	       signer/__pycache__
 
 .PHONY: test
 test:

+ 1 - 1
Pal/src/host/Linux-SGX/sgx-driver

@@ -1 +1 @@
-Subproject commit bc92890e874cd877a1b01abc250c289acee705cf
+Subproject commit 53458f3368bcf6820fbe54c68c58725355800699

+ 1 - 1
Pal/src/host/Skeleton/Makefile

@@ -38,4 +38,4 @@ include ../../../../Makefile.rules
 
 .PHONY: clean
 clean:
-	rm -f $(addsuffix .o,$(objs)) $(host_files)
+	rm -f $(addsuffix .o,$(objs)) $(addsuffix .d,$(objs)) $(host_files) $(pal_lib)

+ 1 - 1
Pal/test/Makefile

@@ -69,7 +69,7 @@ endif
 
 .PHONY: clean
 clean:
-	rm -rf pal_loader $(call expand_target,$(target)) .lib *.cached \
+	rm -rf pal_loader $(call expand_target,$(target)) .lib *.cached *.sig *.token \
 	       $(addsuffix .d, $(executables)) $(addsuffix .i.d, $(executables)) \
 	       $(addsuffix .s.d, $(executables)) \
 	       $(addsuffix .manifest.sgx.d,$(executables)) \

+ 12 - 0
Scripts/Makefile

@@ -0,0 +1,12 @@
+.PHONY: all
+all: ;
+
+.PHONY:
+clean:
+	rm -rf __pycache__
+
+.PHONY: format
+format: ;
+
+.PHONY: test
+test: ;