From a466ccf2f1cf0f79b5574216cb8c01f1a4315b2e Mon Sep 17 00:00:00 2001 From: Zygo Blaxell Date: Mon, 8 Feb 2021 12:51:54 -0500 Subject: [PATCH] build: include localconf everywhere Overriding makeflags did not work from localconf in the src, lib, or test directories. Signed-off-by: Zygo Blaxell --- lib/Makefile | 1 + src/Makefile | 1 + test/Makefile | 1 + 3 files changed, 3 insertions(+) diff --git a/lib/Makefile b/lib/Makefile index df4ff38..20223f8 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -20,6 +20,7 @@ CRUCIBLE_OBJS = \ uuid.o \ include ../makeflags +-include ../localconf include ../Defines.mk configure.h: configure.h.in diff --git a/src/Makefile b/src/Makefile index fd65a10..1f3bb4b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -6,6 +6,7 @@ PROGRAMS = \ all: $(PROGRAMS) include ../makeflags +-include ../localconf LIBS = -lcrucible -lpthread LDFLAGS = -L../lib diff --git a/test/Makefile b/test/Makefile index 745f735..2754a94 100644 --- a/test/Makefile +++ b/test/Makefile @@ -14,6 +14,7 @@ test: $(PROGRAMS:%=%.txt) Makefile FORCE: include ../makeflags +-include ../localconf LIBS = -lcrucible -lpthread LDFLAGS = -L../lib -Wl,-rpath=$(shell realpath ../lib)