refactoring

pikvm · Sep 4, 2024 · 3e228c1 · 3e228c1
1 parent 53ec87b
commit 3e228c1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -1,3 +1,5 @@
+include lib.mk
+
 -include config.mk
 
 DESTDIR ?=
@@ -23,10 +25,6 @@ endif
 
 
 # =====
-define optbool
-$(filter $(shell echo $(1) | tr A-Z a-z), yes on 1)
-endef
-
 ifeq ($(V),)
 	ECHO = @
 endif

diff --git a/janus/Makefile b/janus/Makefile
@@ -1,3 +1,5 @@
+include ../lib.mk
+
 R_DESTDIR ?=
 PREFIX ?= /usr/local
 
@@ -17,11 +19,6 @@ _SRCS = $(shell ls src/uslibs/*.c src/*.c)
 _BUILD = build
 
 
-define optbool
-$(filter $(shell echo $(1) | tr A-Z a-z), yes on 1)
-endef
-
-
 WITH_PTHREAD_NP ?= 1
 ifneq ($(call optbool,$(WITH_PTHREAD_NP)),)
 override _CFLAGS += -DWITH_PTHREAD_NP

diff --git a/lib.mk b/lib.mk
@@ -0,0 +1,3 @@
+define optbool
+$(filter $(shell echo $(1) | tr A-Z a-z), yes on 1)
+endef
diff --git a/src/Makefile b/src/Makefile
@@ -1,3 +1,5 @@
+include ../lib.mk
+
 R_DESTDIR ?=
 PREFIX ?= /usr/local
 
@@ -45,11 +47,6 @@ _TARGETS = $(_USTR) $(_DUMP)
 _OBJS = $(_USTR_SRCS:%.c=$(_BUILD)/%.o) $(_DUMP_SRCS:%.c=$(_BUILD)/%.o)
 
 
-define optbool
-$(filter $(shell echo $(1) | tr A-Z a-z), yes on 1)
-endef
-
-
 ifneq ($(call optbool,$(WITH_GPIO)),)
 override _CFLAGS += -DWITH_GPIO $(shell pkg-config --atleast-version=2 libgpiod 2> /dev/null && echo -DHAVE_GPIOD2)
 override _USTR_LDFLAGS += -lgpiod