[firmware-utils] fix some definitions in the ZyXEL tool

[openwrt.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index ea4ce70..ecab9da 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -6,30 +6,32 @@
 #
 # Main makefile for the host tools
 #
 #
 # Main makefile for the host tools
 #

-
-file:=${lastword ${MAKEFILE_LIST}}
-curdir:=$(patsubst %/Makefile,%,${file})
+curdir:=tools

 
 # subdirectories to descend into
 
 # subdirectories to descend into

-$(curdir)/builddirs := sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage firmware-utils patch-cmdline $(if $(CONFIG_CCACHE),ccache)
+$(curdir)/builddirs := sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage firmware-utils patch-cmdline pkg-config $(if $(CONFIG_CCACHE),ccache)

 
 # builddir dependencies
 $(curdir)/squashfs/compile := $(curdir)/lzma/install
 
 # preparatory work
 
 # builddir dependencies
 $(curdir)/squashfs/compile := $(curdir)/lzma/install
 
 # preparatory work

-define copy_include
-$(STAGING_DIR)/include-host/.done:
-       @mkdir -p $$$$(dirname $$@)
-       @cp $(1)/include/*.h $$$$(dirname $$@)/
-       @touch $$@
-$(curdir)//prepare = $(STAGING_DIR)/include-host/.done
-endef
-$(eval $(call copy_include,$(curdir)))
+$(STAGING_DIR)/.prepared: $(TMP_DIR)/.build
+       @for dir in $(STAGING_DIR) $(STAGING_DIR_HOST); do ( \
+               set -x; \
+               mkdir -p "$$dir"; \
+               cd "$$dir"; \
+               mkdir -p bin lib include stamp; \
+       ); done
+       mkdir -p $(BUILD_DIR_HOST)/stamp $(BUILD_DIR)/stamp
+       $(INSTALL_DATA) $(TOPDIR)/tools/include/*.h $(STAGING_DIR_HOST)/include/
+       touch $@
+
+$(curdir)//prepare = $(STAGING_DIR)/.prepared
+$(curdir)//compile = $(STAGING_DIR)/.prepared

 
 # prerequisites for the individual targets
 
 # prerequisites for the individual targets

-$(curdir)/ := .config
-$(curdir)//compile = $(1)/prepare
+$(curdir)/ := .config prereq

 $(curdir)//install = $(1)/compile
 
 $(curdir)//install = $(1)/compile
 

-$(eval $(call stampfile,$(curdir),tools))
+$(eval $(call stampfile,$(curdir),tools,install))

 $(eval $(call subdir,$(curdir)))
 $(eval $(call subdir,$(curdir)))