Merge pull request #3 from F4FXL/MakefileTweaks

Makefile improvements an dependencies checks
8 years ago · 3e939b06f1
parent e24432fbde cbf40eb482
commit 3e939b06f1
9 changed files with 117 additions and 66 deletions
--- a/Common/Makefile
+++ b/Common/Makefile
@ -7,14 +7,19 @@ OBJECTS = AMBEFEC.o AnnouncementUnit.o ArduinoController.o BeaconUnit.o Callsign
 	  SlowDataDecoder.o SlowDataEncoder.o SoundCardController.o SoundCardReaderWriter.o SplitController.o TCPReaderWriter.o \
 	  Timer.o UDPReaderWriter.o UDRCController.o URIUSBController.o Utils.o

+.PHONY: all
 all:		Common.a

 Common.a:	$(OBJECTS)
 		$(AR) rcs Common.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) Common.a *.o *.d *.bak *~

--- a/DStarRepeater/Makefile
+++ b/DStarRepeater/Makefile
@ -1,17 +1,23 @@
 OBJECTS = DStarRepeaterApp.o DStarRepeaterLogRedirect.o DStarRepeaterRXThread.o DStarRepeaterStatusData.o \
 	  DStarRepeaterThread.o DStarRepeaterTRXThread.o DStarRepeaterTXRXThread.o DStarRepeaterTXThread.o

+.PHONY: all
 all:		dstarrepeaterd

-dstarrepeaterd:	$(OBJECTS)
+dstarrepeaterd:	$(OBJECTS) ../Common/Common.a
 		$(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o dstarrepeaterd

+-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 dstarrepeaterd $(BINDIR)

 clean:
 		$(RM) dstarrepeaterd *.o *.d *.bak *~

+../Common/Common.a:
--- a/DStarRepeater/MakefileGUI
+++ b/DStarRepeater/MakefileGUI
@ -3,15 +3,21 @@ OBJECTS = DStarRepeaterApp.o DStarRepeaterFrame.o DStarRepeaterLogRedirect.o DSt

 all:		dstarrepeater

-dstarrepeater:	$(OBJECTS)
+dstarrepeater:	$(OBJECTS) ../Common/Common.a ../GUICommon/GUICommon.a
 		$(CXX) $(OBJECTS) ../Common/Common.a ../GUICommon/GUICommon.a $(LDFLAGS) $(GUILIBS) -o dstarrepeater

 %.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 dstarrepeater $(BINDIR)

+.PHONY: clean
 clean:
 		$(RM) dstarrepeater *.o *.d *.bak *~

+../Common/Common.a:
+../GUICommon/GUICommon.a:
+
--- a/DStarRepeaterConfig/Makefile
+++ b/DStarRepeaterConfig/Makefile
@ -5,17 +5,25 @@ OBJECTS = DStarRepeaterConfigActiveHangSet.o DStarRepeaterConfigAnnouncementSet.
 	  DStarRepeaterConfigIcomSet.o DStarRepeaterConfigMMDVMSet.o DStarRepeaterConfigModemSet.o DStarRepeaterConfigNetworkSet.o \
 	  DStarRepeaterConfigSoundCardSet.o DStarRepeaterConfigSplitSet.o DStarRepeaterConfigTimesSet.o

+.PHONY: all
 all:		dstarrepeaterconfig

-dstarrepeaterconfig:	$(OBJECTS)
+dstarrepeaterconfig:	$(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a
 		$(CXX) $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(LDFLAGS) $(GUILIBS) -o dstarrepeaterconfig

+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../GUICommon -I../Common -c -o $@ $<
+		$(CXX) -MM $(CFLAGS) -I../GUICommon -I../Common $< > $*.d

+.PHONY: install
 install:
 		install -g bin -o root -m 0775 dstarrepeaterconfig $(BINDIR)

+.PHONY: install
 clean:
 		$(RM) dstarrepeaterconfig *.o *.d *.bak *~

+../GUICommon/GUICommon.a:
+../Common/Common.a:
--- a/GUICommon/Makefile
+++ b/GUICommon/Makefile
@ -1,13 +1,18 @@
 OBJECTS = AddressTextCtrl.o CallsignTextCtrl.o MessageTextCtrl.o PortTextCtrl.o RestrictedTextCtrl.o

+.PHONY: all
 all:		GUICommon.a

 GUICommon.a:	$(OBJECTS)
 		$(AR) rcs GUICommon.a $(OBJECTS)

+-include $(OBJECTS:.o=.d)
+
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -c -o $@ $<
+		$(CXX) -MM $(CFLAGS) $< > $*.d

+.PHONY: clean
 clean:
 		$(RM) GUICommon.a *.o *.d *.bak *~

--- a/36
+++ b/36
@ -11,26 +11,32 @@ export LDFLAGS :=

 all:	DStarRepeater/dstarrepeaterd DStarRepeaterConfig/dstarrepeaterconfig

-DStarRepeater/dstarrepeaterd:	Common/Common.a
-	make -C DStarRepeater
+DStarRepeater/dstarrepeaterd:	Common/Common.a force
+	$(MAKE) -C DStarRepeater

-DStarRepeaterConfig/dstarrepeaterconfig:	GUICommon/GUICommon.a Common/Common.a
-	make -C DStarRepeaterConfig
+DStarRepeaterConfig/dstarrepeaterconfig:	GUICommon/GUICommon.a Common/Common.a force
+	$(MAKE) -C DStarRepeaterConfig

-GUICommon/GUICommon.a:
-	make -C GUICommon
+GUICommon/GUICommon.a: force
+	$(MAKE) -C GUICommon

-Common/Common.a:
-	make -C Common
+Common/Common.a: force
+	$(MAKE) -C Common

+.PHONY: install
 install:	all
-	make -C Data install
-	make -C DStarRepeater install
-	make -C DStarRepeaterConfig install
+	$(MAKE) -C Data install
+	$(MAKE) -C DStarRepeater install
+	$(MAKE) -C DStarRepeaterConfig install

+.PHONY: clean
 clean:
-	make -C Common clean
-	make -C GUICommon clean
-	make -C DStarRepeater clean
-	make -C DStarRepeaterConfig clean
+	$(MAKE) -C Common clean
+	$(MAKE) -C GUICommon clean
+	$(MAKE) -C DStarRepeater clean
+	$(MAKE) -C DStarRepeaterConfig clean
+
+.PHONY: force
+force:
+	@true

--- a/Makefile.Pi
+++ b/Makefile.Pi
@ -11,26 +11,31 @@ export LDFLAGS :=

 all:	DStarRepeater/dstarrepeaterd DStarRepeaterConfig/dstarrepeaterconfig

-DStarRepeater/dstarrepeaterd:	Common/Common.a
-	make -C DStarRepeater
+DStarRepeater/dstarrepeaterd:	Common/Common.a force
+	$(MAKE) -C DStarRepeater

-DStarRepeaterConfig/dstarrepeaterconfig:	GUICommon/GUICommon.a Common/Common.a
-	make -C DStarRepeaterConfig
+DStarRepeaterConfig/dstarrepeaterconfig:	GUICommon/GUICommon.a Common/Common.a force
+	$(MAKE) -C DStarRepeaterConfig

-GUICommon/GUICommon.a:
-	make -C GUICommon
+GUICommon/GUICommon.a: force
+	$(MAKE) -C GUICommon

-Common/Common.a:
-	make -C Common
+Common/Common.a: force
+	$(MAKE) -C Common

+.PHONY:
 install:	all
-	make -C Data install
-	make -C DStarRepeater install
-	make -C DStarRepeaterConfig install
+	$(MAKE) -C Data install
+	$(MAKE) -C DStarRepeater install
+	$(MAKE) -C DStarRepeaterConfig install

+.PHONY: clean
 clean:
-	make -C Common clean
-	make -C GUICommon clean
-	make -C DStarRepeater clean
-	make -C DStarRepeaterConfig clean
-
+	$(MAKE) -C Common clean
+	$(MAKE) -C GUICommon clean
+	$(MAKE) -C DStarRepeater clean
+	$(MAKE) -C DStarRepeaterConfig clean
+
+.PHONY: force
+force:
+	@true
--- a/37
+++ b/37
@ -11,26 +11,31 @@ export LDFLAGS :=

 all:	DStarRepeater/dstarrepeater DStarRepeaterConfig/dstarrepeaterconfig

-DStarRepeater/dstarrepeater:	GUICommon/GUICommon.a Common/Common.a
-	make -C DStarRepeater -f MakefileGUI
+DStarRepeater/dstarrepeater:	GUICommon/GUICommon.a Common/Common.a force
+	$(MAKE) -C DStarRepeater -f MakefileGUI

-DStarRepeaterConfig/dstarrepeaterconfig:	GUICommon/GUICommon.a Common/Common.a
-	make -C DStarRepeaterConfig
+DStarRepeaterConfig/dstarrepeaterconfig:	GUICommon/GUICommon.a Common/Common.a force
+	$(MAKE) -C DStarRepeaterConfig

-GUICommon/GUICommon.a:
-	make -C GUICommon
+GUICommon/GUICommon.a: force
+	$(MAKE) -C GUICommon

-Common/Common.a:
-	make -C Common
+Common/Common.a: force
+	$(MAKE) -C Common

+.PHONY: install
 install:	all
-	make -C Data install
-	make -C DStarRepeater -f MakefileGUI install
-	make -C DStarRepeaterConfig install
+	$(MAKE) -C Data install
+	$(MAKE) -C DStarRepeater -f MakefileGUI install
+	$(MAKE) -C DStarRepeaterConfig install

+.PHONY: clean
 clean:
-	make -C Common clean
-	make -C GUICommon clean
-	make -C DStarRepeater -f MakefileGUI clean
-	make -C DStarRepeaterConfig clean
-
+	$(MAKE) -C Common clean
+	$(MAKE) -C GUICommon clean
+	$(MAKE) -C DStarRepeater -f MakefileGUI clean
+	$(MAKE) -C DStarRepeaterConfig clean
+
+.PHONY: force
+force:
+	@true
--- a/37
+++ b/37
@ -11,26 +11,31 @@ export LDFLAGS :=

 all:	DStarRepeater/dstarrepeater DStarRepeaterConfig/dstarrepeaterconfig

-DStarRepeater/dstarrepeater:	GUICommon/GUICommon.a Common/Common.a
-	make -C DStarRepeater -f MakefileGUI
+DStarRepeater/dstarrepeater:	GUICommon/GUICommon.a Common/Common.a force
+	$(MAKE) -C DStarRepeater -f MakefileGUI

-DStarRepeaterConfig/dstarrepeaterconfig:	GUICommon/GUICommon.a Common/Common.a
-	make -C DStarRepeaterConfig
+DStarRepeaterConfig/dstarrepeaterconfig:	GUICommon/GUICommon.a Common/Common.a force
+	$(MAKE) -C DStarRepeaterConfig

-GUICommon/GUICommon.a:
-	make -C GUICommon
+GUICommon/GUICommon.a: force
+	$(MAKE) -C GUICommon

-Common/Common.a:
-	make -C Common
+Common/Common.a: force
+	$(MAKE) -C Common

+.PHONY: install
 install:	all
-	make -C Data install
-	make -C DStarRepeater -f MakefileGUI install
-	make -C DStarRepeaterConfig install
+	$(MAKE) -C Data install
+	$(MAKE) -C DStarRepeater -f MakefileGUI install
+	$(MAKE) -C DStarRepeaterConfig install

+.PHONY: clean
 clean:
-	make -C Common clean
-	make -C GUICommon clean
-	make -C DStarRepeater clean
-	make -C DStarRepeaterConfig clean
-
+	$(MAKE) -C Common clean
+	$(MAKE) -C GUICommon clean
+	$(MAKE) -C DStarRepeater clean
+	$(MAKE) -C DStarRepeaterConfig clean
+
+.PHONY: force
+force:
+	@true