fix xscale compile (#1495)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6827 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 15 insertions, 19 deletions

diff --git a/target/linux/ixp4xx-2.6/image/npe-ucode/Makefile b/target/linux/ixp4xx-2.6/image/npe-ucode/Makefile
index 1f61570dc..4559f5680 100644
--- a/target/linux/ixp4xx-2.6/image/npe-ucode/Makefile
+++ b/target/linux/ixp4xx-2.6/image/npe-ucode/Makefile
@@ -14,31 +14,27 @@ PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=IPL_ixp400NpeLibrary-2_3.zip
-PKG_UNPACK:=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE)
 
-include $(INCLUDE_DIR)/unpack.mk
+include $(INCLUDE_DIR)/package.mk
 
-$(PKG_BUILD_DIR)/.prepared:
-	mkdir $(PKG_BUILD_DIR)
-	$(PKG_UNPACK)
+define Build/Prepare
+	rm -rf $(PKG_BUILD_DIR)
+	mkdir -p $(PKG_BUILD_DIR)
+	unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE)
 	mv $(PKG_BUILD_DIR)/ixp400_xscale_sw/src/npeDl/IxNpeMicrocode.c $(PKG_BUILD_DIR)/
 	rm -rf $(PKG_BUILD_DIR)/ixp400_xscale_sw
 	$(CP) ./src/* $(PKG_BUILD_DIR)/
-	touch $@
-
-$(PKG_BUILD_DIR)/NPE-B: $(PKG_BUILD_DIR)/.prepared
-	( cd $(PKG_BUILD_DIR) ; \
-	  $(HOSTCC) -Wall IxNpeMicrocode.c -o IxNpeMicrocode ; \
-	  ./IxNpeMicrocode -be )
+endef
 
-download: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.prepared
-compile: $(PKG_BUILD_DIR)/NPE-B
+define Build/Compile
+	(cd $(PKG_BUILD_DIR); \
+		$(HOSTCC) -Wall IxNpeMicrocode.c -o IxNpeMicrocode; \
+		./IxNpeMicrocode -be \
+	)
+endef
 
-ifneq ($(TARGET),)
-install: compile
+define Build/InstallDev
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/NPE-B $(TARGET)/
-endif
+endef
 
-clean:
-	rm -rf $(PKG_BUILD_DIR)
+$(eval $(call Build/DefaultTargets))