samples: properly fix gramine makefiles

edgelesssys · Oct 22, 2024 · 227c603 · 227c603
1 parent 3da5c94
commit 227c603
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/samples/gramine-hello/Makefile b/samples/gramine-hello/Makefile
@@ -3,7 +3,7 @@ EDG_MARBLE_TYPE ?= hello
 all: sign
 .PHONY: clean all
 
-sign: hello.manifest hello premain-libos
+sign: hello.manifest
 	gramine-sgx-sign --output hello.manifest.sgx --manifest hello.manifest --key enclave-key.pem
 
 clean:
@@ -12,7 +12,7 @@ clean:
 hello: hello.c
 	$(CC) -Os -o$@ $<
 
-hello.manifest: hello.manifest.template premain-libos
+hello.manifest: hello.manifest.template hello premain-libos
 	gramine-manifest $< > $@
 
 premain-libos:

diff --git a/samples/gramine-nginx/Makefile b/samples/gramine-nginx/Makefile
@@ -45,7 +45,11 @@ $(NGINX_SRC).tar.gz:
 	wget -O $@ $(NGINX_URL)/$(NGINX_SRC).tar.gz
 	echo "$(NGINX_SHA256) $@" | sha256sum -c --status
 
-nginx.manifest: nginx.manifest.template premain-libos
+nginx.manifest: nginx.manifest.template $(INSTALL_DIR)/sbin/nginx \
+                $(INSTALL_DIR)/conf/nginx-gramine.conf \
+                $(TEST_DATA) \
+                $(INSTALL_DIR)/conf/server.crt \
+                premain-libos
 	gramine-manifest \
 		-Dlog_level=$(GRAMINE_LOG_LEVEL) \
 		-Darch_libdir=$(ARCH_LIBDIR) \
@@ -63,10 +67,7 @@ nginx.manifest.sgx nginx.sig: sgx_sign
 	@:
 
 .INTERMEDIATE: sgx_sign
-sgx_sign: nginx.manifest $(INSTALL_DIR)/sbin/nginx \
-		$(INSTALL_DIR)/conf/nginx-gramine.conf \
-		$(TEST_DATA) \
-		$(INSTALL_DIR)/conf/server.crt
+sgx_sign: nginx.manifest
 	gramine-sgx-sign \
 		--manifest $< \
 		--key $(SGX_SIGNER_KEY) \