minor tweaks to the verbose system

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index e0bd23c..17233bb 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -1,22 +1,74 @@
-# Main makefile for the packages
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
 include $(TOPDIR)/rules.mk
-COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m))
-INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
+include $(TOPDIR)/.config
+include $(INCLUDE_DIR)/host.mk
 
 all: compile
-clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
-compile: $(COMPILE_PACKAGES)
-install: base-files-install $(INSTALL_PACKAGES)
+
+include $(TMP_DIR)/.packagedeps
+
+PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m))
+DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m))
+COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-m))
+INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
 
 $(STAMP_DIR) $(TARGET_DIR):
        mkdir -p $@
 
-%-prepare: $(STAMP_DIR) $(TARGET_DIR)
-       $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
+ifeq ($(QUIET),1)
+%-compile %-install: FORCE
+       $(MAKE) -C $* $(patsubst $*-%,%,$@) || { $(call MESSAGE, "*** $* $(patsubst $*-%,%,$@) failed"); false; }
+
+%-prereq %-download %-clean: FORCE
+else
+%-prereq %-download %-clean %-compile %-install: FORCE
+endif
+       $(MAKE) -C $* $(patsubst $*-%,%,$@)
+
+# .IGNORE: $(COMPILE_PACKAGES) 
+
+$(TMP_DIR)/.packagedeps: $(TMP_DIR)/.packageinfo
+       @$(TOPDIR)/scripts/metadata.pl package_mk < $< > $@ || rm -f $@
+
+preconfig:
+clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
+prereq: $(PREREQ_PACKAGES)
+download: $(DOWNLOAD_PACKAGES)
+compile: $(COMPILE_PACKAGES)
+
+install-targets: $(INSTALL_PACKAGES)
+install:
+       rm -rf $(BUILD_DIR)/root
+       $(MAKE) install-targets
+       $(MAKE) preconfig
+       @if [ -d $(TOPDIR)/files ]; then \
+               $(CP) $(TOPDIR)/files/. $(BUILD_DIR)/root; \
+       fi
+       @( \
+               cd $(BUILD_DIR)/root; \
+               for script in ./etc/init.d/*; do \
+                       grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \
+                       IPKG_INSTROOT=$(BUILD_DIR)/root $(which bash) ./etc/rc.common $$script enable; \
+               done || true \
+       )
+
+index: $(PACKAGE_DIR)/Packages
 
-%-compile: $(STAMP_DIR) $(TARGET_DIR)
-       $(MAKE) -C $(patsubst %-compile,%,$@) compile
+$(PACKAGE_DIR)/Packages: $(PACKAGE_DIR)/*.ipk
+       (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages)
 
-%-clean: $(STAMP_DIR) $(TARGET_DIR)
-       $(MAKE) -C $(patsubst %-clean,%,$@) clean
+symlinks:
+       ../scripts/feeds.sh $(CONFIG_SOURCE_FEEDS) 
 
+ifeq ($(MAKECMDGOALS),compile)
+MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL)
+else
+.NOTPARALLEL:
+endif