Makefile: simplify USE_TLS

diff --git a/Makefile b/Makefile
index dc61e31..95697c9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,10 +29,22 @@ HEADERS := \
 
 -include config.mk
 
+ifdef USE_TLS
+CFLAGS += -DHAS_TLS
+CXXFLAGS += -DHAS_TLS
+WANTLIBS += libtls
+endif
+
 ifdef USE_LUA
-CFLAGS += -DHAS_LUA $(shell pkg-config --cflags lua5.4)
-CXXFLAGS += -DHAS_LUA $(shell pkg-config --cflags lua5.4)
-LDLIBS += $(shell pkg-config --libs lua5.4)
+CFLAGS += -DHAS_LUA
+CXXFLAGS += -DHAS_LUA
+WANTLIBS += lua5.4
+endif
+
+ifdef WANTLIBS
+CFLAGS += $(shell pkg-config --cflags $(WANTLIBS))
+CXXFLAGS += $(shell pkg-config --cflags $(WANTLIBS))
+LDLIBS += $(shell pkg-config --libs $(WANTLIBS))
 endif
 
 .PHONY: all clean

diff --git a/config.example.mk b/config.example.mk
index f558b9c..8049e1d 100644 (file)
--- a/config.example.mk
+++ b/config.example.mk
@@ -3,7 +3,7 @@ CC=clang
 WARNS=-Wall -Wextra -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes
 #-Wmissing-variable-declarations
 WARNSXX=-Wall -Wextra -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes
-CFLAGS=$(WARNS) -DHAS_TLS -DNETPOLL_USE_POLL -D_GNU_SOURCE
-CXXFLAGS=$(WARNSXX) -DHAS_TLS -DNETPOLL_USE_POLL -D_GNU_SOURCE
-LDLIBS=-ltls
+CFLAGS=$(WARNS) -DNETPOLL_USE_POLL -D_GNU_SOURCE
+CXXFLAGS=$(WARNSXX) -DNETPOLL_USE_POLL -D_GNU_SOURCE
+USE_TLS=1
 USE_LUA=1