GGLinnk/bees
1
0
Fork 0
mirror of https://github.com/Zygo/bees.git synced 2025-05-17 13:25:45 +02:00
Code Packages

build: include localconf everywhere

Browse Source 
Overriding makeflags did not work from localconf in the src, lib, or
test directories.

Signed-off-by: Zygo Blaxell <bees@furryterror.org>
This commit is contained in:
Zygo Blaxell 2021-02-08 12:51:54 -05:00
parent 10af3f9763
commit 6eb7afa65c
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Makefile
View File

@ -21,6 +21,7 @@ CRUCIBLE_OBJS = \
uuid.o \ uuid.o \
include ../makeflags include ../makeflags
-include ../localconf
include ../Defines.mk include ../Defines.mk
BEES_LDFLAGS = $(LDFLAGS) BEES_LDFLAGS = $(LDFLAGS)

1
src/Makefile
View File

@ -8,6 +8,7 @@ PROGRAM_OBJS = $(foreach b,$(PROGRAMS),$(patsubst ../bin/%,%.o,$(b)))
all: $(BEES) $(PROGRAMS) all: $(BEES) $(PROGRAMS)
include ../makeflags include ../makeflags
-include ../localconf
LIBS = -lcrucible -luuid -lpthread LIBS = -lcrucible -luuid -lpthread
BEES_LDFLAGS = -L../lib $(LDFLAGS) BEES_LDFLAGS = -L../lib $(LDFLAGS)

1
test/Makefile
View File

@ -15,6 +15,7 @@ test: $(PROGRAMS:%=%.txt) Makefile
FORCE: FORCE:
include ../makeflags include ../makeflags
-include ../localconf
LIBS = -lcrucible -lpthread LIBS = -lcrucible -lpthread
BEES_LDFLAGS = -L../lib $(LDFLAGS) BEES_LDFLAGS = -L../lib $(LDFLAGS)