From 618de9546a1eb94d9f313504a44a87053c12734f Mon Sep 17 00:00:00 2001 From: thedax Date: Sat, 23 Feb 2019 20:16:37 -0500 Subject: [PATCH] Makefile tweaks. (#376) -Have fusee-secondary clean sept-secondary as required. -Use $(TARGET) variable for sept-secondary, and clean the encrypted output as required. --- fusee/fusee-secondary/Makefile | 1 + sept/sept-secondary/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fusee/fusee-secondary/Makefile b/fusee/fusee-secondary/Makefile index 7273cc10d..7552e8e42 100644 --- a/fusee/fusee-secondary/Makefile +++ b/fusee/fusee-secondary/Makefile @@ -159,6 +159,7 @@ clean: @$(MAKE) -C $(AMS)/exosphere clean @$(MAKE) -C $(AMS)/thermosphere clean @$(MAKE) -C $(AMS)/stratosphere clean + @$(MAKE) -C $(AMS)/sept clean @rm -fr $(BUILD) $(TARGET).bin $(TARGET).elf #--------------------------------------------------------------------------------- diff --git a/sept/sept-secondary/Makefile b/sept/sept-secondary/Makefile index 5c04ee70c..1628eb4f7 100644 --- a/sept/sept-secondary/Makefile +++ b/sept/sept-secondary/Makefile @@ -124,15 +124,15 @@ ifeq ($(strip $(SEPT_ENC_PATH)),) @[ -d $@ ] || mkdir -p $@ @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile else - @touch $(TOPDIR)/sept-secondary.bin - @cp $(SEPT_ENC_PATH) $(TOPDIR)/sept-secondary.enc + @touch $(TOPDIR)/$(TARGET).bin + @cp $(SEPT_ENC_PATH) $(TOPDIR)/$(TARGET).enc endif #--------------------------------------------------------------------------------- clean: @echo clean ... @$(MAKE) -C $(AMS)/exosphere/rebootstub clean - @rm -fr $(BUILD) $(TARGET).bin $(TARGET).elf + @rm -fr $(BUILD) $(TARGET).bin $(TARGET).enc $(TARGET).elf #---------------------------------------------------------------------------------