From f8eac085c2483fe2f94b86e6ef942951d4a9ad51 Mon Sep 17 00:00:00 2001 From: c vw Date: Fri, 23 Jul 2021 15:19:15 +0200 Subject: [PATCH] fused GPIO options --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 97c7409..651843a 100644 --- a/Makefile +++ b/Makefile @@ -126,11 +126,11 @@ LOCALCW_OBJS = iambic.o endif ifeq ($(GPIO_INCLUDE),GPIO) +GPIO_OPTIONS=-D GPIO GPIOD_VERSION=$(shell pkg-config --modversion libgpiod) ifeq ($(GPIOD_VERSION),1.2) -GPIOD_OPTIONS=-D OLD_GPIOD +GPIO_OPTIONS += -D OLD_GPIOD endif -GPIO_OPTIONS=-D GPIO GPIO_LIBS=-lgpiod -li2c endif @@ -213,7 +213,7 @@ AUDIO_OBJS=portaudio.o endif OPTIONS=$(SMALL_SCREEN_OPTIONS) $(MIDI_OPTIONS) $(PURESIGNAL_OPTIONS) $(REMOTE_OPTIONS) $(USBOZY_OPTIONS) \ - $(GPIO_OPTIONS) $(GPIOD_OPTIONS) $(SOAPYSDR_OPTIONS) $(LOCALCW_OPTIONS) \ + $(GPIO_OPTIONS) $(SOAPYSDR_OPTIONS) $(LOCALCW_OPTIONS) \ $(STEMLAB_OPTIONS) \ $(SERVER_OPTIONS) \ $(AUDIO_OPTIONS) \ -- 2.45.2