From 2402088e2c7ab2196bc20e28bd3aadd7e2c5b458 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Thu, 3 Mar 2022 11:34:37 -0500 Subject: [PATCH] add missing Makefile changes; --- Makefile | 5 +++-- Makefile.rpi-arm | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d11ffce7..642ce6f4 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ CC = gcc CXX = g++ CFLAGS = -g -O3 -Wall -std=c++0x -pthread -I. +EXTFLAGS= LIBS = -lpthread LDFLAGS = -g @@ -82,10 +83,10 @@ OBJECTS = \ all: dvmhost dvmhost: $(OBJECTS) - $(CXX) $(OBJECTS) $(CFLAGS) $(LIBS) -o dvmhost + $(CXX) $(OBJECTS) $(CFLAGS) $(EXTFLAGS) $(LIBS) -o dvmhost %.o: %.cpp - $(CXX) $(CFLAGS) -c -o $@ $< + $(CXX) $(CFLAGS) $(EXTFLAGS) -c -o $@ $< clean: $(RM) dvmhost *.o *.d *.bak *~ edac/*.o dmr/*.o dmr/acl/*.o dmr/data/*.o dmr/edac/*.o dmr/lc/*.o p25/*.o p25/acl/*.o p25/data/*.o p25/dfsi/*.o p25/edac/*.o p25/lc/*.o lookups/*.o modem/*.o modem/port/*.o network/*.o yaml/*.o host/*.o host/calibrate/*.o host/setup/*.o diff --git a/Makefile.rpi-arm b/Makefile.rpi-arm index 333e1e9c..6b5bb3fd 100644 --- a/Makefile.rpi-arm +++ b/Makefile.rpi-arm @@ -1,6 +1,7 @@ CC = /opt/tools/arm-bcm2708/arm-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc CXX = /opt/tools/arm-bcm2708/arm-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ CFLAGS = -g -O3 -Wall -std=c++0x -pthread -I. +EXTFLAGS= LIBS = -lpthread LDFLAGS = -g @@ -82,10 +83,10 @@ OBJECTS = \ all: dvmhost dvmhost: $(OBJECTS) - $(CXX) $(OBJECTS) $(CFLAGS) $(LIBS) -o dvmhost + $(CXX) $(OBJECTS) $(CFLAGS) $(EXTFLAGS) $(LIBS) -o dvmhost %.o: %.cpp - $(CXX) $(CFLAGS) -c -o $@ $< + $(CXX) $(CFLAGS) $(EXTFLAGS) -c -o $@ $< clean: $(RM) dvmhost *.o *.d *.bak *~ edac/*.o dmr/*.o dmr/acl/*.o dmr/data/*.o dmr/edac/*.o dmr/lc/*.o p25/*.o p25/acl/*.o p25/data/*.o p25/dfsi/*.o p25/edac/*.o p25/lc/*.o lookups/*.o modem/*.o modem/port/*.o network/*.o yaml/*.o host/*.o host/calibrate/*.o host/setup/*.o