From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 1 Feb 2010 01:56:02 +0000 (+0000)
Subject: firmware-utils: unify cc and cc2 macros, simplifies Makefile
X-Git-Tag: reboot~21154
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=14f6a53b6d6a585304ad0abd0321211f9fa95843;p=openwrt%2Fopenwrt.git

firmware-utils: unify cc and cc2 macros, simplifies Makefile

SVN-Revision: 19487
---

diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile
index c5fbb70cbc..4f12b9fe54 100644
--- a/tools/firmware-utils/Makefile
+++ b/tools/firmware-utils/Makefile
@@ -9,14 +9,9 @@ include $(TOPDIR)/rules.mk
 PKG_NAME := firmware-utils
 
 include $(INCLUDE_DIR)/host-build.mk
-
 include $(INCLUDE_DIR)/kernel.mk
 
 define cc
-	$(CC) $(HOST_CFLAGS) -include endian.h -o $(HOST_BUILD_DIR)/bin/$(1) src/$(1).c $(2)
-endef
-
-define cc2
 	$(CC) $(HOST_CFLAGS) -include endian.h -o $(HOST_BUILD_DIR)/bin/$(firstword $(1)) $(foreach src,$(1),src/$(src).c) $(2)
 endef
 
@@ -38,16 +33,16 @@ define Host/Compile
 	$(call cc,mkcasfw)
 	$(call cc,mkfwimage,-lz)
 	$(call cc,mkfwimage2,-lz)
-	$(call cc2,imagetag)
+	$(call cc,imagetag)
 	$(call cc,add_header)
 	$(call cc,makeamitbin)
 	$(call cc,encode_crc)
 	$(call cc,nand_ecc)
-	$(call cc2,mkplanexfw sha1)
-	$(call cc2,mktplinkfw md5)
+	$(call cc,mkplanexfw sha1)
+	$(call cc,mktplinkfw md5)
 	$(call cc,pc1crypt)
 	$(call cc,osbridge-crc)
-	$(call cc2,wrt400n cyg_crc32)
+	$(call cc,wrt400n cyg_crc32)
 	$(call cc,wndr3700)
 	$(call cc,mkdniimg)
 endef