make: lets also make bpf program outside of container

Signed-off-by: Djalal Harouni <[email protected]>

Author: tixxdz

Makefile

@@ -51,9 +51,9 @@ clean: clean-in-container clean-images ## Remove bpflock docker images including
 ##@ Inside container targets
 
 # This builds inside container
-.PHONY: container-bpf-tools
-container-bpf-tools: pre-build | defined-BASE_IMAGE ## Builds bpf tools using libbpf inside container.
-	$(info MAKE: start building cbpf tools inside container)
+.PHONY: bpf-programs
+bpf-programs: pre-build ## Builds bpf programs using libbpf (will run inside container).
+	$(info MAKE: start building bpf programs)
 	$(info MAKE -C bpf all)
 	@$(MAKE) -C $(shell pwd)/bpf all
 
@@ -64,8 +64,9 @@ bpflock-daemon: pre-build | defined-BASE_IMAGE ## Build bpflock daemon inside co
 	@$(MAKE) -C $(shell pwd)/cmd all
 
 .PHONY: clean-in-container
-clean-in-container: ## Clean bpf-tools build directories.
+clean-in-container: ## Clean bpf programs build directories.
 	@$(RM) -R $(BUILD)
+	@$(MAKE) -C $(shell pwd)/bpf clean
 	$(info Clean bpf-tools build directories)
 
 ##@ Code checks and tests

bpf/Makefile

@@ -46,7 +46,7 @@ $(BUILDLIB) $(BUILDLIB)/libbpf:
 	$(Q)mkdir -p $@
 
 $(LIBBPF_SRC):
-	test -d $(LIBBPF_SRC) || (echo "Error: libbpf sources are missing - please do: 'git submodule update --init'" ; false)
+	test -d $(LIBBPF_SRC) || (echo "Error: libbpf sources are missing - please do: 'git submodule update --init --recursive'" ; false)
 
 # Build libbpf.a
 $(LIBBPF_OBJ): $(LIBBPF_SRC) $(wildcard $(LIBBPF_SRC)/*.[ch]) | $(BUILDLIB) $(BUILDLIB)/libbpf
@@ -75,6 +75,11 @@ $(BUILD)/%.skel.h: $(BUILD)/%.bpf.o | $(BUILD)
 	$(call msg,GEN-SKEL,$@)
 	$(Q)$(BPFTOOL) gen skeleton $< > $@
 
+.PHONY: clean
+clean:
+	@$(RM) -R $(BUILD)
+
+.PHONY: install
 install: $(TARGETS)
 	$(call msg, INSTALL bpf programs)
 	$(Q)$(INSTALL) -m 0755 -d $(DESTDIR)$(BINDIR)

images/docker/Dockerfile

@@ -36,7 +36,7 @@ WORKDIR /go/src/github.com/linux-lock/bpflock
 COPY . .
 
 # Make bpf tools and bpflock daemon
-RUN make container-bpf-tools
+RUN make bpf-programs
 RUN make bpflock-daemon
 
 # Generate runtime image