From: c vw <dl1ycf@darc.de>
Date: Fri, 23 Jul 2021 13:19:15 +0000 (+0200)
Subject: fused GPIO options
X-Git-Url: https://git.rkrishnan.org/Site/Content/$sch_link?a=commitdiff_plain;h=f8eac085c2483fe2f94b86e6ef942951d4a9ad51;p=pihpsdr.git

fused GPIO options
---

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) \