From 6627a7a3050387c0e259b71d04914465815f81f5 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Thu, 10 Mar 2022 17:36:16 -0500 Subject: [PATCH] Makefile cleanup (this replaces multiplatform Makefiles with an ARCH parameter); --- Makefile | 20 ++++++----- Makefile.arm | 90 ----------------------------------------------- Makefile.rpi-arm | 91 ------------------------------------------------ 3 files changed, 12 insertions(+), 189 deletions(-) delete mode 100644 Makefile.arm delete mode 100644 Makefile.rpi-arm diff --git a/Makefile b/Makefile index 230af041..0252f040 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,16 @@ -CC = gcc -CXX = g++ +CC = gcc +CXX = g++ +armCC = arm-linux-gnueabihf-gcc +armCXX = arm-linux-gnueabihf-g++ +rpi-armCC = /opt/tools/arm-bcm2708/arm-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc +rpi-armCXX= /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 +BIN = dvmhost OBJECTS = \ edac/AMBEFEC.o \ edac/BCH.o \ @@ -80,12 +86,10 @@ OBJECTS = \ HostMain.o all: dvmhost - dvmhost: $(OBJECTS) - $(CXX) $(OBJECTS) $(CFLAGS) $(EXTFLAGS) $(LIBS) -o dvmhost - + $($(ARCH)CXX) $(OBJECTS) $(CFLAGS) $(EXTFLAGS) $(LIBS) -o $(BIN) %.o: %.cpp - $(CXX) $(CFLAGS) $(EXTFLAGS) -c -o $@ $< - + $($(ARCH)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 + $(RM) $(BIN) $(OBJECTS) *.o *.d *.bak *~ + diff --git a/Makefile.arm b/Makefile.arm deleted file mode 100644 index 9d114099..00000000 --- a/Makefile.arm +++ /dev/null @@ -1,90 +0,0 @@ -CC = arm-linux-gnueabihf-gcc-4.9 -CXX = arm-linux-gnueabihf-g++-4.9 -CFLAGS = -g -O3 -Wall -std=c++0x -pthread -I. -LIBS = -lpthread -LDFLAGS = -g - -OBJECTS = \ - edac/AMBEFEC.o \ - edac/BCH.o \ - edac/BPTC19696.o \ - edac/CRC.o \ - edac/Golay2087.o \ - edac/Golay24128.o \ - edac/Hamming.o \ - edac/QR1676.o \ - edac/RS129.o \ - edac/RS634717.o \ - edac/SHA256.o \ - dmr/acl/AccessControl.o \ - dmr/data/Data.o \ - dmr/data/DataHeader.o \ - dmr/data/EMB.o \ - dmr/data/EmbeddedData.o \ - dmr/edac/Trellis.o \ - dmr/lc/CSBK.o \ - dmr/lc/FullLC.o \ - dmr/lc/LC.o \ - dmr/lc/PrivacyLC.o \ - dmr/lc/ShortLC.o \ - dmr/Control.o \ - dmr/ControlPacket.o \ - dmr/DataPacket.o \ - dmr/Slot.o \ - dmr/SlotType.o \ - dmr/Sync.o \ - dmr/VoicePacket.o \ - lookups/IdenTableLookup.o \ - lookups/RadioIdLookup.o \ - lookups/RSSIInterpolator.o \ - lookups/TalkgroupIdLookup.o \ - p25/acl/AccessControl.o \ - p25/data/DataBlock.o \ - p25/data/DataHeader.o \ - p25/data/LowSpeedData.o \ - p25/dfsi/LC.o \ - p25/edac/Trellis.o \ - p25/lc/LC.o \ - p25/lc/TDULC.o \ - p25/lc/TSBK.o \ - p25/Audio.o \ - p25/Control.o \ - p25/DataPacket.o \ - p25/NID.o \ - p25/Sync.o \ - p25/TrunkPacket.o \ - p25/P25Utils.o \ - p25/VoicePacket.o \ - modem/port/IModemPort.o \ - modem/port/ISerialPort.o \ - modem/port/ModemNullPort.o \ - modem/port/UARTPort.o \ - modem/port/UDPPort.o \ - modem/Modem.o \ - network/UDPSocket.o \ - network/RemoteControl.o \ - network/BaseNetwork.o \ - network/Network.o \ - yaml/Yaml.o \ - host/calibrate/Console.o \ - host/calibrate/HostCal.o \ - host/setup/HostSetup.o \ - host/Host.o \ - Log.o \ - Mutex.o \ - Thread.o \ - Timer.o \ - StopWatch.o \ - Utils.o \ - HostMain.o - -all: dvmhost - -dvmhost: $(OBJECTS) - $(CXX) $(OBJECTS) $(CFLAGS) $(LIBS) -o dvmhost - -%.o: %.cpp - $(CXX) $(CFLAGS) -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 deleted file mode 100644 index 0c7bfb1a..00000000 --- a/Makefile.rpi-arm +++ /dev/null @@ -1,91 +0,0 @@ -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 - -OBJECTS = \ - edac/AMBEFEC.o \ - edac/BCH.o \ - edac/BPTC19696.o \ - edac/CRC.o \ - edac/Golay2087.o \ - edac/Golay24128.o \ - edac/Hamming.o \ - edac/QR1676.o \ - edac/RS129.o \ - edac/RS634717.o \ - edac/SHA256.o \ - dmr/acl/AccessControl.o \ - dmr/data/Data.o \ - dmr/data/DataHeader.o \ - dmr/data/EMB.o \ - dmr/data/EmbeddedData.o \ - dmr/edac/Trellis.o \ - dmr/lc/CSBK.o \ - dmr/lc/FullLC.o \ - dmr/lc/LC.o \ - dmr/lc/PrivacyLC.o \ - dmr/lc/ShortLC.o \ - dmr/Control.o \ - dmr/ControlPacket.o \ - dmr/DataPacket.o \ - dmr/Slot.o \ - dmr/SlotType.o \ - dmr/Sync.o \ - dmr/VoicePacket.o \ - lookups/IdenTableLookup.o \ - lookups/RadioIdLookup.o \ - lookups/RSSIInterpolator.o \ - lookups/TalkgroupIdLookup.o \ - p25/acl/AccessControl.o \ - p25/data/DataBlock.o \ - p25/data/DataHeader.o \ - p25/data/LowSpeedData.o \ - p25/dfsi/LC.o \ - p25/edac/Trellis.o \ - p25/lc/LC.o \ - p25/lc/TDULC.o \ - p25/lc/TSBK.o \ - p25/Audio.o \ - p25/Control.o \ - p25/DataPacket.o \ - p25/NID.o \ - p25/Sync.o \ - p25/TrunkPacket.o \ - p25/P25Utils.o \ - p25/VoicePacket.o \ - modem/port/IModemPort.o \ - modem/port/ISerialPort.o \ - modem/port/ModemNullPort.o \ - modem/port/UARTPort.o \ - modem/port/UDPPort.o \ - modem/Modem.o \ - network/UDPSocket.o \ - network/RemoteControl.o \ - network/BaseNetwork.o \ - network/Network.o \ - yaml/Yaml.o \ - host/calibrate/Console.o \ - host/calibrate/HostCal.o \ - host/setup/HostSetup.o \ - host/Host.o \ - Log.o \ - Mutex.o \ - Thread.o \ - Timer.o \ - StopWatch.o \ - Utils.o \ - HostMain.o - -all: dvmhost - -dvmhost: $(OBJECTS) - $(CXX) $(OBJECTS) $(CFLAGS) $(EXTFLAGS) $(LIBS) -o dvmhost - -%.o: %.cpp - $(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