Revert "refactoring"

This reverts commit 3e228c1fb8c1f5999bbb062ec76b2d4dc77fc039.
This commit is contained in:
Maxim Devaev 2024-09-04 18:34:41 +03:00
parent f79a663839
commit fcecc12229
4 changed files with 14 additions and 9 deletions

View File

@ -1,5 +1,3 @@
include lib.mk
-include config.mk
DESTDIR ?=
@ -25,6 +23,10 @@ endif
# =====
define optbool
$(filter $(shell echo $(1) | tr A-Z a-z), yes on 1)
endef
ifeq ($(V),)
ECHO = @
endif

View File

@ -1,5 +1,3 @@
include ../lib.mk
R_DESTDIR ?=
PREFIX ?= /usr/local
@ -19,6 +17,11 @@ _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

3
lib.mk
View File

@ -1,3 +0,0 @@
define optbool
$(filter $(shell echo $(1) | tr A-Z a-z), yes on 1)
endef

View File

@ -1,5 +1,3 @@
include ../lib.mk
R_DESTDIR ?=
PREFIX ?= /usr/local
@ -47,6 +45,11 @@ _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