From 0f3c92b67a1110b0ec90740e088677a0ae42ca3f Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Wed, 16 May 2018 22:15:11 +0100 Subject: [PATCH] Only build CLI versions except for when needed. --- APRSTransmit/Makefile | 14 +++++++------- Common/Makefile | 2 +- Makefile | 23 ++++++++++++----------- RemoteControl/Makefile | 17 ++++++++--------- StarNetServer/Makefile | 16 +++++++--------- TextTransmit/Makefile | 12 ++++++------ TimeServer/Makefile | 15 +++++++-------- TimerControl/Makefile | 16 ++++++++-------- VoiceTransmit/Makefile | 12 ++++++------ ircDDB/Makefile | 2 +- ircDDBGateway/Makefile | 15 +++++++-------- ircDDBGatewayConfig/Makefile | 2 +- 12 files changed, 71 insertions(+), 75 deletions(-) diff --git a/APRSTransmit/Makefile b/APRSTransmit/Makefile index 5f45459..8814c53 100644 --- a/APRSTransmit/Makefile +++ b/APRSTransmit/Makefile @@ -1,16 +1,16 @@ -OBJECTS = APRSParser.o APRSTransmitApp.o APRSTransmit.o +OBJECTS = APRSParser.o APRSTransmitAppD.o APRSTransmit.o -all: aprstransmit +all: aprstransmitd -aprstransmit: $(OBJECTS) - $(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o aprstransmit +aprstransmitd: $(OBJECTS) + $(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o aprstransmitd %.o: %.cpp - $(CXX) $(CFLAGS) -I../Common -c -o $@ $< + $(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $< install: - install -g bin -o root -m 0775 aprstransmit $(BINDIR) + install -g bin -o root -m 0775 aprstransmitd $(BINDIR) clean: - $(RM) aprstransmit *.o *.d *.bak *~ + $(RM) aprstransmitd *.o *.d *.bak *~ diff --git a/Common/Makefile b/Common/Makefile index 8fdd02c..8643148 100644 --- a/Common/Makefile +++ b/Common/Makefile @@ -15,7 +15,7 @@ Common.a: $(OBJECTS) $(AR) rcs Common.a $(OBJECTS) %.o: %.cpp - $(CXX) $(CFLAGS) -I../ircDDB -c -o $@ $< + $(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../ircDDB -c -o $@ $< clean: $(RM) Common.a *.o *.d *.bak *~ diff --git a/Makefile b/Makefile index 0c66d82..55bdb1d 100644 --- a/Makefile +++ b/Makefile @@ -5,37 +5,38 @@ 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)' -export LIBS := $(shell wx-config --libs adv,core) +export GUILIBS := $(shell wx-config --libs adv,core,base) +export LIBS := $(shell wx-config --libs base) export LDFLAGS := -all: ircDDBGateway/ircddbgateway ircDDBGatewayConfig/ircddbgatewayconfig APRSTransmit/aprstransmit RemoteControl/remotecontrol \ - StarNetServer/starnetserver TextTransmit/texttransmit TimerControl/timercontrol TimeServer/timeserver VoiceTransmit/voicetransmit +all: ircDDBGateway/ircddbgatewayd ircDDBGatewayConfig/ircddbgatewayconfig APRSTransmit/aprstransmitd RemoteControl/remotecontrold \ + StarNetServer/starnetserverd TextTransmit/texttransmitd TimerControl/timercontrold TimeServer/timeserverd VoiceTransmit/voicetransmitd -ircDDBGateway/ircddbgateway: Common/Common.a ircDDB/IRCDDB.a +ircDDBGateway/ircddbgatewayd: Common/Common.a ircDDB/IRCDDB.a make -C ircDDBGateway ircDDBGatewayConfig/ircddbgatewayconfig: GUICommon/GUICommon.a Common/Common.a make -C ircDDBGatewayConfig -APRSTransmit/aprstransmit: Common/Common.a +APRSTransmit/aprstransmitd: Common/Common.a make -C APRSTransmit -RemoteControl/remotecontrol: Common/Common.a GUICommon/GUICommon.a +RemoteControl/remotecontrold: Common/Common.a make -C RemoteControl -StarNetServer/starnetserver: Common/Common.a ircDDB/IRCDDB.a +StarNetServer/starnetserverd: Common/Common.a ircDDB/IRCDDB.a make -C StarNetServer -TextTransmit/texttransmit: Common/Common.a +TextTransmit/texttransmitd: Common/Common.a make -C TextTransmit -TimerControl/timercontrol: Common/Common.a GUICommon/GUICommon.a +TimerControl/timercontrold: Common/Common.a GUICommon/GUICommon.a make -C TimerControl -TimeServer/timeserver: Common/Common.a GUICommon/GUICommon.a +TimeServer/timeserverd: Common/Common.a GUICommon/GUICommon.a make -C TimeServer -VoiceTransmit/voicetransmit: Common/Common.a +VoiceTransmit/voicetransmitd: Common/Common.a make -C VoiceTransmit GUICommon/GUICommon.a: diff --git a/RemoteControl/Makefile b/RemoteControl/Makefile index 16fa1cd..48a2a54 100644 --- a/RemoteControl/Makefile +++ b/RemoteControl/Makefile @@ -1,18 +1,17 @@ -OBJECTS = RemoteControlApp.o RemoteControlCallsignData.o RemoteControlConfig.o RemoteControlFrame.o RemoteControlLinkData.o \ - RemoteControlPreferences.o RemoteControlRemoteControlHandler.o RemoteControlRemoteSet.o RemoteControlRepeaterData.o \ - RemoteControlRepeaterPanel.o RemoteControlStarNetGroup.o RemoteControlStarNetPanel.o RemoteControlStarNetUser.o +OBJECTS = RemoteControlAppD.o RemoteControlCallsignData.o RemoteControlConfig.o RemoteControlLinkData.o RemoteControlRemoteControlHandler.o \ + RemoteControlRepeaterData.o RemoteControlStarNetGroup.o RemoteControlStarNetUser.o -all: remotecontrol +all: remotecontrold -remotecontrol: $(OBJECTS) - $(CXX) $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(LDFLAGS) $(LIBS) -o remotecontrol +remotecontrold: $(OBJECTS) + $(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o remotecontrold %.o: %.cpp - $(CXX) $(CFLAGS) -I../Common -I../GUICommon -c -o $@ $< + $(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $< install: - install -g bin -o root -m 0775 remotecontrol $(BINDIR) + install -g bin -o root -m 0775 remotecontrold $(BINDIR) clean: - $(RM) remotecontrol *.o *.d *.bak *~ + $(RM) remotecontrold *.o *.d *.bak *~ diff --git a/StarNetServer/Makefile b/StarNetServer/Makefile index 71f2307..f49f112 100644 --- a/StarNetServer/Makefile +++ b/StarNetServer/Makefile @@ -1,18 +1,16 @@ -OBJECTS = StarNetServerApp.o StarNetServerCallsignSet.o StarNetServerConfig.o StarNetServerFrame.o StarNetServerIrcDDBSet.o \ - StarNetServerLogRedirect.o StarNetServerMiscellaneousSet.o StarNetServerPreferences.o StarNetServerThread.o \ - StarNetServerThreadHelper.o +OBJECTS = StarNetServerAppD.o StarNetServerConfig.o StarNetServerThread.o StarNetServerThreadHelper.o -all: starnetserver +all: starnetserverd -starnetserver: $(OBJECTS) - $(CXX) $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a ../ircDDB/IRCDDB.a $(LDFLAGS) $(LIBS) -o starnetserver +starnetserverd: $(OBJECTS) + $(CXX) $(OBJECTS) ../Common/Common.a ../ircDDB/IRCDDB.a $(LDFLAGS) $(LIBS) -o starnetserverd %.o: %.cpp - $(CXX) $(CFLAGS) -I../Common -I../GUICommon -I../ircDDB -c -o $@ $< + $(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -I../ircDDB -c -o $@ $< install: - install -g bin -o root -m 0775 starnetserver $(BINDIR) + install -g bin -o root -m 0775 starnetserverd $(BINDIR) clean: - $(RM) starnetserver *.o *.d *.bak *~ + $(RM) starnetserverd *.o *.d *.bak *~ diff --git a/TextTransmit/Makefile b/TextTransmit/Makefile index 1b01694..c4e70bc 100644 --- a/TextTransmit/Makefile +++ b/TextTransmit/Makefile @@ -1,16 +1,16 @@ OBJECTS = TextTransmit.o -all: texttransmit +all: texttransmitd -texttransmit: $(OBJECTS) - $(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o texttransmit +texttransmitd: $(OBJECTS) + $(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o texttransmitd %.o: %.cpp - $(CXX) $(CFLAGS) -I../Common -c -o $@ $< + $(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $< install: - install -g bin -o root -m 0775 texttransmit $(BINDIR) + install -g bin -o root -m 0775 texttransmitd $(BINDIR) clean: - $(RM) texttransmit *.o *.d *.bak *~ + $(RM) texttransmitd *.o *.d *.bak *~ diff --git a/TimeServer/Makefile b/TimeServer/Makefile index f8a8c03..69b2339 100644 --- a/TimeServer/Makefile +++ b/TimeServer/Makefile @@ -1,17 +1,16 @@ -OBJECTS = TimeServerAnnouncementsSet.o TimeServerApp.o TimeServerConfig.o TimeServerFrame.o TimeServerGatewaySet.o TimeServerLogRedirect.o \ - TimeServerPreferences.o TimeServerThread.o TimeServerThreadHelper.o +OBJECTS = TimeServerD.o TimeServerConfig.o TimeServerThread.o TimeServerThreadHelper.o -all: timeserver +all: timeserverd -timeserver: $(OBJECTS) - $(CXX) $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(LDFLAGS) $(LIBS) -o timeserver +timeserverd: $(OBJECTS) + $(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o timeserverd %.o: %.cpp - $(CXX) $(CFLAGS) -I../Common -I../GUICommon -c -o $@ $< + $(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $< install: - install -g bin -o root -m 0775 timeserver $(BINDIR) + install -g bin -o root -m 0775 timeserverd $(BINDIR) clean: - $(RM) timeserver *.o *.d *.bak *~ + $(RM) timeserverd *.o *.d *.bak *~ diff --git a/TimerControl/Makefile b/TimerControl/Makefile index 7c704e0..53877ff 100644 --- a/TimerControl/Makefile +++ b/TimerControl/Makefile @@ -1,17 +1,17 @@ -OBJECTS = TimerControlApp.o TimerControlConfig.o TimerControlFrame.o TimerControlItemFile.o TimerControlPreferences.o \ - TimerControlRemoteControlHandler.o TimerControlRemoteSet.o TimerControlRepeaterPanel.o TimerControlThread.o TimerControlThreadHelper.o +OBJECTS = TimerControlAppD.o TimerControlConfig.o TimerControlItemFile.o TimerControlRemoteControlHandler.o TimerControlThread.o \ + TimerControlThreadHelper.o -all: timercontrol +all: timercontrold -timercontrol: $(OBJECTS) - $(CXX) $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(LDFLAGS) $(LIBS) -o timercontrol +timercontrold: $(OBJECTS) + $(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o timercontrold %.o: %.cpp - $(CXX) $(CFLAGS) -I../Common -I../GUICommon -c -o $@ $< + $(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $< install: - install -g bin -o root -m 0775 timercontrol $(BINDIR) + install -g bin -o root -m 0775 timercontrold $(BINDIR) clean: - $(RM) timercontrol *.o *.d *.bak *~ + $(RM) timercontrold *.o *.d *.bak *~ diff --git a/VoiceTransmit/Makefile b/VoiceTransmit/Makefile index 4d5709f..71cb8ef 100644 --- a/VoiceTransmit/Makefile +++ b/VoiceTransmit/Makefile @@ -1,16 +1,16 @@ OBJECTS = VoiceStore.o VoiceTransmit.o -all: voicetransmit +all: voicetransmitd -voicetransmit: $(OBJECTS) - $(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o voicetransmit +voicetransmitd: $(OBJECTS) + $(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o voicetransmitd %.o: %.cpp - $(CXX) $(CFLAGS) -I../Common -c -o $@ $< + $(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $< install: - install -g bin -o root -m 0775 voicetransmit $(BINDIR) + install -g bin -o root -m 0775 voicetransmitd $(BINDIR) clean: - $(RM) voicetransmit *.o *.d *.bak *~ + $(RM) voicetransmitd *.o *.d *.bak *~ diff --git a/ircDDB/Makefile b/ircDDB/Makefile index 1af4614..b841a5e 100644 --- a/ircDDB/Makefile +++ b/ircDDB/Makefile @@ -7,7 +7,7 @@ IRCDDB.a: $(OBJECTS) $(AR) rcs IRCDDB.a $(OBJECTS) %.o: %.cpp - $(CXX) $(CFLAGS) -c -o $@ $< + $(CXX) -DwxUSE_GUI=0 $(CFLAGS) -c -o $@ $< clean: $(RM) IRCDDB.a *.o *.d *.bak *~ diff --git a/ircDDBGateway/Makefile b/ircDDBGateway/Makefile index 84b63b3..3bf974e 100644 --- a/ircDDBGateway/Makefile +++ b/ircDDBGateway/Makefile @@ -1,17 +1,16 @@ -OBJECTS = IRCDDBGatewayApp.o IRCDDBGatewayFrame.o IRCDDBGatewayLogRedirect.o IRCDDBGatewayStatusData.o IRCDDBGatewayThread.o \ - IRCDDBGatewayThreadHelper.o +OBJECTS = IRCDDBGatewayAppD.o IRCDDBGatewayStatusData.o IRCDDBGatewayThread.o IRCDDBGatewayThreadHelper.o -all: ircddbgateway +all: ircddbgatewayd -ircddbgateway: $(OBJECTS) - $(CXX) $(OBJECTS) ../Common/Common.a ../ircDDB/IRCDDB.a $(LDFLAGS) $(LIBS) -o ircddbgateway +ircddbgatewayd: $(OBJECTS) + $(CXX) $(OBJECTS) ../Common/Common.a ../ircDDB/IRCDDB.a $(LDFLAGS) $(LIBS) -o ircddbgatewayd %.o: %.cpp - $(CXX) $(CFLAGS) -I../Common -I../ircDDB -c -o $@ $< + $(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -I../ircDDB -c -o $@ $< install: - install -g bin -o root -m 0775 ircddbgateway $(BINDIR) + install -g bin -o root -m 0775 ircddbgatewayd $(BINDIR) clean: - $(RM) ircddbgateway *.o *.d *.bak *~ + $(RM) ircddbgatewayd *.o *.d *.bak *~ diff --git a/ircDDBGatewayConfig/Makefile b/ircDDBGatewayConfig/Makefile index 18ed87c..bdc24ef 100644 --- a/ircDDBGatewayConfig/Makefile +++ b/ircDDBGatewayConfig/Makefile @@ -4,7 +4,7 @@ OBJECTS = IRCDDBGatewayConfigApp.o IRCDDBGatewayConfigFrame.o IRCDDBGatewayConfi all: ircddbgatewayconfig ircddbgatewayconfig: $(OBJECTS) - $(CXX) $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(LDFLAGS) $(LIBS) -o ircddbgatewayconfig + $(CXX) $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(LDFLAGS) $(GUILIBS) -o ircddbgatewayconfig %.o: %.cpp $(CXX) $(CFLAGS) -I../Common -I../GUICommon -c -o $@ $<