aboutsummaryrefslogtreecommitdiffstats
path: root/package/Makefile
diff options
context:
space:
mode:
authorMike Baker <mbm@openwrt.org>2007-04-03 23:03:56 +0000
committerMike Baker <mbm@openwrt.org>2007-04-03 23:03:56 +0000
commit0f8b8ec000d3ce1d84e9caf0bfb0e7f1103c1836 (patch)
treec2e551f003a37f3f6ecb02e3d2d7aa8df554b09b /package/Makefile
parent29f0b44895e039792bcc0166b031adbba485986f (diff)
downloadupstream-0f8b8ec000d3ce1d84e9caf0bfb0e7f1103c1836.tar.gz
upstream-0f8b8ec000d3ce1d84e9caf0bfb0e7f1103c1836.tar.bz2
upstream-0f8b8ec000d3ce1d84e9caf0bfb0e7f1103c1836.zip
Tidy up Makefiles
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6857 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/Makefile')
-rw-r--r--package/Makefile23
1 files changed, 6 insertions, 17 deletions
diff --git a/package/Makefile b/package/Makefile
index 06e91042bc..9b8f872924 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: