Merge pull request #15 from F4FXL/MakefileTweaks

Makefile dependencies checks

APRSTransmit/Makefile

@@ -1,16 +1,24 @@
 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)
+
 %.o: %.cpp
 		$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $<
+		$(CXX) -MM -DwxUSE_GUI=0 $(CFLAGS) -I../Common $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 aprstransmitd $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) aprstransmitd *.o *.d *.bak *~
 
+../Common/Common.a:
+

Common/Makefile

@@ -9,14 +9,20 @@ OBJECTS = AMBEData.o AnnouncementUnit.o APRSCollector.o APRSWriter.o APRSWriterT
 	  TCPReaderWriterClient.o TCPReaderWriterServer.o TextCollector.o TextData.o Timer.o UDPReaderWriter.o UserCache.o Utils.o \
 	  VersionUnit.o XLXHostsFileDownloader.o
 
+.PHONY:		all
 all:		Common.a
 
-Common.a:	$(OBJECTS)
+Common.a:	$(OBJECTS) ../ircDDB/IRCDDB.a
 		$(AR) rcs Common.a $(OBJECTS)
 
+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../ircDDB -c -o $@ $<
+		$(CXX) -MM -DwxUSE_GUI=0 $(CFLAGS) -I../ircDDB $< > $*.d
 
+.PHONY: clean
 clean:
 		$(RM) Common.a *.o *.d *.bak *~
 
+../ircDDB/IRCDDB.a:

Data/Makefile

@@ -1,3 +1,4 @@
+.PHONY: install
 install:
 	install -d -g bin -o root -m 0775 $(DATADIR)
 	install -g bin -o root -m 0664 CCS_Hosts.txt    $(DATADIR)

GUICommon/Makefile

@@ -1,14 +1,20 @@
 OBJECTS = AddressTextCtrl.o CallsignTextCtrl.o DCSSet.o DescriptionTextCtrl.o DExtraSet.o DPlusSet.o DPRSSet.o MobileGPSSet.o PortTextCtrl.o RemoteSet.o \
 	  RepeaterDataSet.o RepeaterInfoSet.o RestrictedTextCtrl.o StarNetSet.o XLXSet.o
 
+.PHONY: all
 all:		GUICommon.a
 
-GUICommon.a:	$(OBJECTS)
+GUICommon.a:	$(OBJECTS) ../Common/Common.a
 		$(AR) rcs GUICommon.a $(OBJECTS)
 
+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -c -o $@ $<
+		$(CXX) -MM $(CFLAGS) -I../Common $< > $*.d
 
+.PHONY: clean
 clean:
 		$(RM) GUICommon.a *.o *.d *.bak *~
 
+../Common/Common.a:

Makefile

@@ -12,45 +12,47 @@ export GUILIBS := $(shell wx-config --libs adv,core,base)
 export LIBS    := $(shell wx-config --libs base)
 export LDFLAGS := 
 
+.PHONY: all
 all:	ircDDBGateway/ircddbgatewayd ircDDBGatewayConfig/ircddbgatewayconfig APRSTransmit/aprstransmitd RemoteControl/remotecontrold \
 	StarNetServer/starnetserverd TextTransmit/texttransmitd TimerControl/timercontrold TimeServer/timeserverd VoiceTransmit/voicetransmitd
 
-ircDDBGateway/ircddbgatewayd:	Common/Common.a ircDDB/IRCDDB.a
+ircDDBGateway/ircddbgatewayd:	Common/Common.a ircDDB/IRCDDB.a force
 	$(MAKE) -C ircDDBGateway
 
-ircDDBGatewayConfig/ircddbgatewayconfig:	GUICommon/GUICommon.a Common/Common.a
+ircDDBGatewayConfig/ircddbgatewayconfig:	GUICommon/GUICommon.a Common/Common.a force
 	$(MAKE) -C ircDDBGatewayConfig
 
-APRSTransmit/aprstransmitd:	Common/Common.a
+APRSTransmit/aprstransmitd:	Common/Common.a force
 	$(MAKE) -C APRSTransmit
 
-RemoteControl/remotecontrold:	Common/Common.a
+RemoteControl/remotecontrold:	Common/Common.a force
 	$(MAKE) -C RemoteControl
 
-StarNetServer/starnetserverd:	Common/Common.a ircDDB/IRCDDB.a
+StarNetServer/starnetserverd:	Common/Common.a ircDDB/IRCDDB.a force
 	$(MAKE) -C StarNetServer
 
-TextTransmit/texttransmitd:	Common/Common.a
+TextTransmit/texttransmitd:	Common/Common.a force
 	$(MAKE) -C TextTransmit
 
-TimerControl/timercontrold:	Common/Common.a GUICommon/GUICommon.a
+TimerControl/timercontrold:	Common/Common.a GUICommon/GUICommon.a force
 	$(MAKE) -C TimerControl
 
-TimeServer/timeserverd:	Common/Common.a GUICommon/GUICommon.a
+TimeServer/timeserverd:	Common/Common.a GUICommon/GUICommon.a force
 	$(MAKE) -C TimeServer
 
-VoiceTransmit/voicetransmitd:	Common/Common.a
+VoiceTransmit/voicetransmitd:	Common/Common.a force
 	$(MAKE) -C VoiceTransmit
 
-GUICommon/GUICommon.a:
+GUICommon/GUICommon.a: force
 	$(MAKE) -C GUICommon
 
-Common/Common.a:
+Common/Common.a: force
 	$(MAKE) -C Common
 
-ircDDB/IRCDDB.a:
+ircDDB/IRCDDB.a: force
 	$(MAKE) -C ircDDB
 
+.PHONY: install
 install:	all
 	$(MAKE) -C Data install
 	$(MAKE) -C APRSTransmit install
@@ -63,6 +65,7 @@ install:	all
 	$(MAKE) -C VoiceTransmit install
 	$(MAKE) -C ircDDBGatewayConfig install
 
+.PHONY: clean
 clean:
 	$(MAKE) -C Common clean
 	$(MAKE) -C ircDDB clean
@@ -77,3 +80,7 @@ clean:
 	$(MAKE) -C VoiceTransmit clean
 	$(MAKE) -C ircDDBGatewayConfig clean
 
+.PHONY: force
+force :
+	@true
+

MakefileGUI

@@ -12,45 +12,47 @@ export GUILIBS := $(shell wx-config --libs adv,core,base)
 export LIBS    := $(shell wx-config --libs base)
 export LDFLAGS := 
 
+.PHONY: all
 all:	ircDDBGateway/ircddbgateway ircDDBGatewayConfig/ircddbgatewayconfig APRSTransmit/aprstransmitd RemoteControl/remotecontrol \
 	StarNetServer/starnetserver TextTransmit/texttransmitd TimerControl/timercontrol TimeServer/timeserver VoiceTransmit/voicetransmitd
 
-ircDDBGateway/ircddbgateway:	GUICommon/GUICommon.a Common/Common.a ircDDB/IRCDDB.a
+ircDDBGateway/ircddbgateway:	GUICommon/GUICommon.a Common/Common.a ircDDB/IRCDDB.a force
 	$(MAKE) -C ircDDBGateway -f MakefileGUI
 
-ircDDBGatewayConfig/ircddbgatewayconfig:	GUICommon/GUICommon.a Common/Common.a
+ircDDBGatewayConfig/ircddbgatewayconfig:	GUICommon/GUICommon.a Common/Common.a force
 	$(MAKE) -C ircDDBGatewayConfig
 
-APRSTransmit/aprstransmitd:	Common/Common.a
+APRSTransmit/aprstransmitd:	Common/Common.a force
 	$(MAKE) -C APRSTransmit
 
-RemoteControl/remotecontrol:	Common/Common.a
+RemoteControl/remotecontrol:	Common/Common.a force
 	$(MAKE) -C RemoteControl -f MakefileGUI
 
-StarNetServer/starnetserver:	Common/Common.a ircDDB/IRCDDB.a
+StarNetServer/starnetserver:	Common/Common.a ircDDB/IRCDDB.a force
 	$(MAKE) -C StarNetServer -f MakefileGUI
 
-TextTransmit/texttransmitd:	Common/Common.a
+TextTransmit/texttransmitd:	Common/Common.a force
 	$(MAKE) -C TextTransmit
 
-TimerControl/timercontrol:	Common/Common.a GUICommon/GUICommon.a
+TimerControl/timercontrol:	Common/Common.a GUICommon/GUICommon.a force
 	$(MAKE) -C TimerControl -f MakefileGUI
 
-TimeServer/timeserver:	Common/Common.a GUICommon/GUICommon.a
+TimeServer/timeserver:	Common/Common.a GUICommon/GUICommon.a force
 	$(MAKE) -C TimeServer -f MakefileGUI
 
-VoiceTransmit/voicetransmitd:	Common/Common.a
+VoiceTransmit/voicetransmitd:	Common/Common.a force
 	$(MAKE) -C VoiceTransmit
 
-GUICommon/GUICommon.a:
+GUICommon/GUICommon.a: force
 	$(MAKE) -C GUICommon
 
-Common/Common.a:
+Common/Common.a: force
 	$(MAKE) -C Common
 
-ircDDB/IRCDDB.a:
+ircDDB/IRCDDB.a: force
 	$(MAKE) -C ircDDB
 
+.PHONY: install
 install:	all
 	$(MAKE) -C Data install
 	$(MAKE) -C APRSTransmit install
@@ -63,6 +65,7 @@ install:	all
 	$(MAKE) -C VoiceTransmit install
 	$(MAKE) -C ircDDBGatewayConfig install
 
+.PHONY: clean
 clean:
 	$(MAKE) -C Common clean
 	$(MAKE) -C ircDDB clean
@@ -76,3 +79,7 @@ clean:
 	$(MAKE) -C TimeServer -f MakefileGUI clean
 	$(MAKE) -C VoiceTransmit clean
 	$(MAKE) -C ircDDBGatewayConfig clean
+
+.PHONY: force
+force:
+	true;

RemoteControl/Makefile

@@ -1,17 +1,24 @@
 OBJECTS = RemoteControlAppD.o RemoteControlCallsignData.o RemoteControlConfig.o RemoteControlLinkData.o RemoteControlRemoteControlHandler.o \
 	  RemoteControlRepeaterData.o RemoteControlStarNetGroup.o RemoteControlStarNetUser.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)
+
 %.o: %.cpp
 		$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $<
+		$(CXX) -MM -DwxUSE_GUI=0 $(CFLAGS) -I../Common $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 remotecontrold $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) remotecontrold *.o *.d *.bak *~
 
+../Common/Common.a:

RemoteControl/MakefileGUI

@@ -2,17 +2,25 @@ OBJECTS = RemoteControlApp.o RemoteControlCallsignData.o RemoteControlConfig.o R
 		  RemoteControlPreferences.o RemoteControlRemoteControlHandler.o RemoteControlRemoteSet.o RemoteControlRepeaterData.o \
 		  RemoteControlRepeaterPanel.o RemoteControlStarNetGroup.o RemoteControlStarNetPanel.o RemoteControlStarNetUser.o
 
+.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)
+
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -I../GUICommon -c -o $@ $<
+		$(CXX) -MM $(CFLAGS) -I../Common -I../GUICommon $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 remotecontrol $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) remotecontrol *.o *.d *.bak *~
 
+../GUICommon/GUICommon.a:
+../Common/Common.a:

StarNetServer/Makefile

@@ -1,16 +1,24 @@
 OBJECTS = StarNetServerAppD.o StarNetServerConfig.o StarNetServerThread.o StarNetServerThreadHelper.o
 
+.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)
+
 %.o: %.cpp
 		$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -I../ircDDB -c -o $@ $<
+		$(CXX) -MM -DwxUSE_GUI=0 $(CFLAGS) -I../Common -I../ircDDB $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 starnetserverd $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) starnetserverd *.o *.d *.bak *~
 
+../Common/Common.a:
+../ircDDB/IRCDDB.a:

StarNetServer/MakefileGUI

@@ -2,17 +2,25 @@ OBJECTS = StarNetServerApp.o StarNetServerCallsignSet.o StarNetServerConfig.o St
 		  StarNetServerLogRedirect.o StarNetServerMiscellaneousSet.o StarNetServerPreferences.o StarNetServerThread.o \
 		  StarNetServerThreadHelper.o
 
+.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)
+
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -I../GUICommon -I../ircDDB -c -o $@ $<
+		$(CXX) -MM $(CFLAGS) -I../Common -I../GUICommon -I../ircDDB $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 starnetserver $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) starnetserver *.o *.d *.bak *~
 
+../GUICommon/GUICommon.a:
+../Common/Common.a:

TextTransmit/Makefile

@@ -1,16 +1,23 @@
 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)
+
 %.o: %.cpp
 		$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $<
+		$(CXX) -MM -DwxUSE_GUI=0 $(CFLAGS) -I../Common $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 texttransmitd $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) texttransmitd *.o *.d *.bak *~
 
+../Common/Common.a:

TimeServer/Makefile

@@ -1,16 +1,23 @@
 OBJECTS = TimeServerD.o TimeServerConfig.o TimeServerThread.o TimeServerThreadHelper.o
 
+.PHONY: all
 all:		timeserverd
 
-timeserverd:	$(OBJECTS)
+timeserverd:	$(OBJECTS) ../Common/Common.a
 		$(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o timeserverd
 
+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $<
+		$(CXX) -MM -DwxUSE_GUI=0 $(CFLAGS) -I../Common $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 timeserverd $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) timeserverd *.o *.d *.bak *~
 
+../Common/Common.a:

TimeServer/MakefileGUI

@@ -1,17 +1,25 @@
 OBJECTS = TimeServerApp.o TimeServerAnnouncementsSet.o TimeServerConfig.o TimeServerFrame.o TimeServerGatewaySet.o TimeServerLogRedirect.o \
 		  TimeServerPreferences.o TimeServerThread.o TimeServerThreadHelper.o
 
+.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)
+
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -I../GUICommon -c -o $@ $<
+		$(CXX) -MM $(CFLAGS) -I../Common -I../GUICommon $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 timeserver $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) timeserver *.o *.d *.bak *~
 
+../GUICommon/GUICommon.a:
+../Common/Common.a:

TimerControl/Makefile

@@ -1,17 +1,25 @@
 OBJECTS = TimerControlAppD.o TimerControlConfig.o TimerControlItemFile.o TimerControlRemoteControlHandler.o TimerControlThread.o \
 	  TimerControlThreadHelper.o
 
+.PHONY: all
 all:		timercontrold
 
-timercontrold:	$(OBJECTS)
+timercontrold:	$(OBJECTS) ../Common/Common.a
 		$(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o timercontrold
 
+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $<
+		$(CXX) -MM -DwxUSE_GUI=0 $(CFLAGS) -I../Common $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 timercontrold $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) timercontrold *.o *.d *.bak *~
 
+../Common/Common.a:
+

TimerControl/MakefileGUI

@@ -2,17 +2,25 @@ OBJECTS = TimerControlApp.o TimerControlConfig.o TimerControlFrame.o TimerContro
 		  TimerControlRemoteControlHandler.o TimerControlRemoteSet.o TimerControlRepeaterPanel.o TimerControlThread.o \
 		  TimerControlThreadHelper.o
 
+.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)
+
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -I../GUICommon -c -o $@ $<
+		$(CXX) -MM $(CFLAGS) -I../Common -I../GUICommon $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 timercontrol $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) timercontrol *.o *.d *.bak *~
 
+../GUICommon/GUICommon.a:
+../Common/Common.a:

VoiceTransmit/Makefile

@@ -1,16 +1,23 @@
 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)
+
 %.o: %.cpp
 		$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $<
+		$(CXX) -MM -DwxUSE_GUI=0 $(CFLAGS) -I../Common $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 voicetransmitd $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) voicetransmitd *.o *.d *.bak *~
 
+../Common/Common.a:

ircDDB/Makefile

@@ -1,14 +1,19 @@
 OBJECTS = IRCClient.o IRCDDBApp.o IRCDDBClient.o IRCDDB.o IRCDDBMultiClient.o IRCMessage.o IRCMessageQueue.o IRCProtocol.o IRCReceiver.o \
 	  IRCutils.o
 
+.PHONY: all
 all:		IRCDDB.a
 
 IRCDDB.a:	$(OBJECTS)
 		$(AR) rcs IRCDDB.a $(OBJECTS)
 
+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -c -o $@ $<
+		$(CXX) -MM -DwxUSE_GUI=0 $(CFLAGS) $< > $*.d
 
+.PHONY: clean
 clean:
 		$(RM) IRCDDB.a *.o *.d *.bak *~
 

ircDDBGateway/Makefile

@@ -1,16 +1,25 @@
 OBJECTS = IRCDDBGatewayAppD.o IRCDDBGatewayStatusData.o IRCDDBGatewayThread.o IRCDDBGatewayThreadHelper.o
 
+.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)
+
 %.o: %.cpp
 		$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -I../ircDDB -c -o $@ $<
+		$(CXX) -MM -DwxUSE_GUI=0 $(CFLAGS) -I../Common -I../ircDDB $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 ircddbgatewayd $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) ircddbgatewayd *.o *.d *.bak *~
 
+../Common/Common.a:
+../ircDDB/IRCDDB.a:
+

ircDDBGateway/MakefileGUI

@@ -1,17 +1,26 @@
 OBJECTS = IRCDDBGatewayApp.o IRCDDBGatewayFrame.o IRCDDBGatewayLogRedirect.o IRCDDBGatewayStatusData.o IRCDDBGatewayThread.o \
 	  IRCDDBGatewayThreadHelper.o
 
+.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)
+
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -I../GUICommon -I../ircDDB -c -o $@ $<
+		$(CXX) -MM $(CFLAGS) -I../Common -I../GUICommon -I../ircDDB $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 ircddbgateway $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) ircddbgateway *.o *.d *.bak *~
 
+../GUICommon/GUICommon.a:
+../Common/Common.a:s
+

ircDDBGatewayConfig/Makefile

@@ -1,17 +1,25 @@
 OBJECTS = IRCDDBGatewayConfigApp.o IRCDDBGatewayConfigFrame.o IRCDDBGatewayConfigGatewaySet.o IRCDDBGatewayConfigIrcDDBSet.o \
 	  IRCDDBGatewayConfigMiscellaneousSet.o
 
+.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)
+
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -I../GUICommon -c -o $@ $<
+		$(CXX) -MM -DwxUSE_GUI=0 $(CFLAGS) -I../Common -I../GUICommon $< > $*.d
 
+.PHONY: install
 install:
 		install -g bin -o root -m 0775 ircddbgatewayconfig $(BINDIR)
 
+.PHONY: clean
 clean:
 		$(RM) ircddbgatewayconfig *.o *.d *.bak *~
 
+../Common/Common.a:
+../GUICommon/GUICommon.a: