Makefile: fixes for seccompagent

kolyshkin · kolyshkin · commit d2b6899ea924 · 2021-09-20T09:35:33.000-07:00
1. The seccompagent target it built in the same way as others in contrib, so there is no need to have a separate rule. 2. Mark seccompagent as phony, because it is (it rarely happens, but I actually just had an issue because this was absent). 3. Add seccompagent binary to clean target. Fixes: e21a9ee Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
diff --git a/Makefile b/Makefile
@@ -32,12 +32,9 @@ runc:
 
 all: runc recvtty sd-helper seccompagent
 
-recvtty sd-helper:
+recvtty sd-helper seccompagent:
 	$(GO_BUILD) -o contrib/cmd/$@/$@ ./contrib/cmd/$@
 
-seccompagent:
-	$(GO_BUILD) -o contrib/cmd/seccompagent/seccompagent ./contrib/cmd/seccompagent
-
 static:
 	$(GO_BUILD_STATIC) -o runc .
 	$(GO_BUILD_STATIC) -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty
@@ -115,6 +112,7 @@ clean:
 	rm -f runc runc-*
 	rm -f contrib/cmd/recvtty/recvtty
 	rm -f contrib/cmd/sd-helper/sd-helper
+	rm -f contrib/cmd/seccompagent/seccompagent
 	rm -rf release
 	rm -rf man/man8
 
@@ -152,7 +150,7 @@ localcross:
 	CGO_ENABLED=1 GOARCH=arm64 CC=aarch64-linux-gnu-gcc         $(GO_BUILD) -o runc-arm64 .
 	CGO_ENABLED=1 GOARCH=ppc64le CC=powerpc64le-linux-gnu-gcc   $(GO_BUILD) -o runc-ppc64le .
 
-.PHONY: runc all recvtty sd-helper static release dbuild lint man runcimage \
+.PHONY: runc all recvtty sd-helper seccompagent static release dbuild lint man runcimage \
 	test localtest unittest localunittest integration localintegration \
 	rootlessintegration localrootlessintegration shell install install-bash \
 	install-man clean cfmt shfmt shellcheck \
