fused GPIO options

diff --git a/Makefile b/Makefile
index 97c7409c36b768a72e2907ef916083dd8928c15e..651843a0c6cd9f8ffa140aa6b8f70d6452a5d7b2 100644 (file)
--- 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) \