fixed 'clean' targets in makefiles

Author: esar

Makefile

@@ -12,5 +12,5 @@ clean:
 	make -C tools clean
 	make -C firmware clean
 	make -C config clean
-	rm hdmilight-preconfig.bit
-	rm hdmilight.bit
+	rm -f hdmilight-preconfig.bit
+	rm -f hdmilight.bit

config/Makefile

@@ -1,4 +1,4 @@
-CONFIGS = $(shell awk '{print $$2}' merge.conf)
+CONFIGS = $(shell awk '!/\.bin/{print $$2}' merge.conf)
 
 all: merged.bin
 
@@ -10,9 +10,9 @@ $(CONFIGS):
 format.bin: format.conf
 	../tools/format2bin.py $< > $@
 
-merged.bin: merge.conf $(CONFIGS)
+merged.bin: merge.conf format.bin $(CONFIGS)
 	../tools/mergebin.py merge.conf merged.bin
 
 clean:
 	@$(foreach CONFIG, $(CONFIGS), $(MAKE) -C $(CONFIG) clean;)
-	rm *.bin
+	rm -f *.bin

config/config_0/Makefile

@@ -22,4 +22,4 @@ merged.bin: merge.conf $(BIN_FILES)
 	../../tools/mergebin.py merge.conf merged.bin
 
 clean:
-	rm *.bin
+	rm -f *.bin

config/config_1/Makefile

@@ -22,4 +22,4 @@ merged.bin: merge.conf $(BIN_FILES)
 	../../tools/mergebin.py merge.conf merged.bin
 
 clean:
-	rm *.bin
+	rm -f *.bin

config/config_2/Makefile

@@ -22,4 +22,4 @@ merged.bin: merge.conf $(BIN_FILES)
 	../../tools/mergebin.py merge.conf merged.bin
 
 clean:
-	rm *.bin
+	rm -f *.bin

tools/Makefile

@@ -5,4 +5,4 @@ makemem: makemem.o
 all: makemem
 
 clean:
-	rm makemem
+	rm -f makemem