From 947ca6f4e8cf3e67ce50d0af0f669e1099d6ea8c Mon Sep 17 00:00:00 2001 From: mbm Date: Tue, 3 Apr 2007 23:03:56 +0000 Subject: Tidy up Makefiles git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6857 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/Makefile | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) (limited to 'package/Makefile') diff --git a/package/Makefile b/package/Makefile index 06e91042b..9b8f87292 100644 --- a/package/Makefile +++ b/package/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/host.mk all: compile -include $(TMP_DIR)/.pkgdeps +include $(TMP_DIR)/.packagedeps PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m)) DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m)) @@ -22,25 +22,14 @@ INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y)) $(STAMP_DIR) $(TARGET_DIR): mkdir -p $@ -%-prereq: $(STAMP_DIR) $(TARGET_DIR) - $(MAKE) -C $(patsubst %-prereq,%,$@) prereq - -%-download: FORCE - $(MAKE) -C $(patsubst %-download,%,$@) download - -%-prepare: $(TARGET_DIR) FORCE - $(MAKE) -C $(patsubst %-prepare,%,$@) prepare +%-prereq %-download %-clean %-compile %-install: FORCE + $(MAKE) -C $* $(patsubst $*-%,%,$@) +%-prereq: $(STAMP_DIR) $(TARGET_DIR) +%-prepare: $(TARGET_DIR) %-compile: %-prepare - $(MAKE) -C $(patsubst %-compile,%,$@) compile - -%-install: - $(MAKE) -C $(patsubst %-install,%,$@) install - -%-clean: FORCE - $(MAKE) -C $(patsubst %-clean,%,$@) clean -$(TMP_DIR)/.pkgdeps: $(TMP_DIR)/.pkginfo +$(TMP_DIR)/.packagedeps: $(TMP_DIR)/.packageinfo @$(TOPDIR)/scripts/metadata.pl package_mk < $< > $@ || rm -f $@ preconfig: -- cgit v1.2.3