X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=package%2FMakefile;h=153ca657b0283b20dd105297e2150489d9bea8c0;hp=e947bcfaeaa7edae52b73f2f73ff742d93822ff8;hb=4d530c69b329dea2face807e6d74292c35a3b12d;hpb=1b14a20c70b78c037ef4bcc6d1edb61ea8b27e68

diff --git a/package/Makefile b/package/Makefile
index e947bcfae..153ca657b 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -1,47 +1,52 @@
-# Main makefile for the packages
-include $(TOPDIR)/rules.mk
-include $(TOPDIR)/.config
-include $(TOPDIR)/.pkgdeps
-
-SOURCE_PACKAGES:=$(patsubst %,%-source,$(package-y) $(package-m))
-COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m))
-INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
-
-$(STAMP_DIR) $(TARGET_DIR):
-	mkdir -p $@
-
-%-source: $(STAMP_DIR) $(TARGET_DIR)
-	$(MAKE) -C $(patsubst %-source,%,$@) source MAKEFLAGS="$(BUILD_MAKEFLAGS)"
-
-%-prepare: $(STAMP_DIR) $(TARGET_DIR)
-	$(MAKE) -C $(patsubst %-prepare,%,$@) prepare MAKEFLAGS="$(BUILD_MAKEFLAGS)"
-
-%-compile: $(STAMP_DIR) $(TARGET_DIR)
-	@echo "-> make $@"
-	$(MAKE) -C $(patsubst %-compile,%,$@) compile MAKEFLAGS="$(BUILD_MAKEFLAGS)"
-
-%-install: $(STAMP_DIR) $(TARGET_DIR)
-	@echo "-> make $@"
-	$(MAKE) -C $(patsubst %-install,%,$@) install MAKEFLAGS="$(BUILD_MAKEFLAGS)"
-
-%-clean: $(STAMP_DIR) $(TARGET_DIR)
-	$(MAKE) -C $(patsubst %-clean,%,$@) clean MAKEFLAGS="$(BUILD_MAKEFLAGS)"
-
-ifeq ($(SDK),1)
-GENDEP_OPTS := -s
-endif
-
-$(TOPDIR)/.pkgdeps: $(TOPDIR)/.pkginfo
-	@$(TOPDIR)/scripts/gen_deps.pl $(GENDEP_OPTS) < $< > $@ || rm -f $@
-
-all: compile
-clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
-download: $(SOURCE_PACKAGES)
-compile-targets: $(COMPILE_PACKAGES)
-compile:
-	$(MAKE) -j$(CONFIG_JLEVEL) compile-targets
-install-targets: base-files-install $(INSTALL_PACKAGES)
-install:
+# 
+# Copyright (C) 2006-2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
+curdir:=package
+
+-include $(TMP_DIR)/.packagedeps
+$(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m))
+$(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m))
+$(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
+$(curdir)/builddirs-install:=. $(sort $(package-y))
+
+$(curdir)/install:=$(curdir)/install-cleanup
+
+$(curdir)/cleanup:
 	rm -rf $(BUILD_DIR)/root
-	$(MAKE) install-targets
 
+$(curdir)/rootfs-prepare:
+	@if [ -d $(TOPDIR)/files ]; then \
+		$(CP) $(TOPDIR)/files/. $(BUILD_DIR)/root; \
+	fi
+	@mkdir -p $(BUILD_DIR)/root/etc/rc.d
+	@( \
+		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 \
+	)
+	@-find $(BUILD_DIR)/root -name CVS   | $(XARGS) rm -rf
+	@-find $(BUILD_DIR)/root -name .svn  | $(XARGS) rm -rf
+	@-find $(BUILD_DIR)/root -name '.#*' | $(XARGS) rm -f
+	@(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages)
+
+$(curdir)/flags-install:= -j1
+
+$(eval $(call stampfile,$(curdir),package,prereq))
+$(eval $(call stampfile,$(curdir),package,cleanup))
+$(eval $(call stampfile,$(curdir),package,compile))
+$(eval $(call stampfile,$(curdir),package,install))
+$(eval $(call stampfile,$(curdir),package,rootfs-prepare))
+
+$($(curdir)/stamp-cleanup): $(TMP_DIR)/.build
+$($(curdir)/stamp-compile): $($(curdir)/stamp-cleanup) $(TMP_DIR)/.build
+$($(curdir)/stamp-install): $($(curdir)/stamp-compile) $(TMP_DIR)/.build
+$($(curdir)/stamp-rootfs-prepare): $($(curdir)/stamp-install) $(TMP_DIR)/.build
+
+$(eval $(call subdir,$(curdir)))