refactor: allow multiple bpf files in Makefile compilation

Author: containerscrew

Makefile

@@ -1,34 +1,24 @@
-# Compiler Settings
-CC = gcc
-# Incluye includes y cflags de pkg-config en CPPFLAGS (no en CFLAGS)
-CPPFLAGS += -Iinclude $(shell pkg-config --cflags libbpf libcurl)
-CFLAGS   += -Wall -MMD -Wunused-but-set-variable
-LDLIBS   += $(shell pkg-config --libs libbpf libcurl) -ldl
-
-SRCDIR=src
-OBJDIR=build
-BINDIR=bin
-EXE=$(BINDIR)/rootisnaked
-TESTS_DIR=tests
-INCLUDE_DIR=include
-
-# Source Files
-SOURCES=$(wildcard $(SRCDIR)/*.c)
-OBJ=$(patsubst $(SRCDIR)/%.c, $(OBJDIR)/%.o, $(SOURCES))
-DEPFILES=$(patsubst $(SRCDIR)/%.c, $(OBJDIR)/%.d, $(SOURCES))
-
-# eBPF Program
-BPF_SOURCE=$(SRCDIR)/kernel/rootisnaked.bpf.c
-BPF_OBJ=$(OBJDIR)/rootisnaked.bpf.o
-
-# Compiler settings
-LINTER := clang-tidy
-FORMATTER := clang-format
-
-# Detect architecture automatically
-ARCH := $(shell uname -m)
-
-# Map architecture to BPF target names
+# ----------------------------------------------------------------------
+#  Compiler configuration
+# ----------------------------------------------------------------------
+CC        := gcc                         # user‑space compiler (can be clang)
+CPPFLAGS  += -Iinclude $(shell pkg-config --cflags libbpf libcurl)
+CFLAGS    += -Wall -MMD -Wunused-but-set-variable
+LDLIBS    += $(shell pkg-config --libs libbpf libcurl) -ldl
+
+# ----------------------------------------------------------------------
+#  Directory layout
+# ----------------------------------------------------------------------
+SRCDIR    := src
+KERNDIR   := $(SRCDIR)/kernel            # eBPF source directory
+OBJDIR    := build
+BINDIR    := bin
+INCLUDE_DIR := include
+
+# ----------------------------------------------------------------------
+#  Architecture detection (for BPF target)
+# ----------------------------------------------------------------------
+ARCH      := $(shell uname -m)
 ifeq ($(ARCH),x86_64)
     ARCH_BPF = x86
 else ifeq ($(ARCH),aarch64)
@@ -39,41 +29,77 @@ else
     $(error Unsupported architecture: $(ARCH))
 endif
 
-# Targets
-all: format $(BPF_OBJ) $(EXE)
+# ----------------------------------------------------------------------
+#  Source / object lists
+# ----------------------------------------------------------------------
+# User‑space (normal) sources
+SOURCES   := $(wildcard $(SRCDIR)/*.c)
+OBJ       := $(patsubst $(SRCDIR)/%.c,$(OBJDIR)/%.o,$(SOURCES))
+DEPFILES  := $(patsubst $(SRCDIR)/%.c,$(OBJDIR)/%.d,$(SOURCES))
+
+# eBPF sources (any *.bpf.c under $(KERNDIR))
+BPF_SRCS  := $(wildcard $(KERNDIR)/*.bpf.c)
+BPF_OBJS  := $(patsubst $(KERNDIR)/%.bpf.c,$(OBJDIR)/%.bpf.o,$(BPF_SRCS))
+
+# Final executable
+EXE       := $(BINDIR)/rootisnaked
+
+# ----------------------------------------------------------------------
+#  Tools for lint/format
+# ----------------------------------------------------------------------
+LINTER    := clang-tidy
+FORMATTER := clang-format
+
+# ----------------------------------------------------------------------
+#  Primary targets
+# ----------------------------------------------------------------------
+.PHONY: all format lint gen-vmlinux clean build
+
+all: $(EXE)               # default target builds everything
 
-# Compile Executable (link)
-$(EXE): $(OBJ)
+# Build the user‑space binary; order‑only prerequisite ensures eBPF objects are fresh
+$(EXE): $(OBJ) | $(BPF_OBJS)
 	@mkdir -p $(BINDIR)
 	$(CC) $(OBJ) $(LDLIBS) -o $@
 
-# Compile Object Files
+# ----------------------------------------------------------------------
+#  Pattern rule for normal C objects (user‑space)
+# ----------------------------------------------------------------------
 $(OBJDIR)/%.o: $(SRCDIR)/%.c
 	@mkdir -p $(OBJDIR)
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
 
-# Compile eBPF Object File
-$(BPF_OBJ): $(BPF_SOURCE)
+# ----------------------------------------------------------------------
+#  Pattern rule for eBPF objects (one per *.bpf.c)
+# ----------------------------------------------------------------------
+$(OBJDIR)/%.bpf.o: $(KERNDIR)/%.bpf.c $(INCLUDE_DIR)/vmlinux.h
 	@mkdir -p $(OBJDIR)
-	clang -O2 -g -target bpf -D__TARGET_ARCH_$(ARCH_BPF) -I$(INCLUDE_DIR)/ -c $< -o $@
-
-# Include dependency files
--include $(DEPFILES)
-
-# Run formatter on source and header files
+	$(CC) -O2 -g -target bpf \
+	       -D__TARGET_ARCH_$(ARCH_BPF) \
+	       -I$(INCLUDE_DIR) \
+	       -c $< -o $@
+
+# ----------------------------------------------------------------------
+#  Helper / maintenance targets
+# ----------------------------------------------------------------------
 format:
 	@$(FORMATTER) -i $(SRCDIR)/*.c $(INCLUDE_DIR)/*.h
 
-# Run linter on source and header files
 lint:
 	@$(LINTER) --config-file=.clang-tidy $(SRCDIR)/*.c $(INCLUDE_DIR)/*.h -- $(CPPFLAGS) $(CFLAGS)
 
-gen-vmlinux: ## Generate vmlinux.h
-	bpftool btf dump file /sys/kernel/btf/vmlinux format c > include/vmlinux.h
+# Generate vmlinux.h (BTF) – optional, but many eBPF programs need it
+gen-vmlinux:
+	@mkdir -p $(INCLUDE_DIR)
+	bpftool btf dump file /sys/kernel/btf/vmlinux format c > $(INCLUDE_DIR)/vmlinux.h
 
-# Clean up
 clean:
 	rm -rf $(OBJDIR) $(BINDIR)
 
-build: $(BPF_OBJ) $(EXE) ## Build all
+# Alias that forces a full rebuild (useful for CI)
+build: clean all
 
+# ----------------------------------------------------------------------
+#  Include generated dependency files for normal C objects
+# ----------------------------------------------------------------------
+-include $(DEPFILES)

README.md

@@ -55,7 +55,7 @@ sudo apt install -y linux-headers-$(uname -r) vim gcc make clang libbpf-dev curl
 ## Compile and run
 
 ```bash
-make
+make -j$(nproc)
 export TELEGRAM_TOKEN="xxxxx:xxxxx"; export DEBUG=false; export CHAT_ID="xxxxx";  sudo -E ./bin/rootisnaked
 ```