From 6eb7afa65ce67a677d530a0db2dd0f3de712a466 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 75184b5..3c98850 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -21,6 +21,7 @@ CRUCIBLE_OBJS = \ uuid.o \ include ../makeflags +-include ../localconf include ../Defines.mk BEES_LDFLAGS = $(LDFLAGS) diff --git a/src/Makefile b/src/Makefile index f8e1487..fcd362a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -8,6 +8,7 @@ PROGRAM_OBJS = $(foreach b,$(PROGRAMS),$(patsubst ../bin/%,%.o,$(b))) all: $(BEES) $(PROGRAMS) include ../makeflags +-include ../localconf LIBS = -lcrucible -luuid -lpthread BEES_LDFLAGS = -L../lib $(LDFLAGS) diff --git a/test/Makefile b/test/Makefile index a0ba01c..ae66a7c 100644 --- a/test/Makefile +++ b/test/Makefile @@ -15,6 +15,7 @@ test: $(PROGRAMS:%=%.txt) Makefile FORCE: include ../makeflags +-include ../localconf LIBS = -lcrucible -lpthread BEES_LDFLAGS = -L../lib $(LDFLAGS)