From a34abeeaee790daac803e506a76ce3f2c5d3013f Mon Sep 17 00:00:00 2001 From: Adam Kolakowski Date: Tue, 2 Jun 2020 17:25:26 +0200 Subject: [PATCH] Remove GUICommon dependency from Makefile Removes any GUI related dependencies from the Makefile that is intended to build only console (GUI-less) applications. As a result developers can just install wxGTK-base-dev to compile a solution on embedded devies instead of a full wxGTK-dev that weights a ton. --- Makefile | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 58ba78d..01afa9d 100644 --- a/Makefile +++ b/Makefile @@ -23,20 +23,16 @@ ifeq ($(BUILD), debug) else ifeq ($(BUILD), release) export CFLAGS := $(CFLAGS) $(RELEASEFLAGS) endif -export GUILIBS := $(shell wx-config --libs adv,core,base) export LIBS := $(shell wx-config --libs base,net) export LDFLAGS := .PHONY: all -all: ircDDBGateway/ircddbgatewayd ircDDBGatewayConfig/ircddbgatewayconfig APRSTransmit/aprstransmitd RemoteControl/remotecontrold \ +all: ircDDBGateway/ircddbgatewayd APRSTransmit/aprstransmitd RemoteControl/remotecontrold \ StarNetServer/starnetserverd TextTransmit/texttransmitd TimerControl/timercontrold TimeServer/timeserverd VoiceTransmit/voicetransmitd ircDDBGateway/ircddbgatewayd: Common/Common.a ircDDB/IRCDDB.a force $(MAKE) -C ircDDBGateway -ircDDBGatewayConfig/ircddbgatewayconfig: GUICommon/GUICommon.a Common/Common.a force - $(MAKE) -C ircDDBGatewayConfig - APRSTransmit/aprstransmitd: Common/Common.a force $(MAKE) -C APRSTransmit @@ -49,18 +45,15 @@ StarNetServer/starnetserverd: Common/Common.a ircDDB/IRCDDB.a force TextTransmit/texttransmitd: Common/Common.a force $(MAKE) -C TextTransmit -TimerControl/timercontrold: Common/Common.a GUICommon/GUICommon.a force +TimerControl/timercontrold: Common/Common.a force $(MAKE) -C TimerControl -TimeServer/timeserverd: Common/Common.a GUICommon/GUICommon.a force +TimeServer/timeserverd: Common/Common.a force $(MAKE) -C TimeServer VoiceTransmit/voicetransmitd: Common/Common.a force $(MAKE) -C VoiceTransmit -GUICommon/GUICommon.a: force - $(MAKE) -C GUICommon - Common/Common.a: force $(MAKE) -C Common @@ -100,7 +93,6 @@ endif clean: $(MAKE) -C Common clean $(MAKE) -C ircDDB clean - $(MAKE) -C GUICommon clean $(MAKE) -C APRSTransmit clean $(MAKE) -C ircDDBGateway clean $(MAKE) -C RemoteControl clean