From 8fee8419143c6fbc3c9e3141b6b6d56810ef1ddd Mon Sep 17 00:00:00 2001 From: eXhumer Date: Fri, 5 Jun 2020 23:18:13 -0600 Subject: [PATCH] Makefile changes * Make dist-no-debug the default build target * Remove repeating recipe into common recipe for the components --- Makefile | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index b1f77f19f..5137c1f79 100644 --- a/Makefile +++ b/Makefile @@ -9,31 +9,18 @@ endif COMPONENTS := fusee stratosphere mesosphere exosphere thermosphere troposphere libraries +dist-no-debug: all +dist: dist-no-debug all: $(COMPONENTS) - -thermosphere: - $(MAKE) -C thermosphere all - -exosphere: thermosphere - $(MAKE) -C exosphere all - -stratosphere: exosphere libraries - $(MAKE) -C stratosphere all - -mesosphere: exosphere libraries - $(MAKE) -C mesosphere all - -troposphere: stratosphere - $(MAKE) -C troposphere all - -sept: exosphere - $(MAKE) -C sept all - fusee: exosphere mesosphere stratosphere sept - $(MAKE) -C $@ all +stratosphere: exosphere libraries +mesosphere: exosphere libraries +troposphere: stratosphere +exosphere: thermosphere +sept: exosphere -libraries: - $(MAKE) -C libraries all +$(COMPONENTS): + $(MAKE) -C $@ all clean: $(MAKE) -C fusee clean @@ -143,5 +130,4 @@ dist: dist-no-debug rm -r atmosphere-$(AMSVER)-debug mv atmosphere-$(AMSVER)-debug.zip out/atmosphere-$(AMSVER)-debug.zip - -.PHONY: $(TOPTARGETS) $(COMPONENTS) +.PHONY: $(TOPTARGETS) $(COMPONENTS) \ No newline at end of file