From 9282b0d6ca8a801c616df40575ecdbeaa57c60bc Mon Sep 17 00:00:00 2001 From: Christoph Kottke Date: Mon, 21 Jan 2019 12:26:35 +0100 Subject: [PATCH] Makefile fixes * MakefileGUIPi add lost depency (libusb-1.0) * Makefile.Pi rename to reflect the same namingschema --- MakefileGUIPi | 2 +- Makefile.Pi => MakefilePi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename Makefile.Pi => MakefilePi (98%) diff --git a/MakefileGUIPi b/MakefileGUIPi index b6f2834..dad022d 100644 --- a/MakefileGUIPi +++ b/MakefileGUIPi @@ -5,7 +5,7 @@ export BINDIR := "/usr/bin" export CXX := $(shell wx-config --cxx) export CFLAGS := -O2 -Wall $(shell wx-config --cxxflags) -DLOG_DIR='$(LOGDIR)' -DCONF_DIR='$(CONFDIR)' -DDATA_DIR='$(DATADIR)' -DGPIO -export GUILIBS := $(shell wx-config --libs adv,core,base) -lasound -lwiringPi +export GUILIBS := $(shell wx-config --libs adv,core,base) -lasound -lusb-1.0 -lwiringPi export LIBS := $(shell wx-config --libs base) -lasound -lwiringPi export LDFLAGS := diff --git a/Makefile.Pi b/MakefilePi similarity index 98% rename from Makefile.Pi rename to MakefilePi index 2361436..17645ff 100644 --- a/Makefile.Pi +++ b/MakefilePi @@ -7,7 +7,7 @@ export CXX := $(shell wx-config --cxx) export CFLAGS := -O2 -Wall $(shell wx-config --cxxflags) -DLOG_DIR='$(LOGDIR)' -DCONF_DIR='$(CONFDIR)' -DDATA_DIR='$(DATADIR)' -DGPIO export GUILIBS := $(shell wx-config --libs adv,core,base) -lasound export LIBS := $(shell wx-config --libs base) -lasound -lusb-1.0 -lwiringPi -export LDFLAGS := +export LDFLAGS := all: DStarRepeater/dstarrepeaterd DStarRepeaterConfig/dstarrepeaterconfig