From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202602 header.b=Qqcv5YQ+; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 226455A0269 for ; Tue, 12 May 2026 07:53:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202602; t=1778565179; bh=4baWwkngj2pNczksjhVYsfFtRh2zcLWJdMkezQq+NAM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qqcv5YQ+4pLwfReATZsPE6oQO7zw/IEwLbZna6+YkRsS1ediD9qCqQ00h/8vF4EyM BBogAU7zOQYB3lPHuiXEYk8rZoWI8f2jS1KsL/OdM3qWN8mKbxn5NZjnfASHKoT0xU rav43qj0FZ2XS1aQHChFYOpEUH1sboV8bBagPFoIMZA5Ua8Yypv0FupVIqfxssmP8e CQUwGsd96JJl8iUTnvxBdc1GzOnVlS+4yeixcYKWj1986k/rAqBcQMP4HrOsrhVW5q SJpbL+AApScG4hvNWew8vy1yUEHD9Tdl/lCGeMpdicce7TFOiCFkCuGUYJvll6VqTb pQBJF0jyWh5PQ== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4gF5NW1CYqz4wTL; Tue, 12 May 2026 15:52:59 +1000 (AEST) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v3 04/12] Makefile: Remove unhelpful $(HEADERS) variable Date: Tue, 12 May 2026 15:52:48 +1000 Message-ID: <20260512055256.1800449-5-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260512055256.1800449-1-david@gibson.dropbear.id.au> References: <20260512055256.1800449-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: SNBYS6GB7CAZ5J6GA3FOMLTZ3IX2J2XQ X-Message-ID-Hash: SNBYS6GB7CAZ5J6GA3FOMLTZ3IX2J2XQ X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Confusingly HEADERS is not headers that are shared between our various binaries. Rather it's just the (non generated) headers for passt, plus seccomp.h. This isn't particularly useful, just open code it in the handful of places we need it. Signed-off-by: David Gibson --- Makefile | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 88c8a15a..ff442fa2 100644 --- a/Makefile +++ b/Makefile @@ -50,14 +50,13 @@ SRCS = $(PASST_SRCS) $(QRAP_SRCS) $(PASST_REPAIR_SRCS) $(PESTO_SRCS) MANPAGES = passt.1 pasta.1 pesto.1 qrap.1 passt-repair.1 -PASST_HEADERS = arch.h arp.h bitmap.h checksum.h common.h conf.h dhcp.h \ - dhcpv6.h epoll_ctl.h flow.h fwd.h fwd_rule.h flow_table.h icmp.h \ - icmp_flow.h inany.h iov.h ip.h isolation.h lineread.h log.h migrate.h \ - ndp.h netlink.h packet.h passt.h pasta.h pcap.h pesto.h pif.h repair.h \ - serialise.h siphash.h tap.h tcp.h tcp_buf.h tcp_conn.h tcp_internal.h \ - tcp_splice.h tcp_vu.h udp.h udp_flow.h udp_internal.h udp_vu.h util.h \ - vhost_user.h virtio.h vu_common.h -HEADERS = $(PASST_HEADERS) seccomp.h +PASST_HEADERS = arch.h arp.h bitmap.h checksum.h conf.h dhcp.h dhcpv6.h \ + epoll_ctl.h flow.h fwd.h fwd_rule.h flow_table.h icmp.h icmp_flow.h \ + inany.h iov.h ip.h isolation.h lineread.h log.h migrate.h ndp.h \ + netlink.h packet.h passt.h pasta.h pcap.h pif.h repair.h serialise.h \ + siphash.h tap.h tcp.h tcp_buf.h tcp_conn.h tcp_internal.h tcp_splice.h \ + tcp_vu.h udp.h udp_flow.h udp_internal.h udp_vu.h util.h vhost_user.h \ + virtio.h vu_common.h C := \#include \nint main(){int a=getrandom(0, 0, 0);} ifeq ($(shell printf "$(C)" | $(CC) -S -xc - -o - >/dev/null 2>&1; echo $$?),0) @@ -103,10 +102,10 @@ seccomp_pesto.h: seccomp.sh $(PESTO_SRCS) $(BASEBIN): %: $(CC) $(FLAGS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(filter %.c,$^) -o $@ -passt: $(PASST_SRCS) $(HEADERS) +passt: $(PASST_SRCS) $(PASST_HEADERS) seccomp.h passt.avx2: FLAGS += -Ofast -mavx2 -ftree-vectorize -funroll-loops -passt.avx2: $(PASST_SRCS) $(HEADERS) +passt.avx2: $(PASST_SRCS) $(PASST_HEADERS) seccomp.h pasta.avx2 pasta.1 pasta: pasta%: passt% ln -sf $< $@ @@ -202,7 +201,7 @@ CPPCHECK_FLAGS = --std=c11 --error-exitcode=1 --enable=all --force \ --suppress=unusedStructMember \ -D CPPCHECK_6936 -cppcheck: $(PASST_SRCS) $(HEADERS) +cppcheck: $(PASST_SRCS) $(PASST_HEADERS) seccomp.h $(CPPCHECK) $(CPPCHECK_FLAGS) \ $(filter -D%,$(FLAGS) $(CFLAGS) $(CPPFLAGS)) $^ \ $^ -- 2.54.0