From dcb5b4b455dd2869358bb461aec51a40a867f219 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck F4FXL - KC3FRA Date: Sun, 11 Nov 2018 18:35:30 +0100 Subject: [PATCH] Add empty targets for dependencies in sub make file This forces make to check if dependency (eg ../Common/Common.a) is more recent than the target --- APRSTransmit/Makefile | 4 +++- Common/Makefile | 3 ++- GUICommon/Makefile | 3 ++- Makefile | 2 +- RemoteControl/Makefile | 3 ++- RemoteControl/MakefileGUI | 4 +++- StarNetServer/Makefile | 4 +++- StarNetServer/MakefileGUI | 4 +++- TextTransmit/Makefile | 3 ++- TimeServer/Makefile | 3 ++- TimeServer/MakefileGUI | 4 +++- TimerControl/Makefile | 4 +++- TimerControl/MakefileGUI | 4 +++- VoiceTransmit/Makefile | 3 ++- ircDDBGateway/Makefile | 5 ++++- ircDDBGateway/MakefileGUI | 5 ++++- ircDDBGatewayConfig/Makefile | 4 +++- 17 files changed, 45 insertions(+), 17 deletions(-) diff --git a/APRSTransmit/Makefile b/APRSTransmit/Makefile index 20e9521..17e82b4 100644 --- a/APRSTransmit/Makefile +++ b/APRSTransmit/Makefile @@ -3,7 +3,7 @@ OBJECTS = APRSParser.o APRSTransmitAppD.o APRSTransmit.o .PHONY: all all: aprstransmitd -aprstransmitd: $(OBJECTS) +aprstransmitd: $(OBJECTS) ../Common/Common.a $(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o aprstransmitd -include $(OBJECTS:.o=.d) @@ -20,3 +20,5 @@ install: clean: $(RM) aprstransmitd *.o *.d *.bak *~ +../Common/Common.a: + diff --git a/Common/Makefile b/Common/Makefile index b818a62..0243a4b 100644 --- a/Common/Makefile +++ b/Common/Makefile @@ -12,7 +12,7 @@ OBJECTS = AMBEData.o AnnouncementUnit.o APRSCollector.o APRSWriter.o APRSWriterT .PHONY: all all: Common.a -Common.a: $(OBJECTS) +Common.a: $(OBJECTS) ../ircDDB/IRCDDB.a $(AR) rcs Common.a $(OBJECTS) -include $(OBJECTS:.o=.d) @@ -25,3 +25,4 @@ Common.a: $(OBJECTS) clean: $(RM) Common.a *.o *.d *.bak *~ +../ircDDB/IRCDDB.a: diff --git a/GUICommon/Makefile b/GUICommon/Makefile index 9c4717c..6412cb2 100644 --- a/GUICommon/Makefile +++ b/GUICommon/Makefile @@ -4,7 +4,7 @@ OBJECTS = AddressTextCtrl.o CallsignTextCtrl.o DCSSet.o DescriptionTextCtrl.o DE .PHONY: all all: GUICommon.a -GUICommon.a: $(OBJECTS) +GUICommon.a: $(OBJECTS) ../Common/Common.a $(AR) rcs GUICommon.a $(OBJECTS) -include $(OBJECTS:.o=.d) @@ -17,3 +17,4 @@ GUICommon.a: $(OBJECTS) clean: $(RM) GUICommon.a *.o *.d *.bak *~ +../Common/Common.a: diff --git a/Makefile b/Makefile index 7db19e6..1610fd0 100644 --- a/Makefile +++ b/Makefile @@ -82,5 +82,5 @@ clean: .PHONY: force force : - true + @true diff --git a/RemoteControl/Makefile b/RemoteControl/Makefile index 978286d..a4c399a 100644 --- a/RemoteControl/Makefile +++ b/RemoteControl/Makefile @@ -4,7 +4,7 @@ OBJECTS = RemoteControlAppD.o RemoteControlCallsignData.o RemoteControlConfig.o .PHONY: all all: remotecontrold -remotecontrold: $(OBJECTS) +remotecontrold: $(OBJECTS) ../Common/Common.a $(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o remotecontrold -include $(OBJECTS:.o=.d) @@ -21,3 +21,4 @@ install: clean: $(RM) remotecontrold *.o *.d *.bak *~ +../Common/Common.a: diff --git a/RemoteControl/MakefileGUI b/RemoteControl/MakefileGUI index 566a990..ed75ed9 100644 --- a/RemoteControl/MakefileGUI +++ b/RemoteControl/MakefileGUI @@ -5,7 +5,7 @@ OBJECTS = RemoteControlApp.o RemoteControlCallsignData.o RemoteControlConfig.o R .PHONY: all all: remotecontrol -remotecontrol: $(OBJECTS) +remotecontrol: $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(CXX) $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(LDFLAGS) $(GUILIBS) -o remotecontrol -include $(OBJECTS:.o=.d) @@ -22,3 +22,5 @@ install: clean: $(RM) remotecontrol *.o *.d *.bak *~ +../GUICommon/GUICommon.a: +../Common/Common.a: diff --git a/StarNetServer/Makefile b/StarNetServer/Makefile index cffdda5..a08a3b6 100644 --- a/StarNetServer/Makefile +++ b/StarNetServer/Makefile @@ -3,7 +3,7 @@ OBJECTS = StarNetServerAppD.o StarNetServerConfig.o StarNetServerThread.o StarNe .PHONY: all all: starnetserverd -starnetserverd: $(OBJECTS) +starnetserverd: $(OBJECTS) ../Common/Common.a ../ircDDB/IRCDDB.a $(CXX) $(OBJECTS) ../Common/Common.a ../ircDDB/IRCDDB.a $(LDFLAGS) $(LIBS) -o starnetserverd -include $(OBJECTS:.o=.d) @@ -20,3 +20,5 @@ install: clean: $(RM) starnetserverd *.o *.d *.bak *~ +../Common/Common.a: +../ircDDB/IRCDDB.a: diff --git a/StarNetServer/MakefileGUI b/StarNetServer/MakefileGUI index 3f45261..61fe271 100644 --- a/StarNetServer/MakefileGUI +++ b/StarNetServer/MakefileGUI @@ -5,7 +5,7 @@ OBJECTS = StarNetServerApp.o StarNetServerCallsignSet.o StarNetServerConfig.o St .PHONY: all all: starnetserver -starnetserver: $(OBJECTS) +starnetserver: $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(CXX) $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a ../ircDDB/IRCDDB.a $(LDFLAGS) $(GUILIBS) -o starnetserver -include $(OBJECTS:.o=.d) @@ -22,3 +22,5 @@ install: clean: $(RM) starnetserver *.o *.d *.bak *~ +../GUICommon/GUICommon.a: +../Common/Common.a: diff --git a/TextTransmit/Makefile b/TextTransmit/Makefile index 14ddb89..a059e2e 100644 --- a/TextTransmit/Makefile +++ b/TextTransmit/Makefile @@ -3,7 +3,7 @@ OBJECTS = TextTransmit.o .PHONY: all all: texttransmitd -texttransmitd: $(OBJECTS) +texttransmitd: $(OBJECTS) ../Common/Common.a $(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o texttransmitd -include $(OBJECTS:.o=.d) @@ -20,3 +20,4 @@ install: clean: $(RM) texttransmitd *.o *.d *.bak *~ +../Common/Common.a: diff --git a/TimeServer/Makefile b/TimeServer/Makefile index 88119ee..eca5c6a 100644 --- a/TimeServer/Makefile +++ b/TimeServer/Makefile @@ -3,7 +3,7 @@ OBJECTS = TimeServerD.o TimeServerConfig.o TimeServerThread.o TimeServerThreadHe .PHONY: all all: timeserverd -timeserverd: $(OBJECTS) +timeserverd: $(OBJECTS) ../Common/Common.a $(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o timeserverd -include $(OBJECTS:.o=.d) @@ -20,3 +20,4 @@ install: clean: $(RM) timeserverd *.o *.d *.bak *~ +../Common/Common.a: diff --git a/TimeServer/MakefileGUI b/TimeServer/MakefileGUI index 3f902cf..9982b46 100644 --- a/TimeServer/MakefileGUI +++ b/TimeServer/MakefileGUI @@ -4,7 +4,7 @@ OBJECTS = TimeServerApp.o TimeServerAnnouncementsSet.o TimeServerConfig.o TimeSe .PHONY: all all: timeserver -timeserver: $(OBJECTS) +timeserver: $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(CXX) $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(LDFLAGS) $(GUILIBS) -o timeserver -include $(OBJECTS:.o=.d) @@ -21,3 +21,5 @@ install: clean: $(RM) timeserver *.o *.d *.bak *~ +../GUICommon/GUICommon.a: +../Common/Common.a: diff --git a/TimerControl/Makefile b/TimerControl/Makefile index eebb6a6..823e32c 100644 --- a/TimerControl/Makefile +++ b/TimerControl/Makefile @@ -4,7 +4,7 @@ OBJECTS = TimerControlAppD.o TimerControlConfig.o TimerControlItemFile.o TimerCo .PHONY: all all: timercontrold -timercontrold: $(OBJECTS) +timercontrold: $(OBJECTS) ../Common/Common.a $(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o timercontrold -include $(OBJECTS:.o=.d) @@ -21,3 +21,5 @@ install: clean: $(RM) timercontrold *.o *.d *.bak *~ +../Common/Common.a: + diff --git a/TimerControl/MakefileGUI b/TimerControl/MakefileGUI index 58646ea..fdcccc0 100644 --- a/TimerControl/MakefileGUI +++ b/TimerControl/MakefileGUI @@ -5,7 +5,7 @@ OBJECTS = TimerControlApp.o TimerControlConfig.o TimerControlFrame.o TimerContro .PHONY: all all: timercontrol -timercontrol: $(OBJECTS) +timercontrol: $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(CXX) $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(LDFLAGS) $(GUILIBS) -o timercontrol -include $(OBJECTS:.o=.d) @@ -22,3 +22,5 @@ install: clean: $(RM) timercontrol *.o *.d *.bak *~ +../GUICommon/GUICommon.a: +../Common/Common.a: diff --git a/VoiceTransmit/Makefile b/VoiceTransmit/Makefile index ee651bf..a81f4be 100644 --- a/VoiceTransmit/Makefile +++ b/VoiceTransmit/Makefile @@ -3,7 +3,7 @@ OBJECTS = VoiceStore.o VoiceTransmit.o .PHONY: all all: voicetransmitd -voicetransmitd: $(OBJECTS) +voicetransmitd: $(OBJECTS) ../Common/Common.a $(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o voicetransmitd -include $(OBJECTS:.o=.d) @@ -20,3 +20,4 @@ install: clean: $(RM) voicetransmitd *.o *.d *.bak *~ +../Common/Common.a: diff --git a/ircDDBGateway/Makefile b/ircDDBGateway/Makefile index 9a43de0..f36c9a3 100644 --- a/ircDDBGateway/Makefile +++ b/ircDDBGateway/Makefile @@ -3,7 +3,7 @@ OBJECTS = IRCDDBGatewayAppD.o IRCDDBGatewayStatusData.o IRCDDBGatewayThread.o IR .PHONY: all all: ircddbgatewayd -ircddbgatewayd: $(OBJECTS) +ircddbgatewayd: $(OBJECTS) ../ircDDB/IRCDDB.a ../Common/Common.a $(CXX) $(OBJECTS) ../Common/Common.a ../ircDDB/IRCDDB.a $(LDFLAGS) $(LIBS) -o ircddbgatewayd -include $(OBJECTS:.o=.d) @@ -20,3 +20,6 @@ install: clean: $(RM) ircddbgatewayd *.o *.d *.bak *~ +../Common/Common.a: +../ircDDB/IRCDDB.a: + diff --git a/ircDDBGateway/MakefileGUI b/ircDDBGateway/MakefileGUI index e6c2a86..fa27871 100644 --- a/ircDDBGateway/MakefileGUI +++ b/ircDDBGateway/MakefileGUI @@ -4,7 +4,7 @@ OBJECTS = IRCDDBGatewayApp.o IRCDDBGatewayFrame.o IRCDDBGatewayLogRedirect.o IRC .PHONY: all all: ircddbgateway -ircddbgateway: $(OBJECTS) +ircddbgateway: $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(CXX) $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a ../ircDDB/IRCDDB.a $(LDFLAGS) $(GUILIBS) -o ircddbgateway -include $(OBJECTS:.o=.d) @@ -21,3 +21,6 @@ install: clean: $(RM) ircddbgateway *.o *.d *.bak *~ +../GUICommon/GUICommon.a: +../Common/Common.a:s + diff --git a/ircDDBGatewayConfig/Makefile b/ircDDBGatewayConfig/Makefile index 9099d00..7aff717 100644 --- a/ircDDBGatewayConfig/Makefile +++ b/ircDDBGatewayConfig/Makefile @@ -4,7 +4,7 @@ OBJECTS = IRCDDBGatewayConfigApp.o IRCDDBGatewayConfigFrame.o IRCDDBGatewayConfi .PHONY: all all: ircddbgatewayconfig -ircddbgatewayconfig: $(OBJECTS) +ircddbgatewayconfig: $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(CXX) $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(LDFLAGS) $(GUILIBS) -o ircddbgatewayconfig -include $(OBJECTS:.o=.d) @@ -21,3 +21,5 @@ install: clean: $(RM) ircddbgatewayconfig *.o *.d *.bak *~ +../Common/Common.a: +../GUICommon/GUICommon.a: