fix ipcalc (off by 1)

[openwrt/staging/dedeckeh.git] / openwrt / package / Makefile

diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index d213200156f56eed4899babcc00034f2a6fc2876..b9392c049034b3384760427c5458cbb38d9c3fd1 100644 (file)
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -1,60 +1,68 @@
-# 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
+include $(TOPDIR)/.config
+include $(TOPDIR)/.pkgdeps
+
+PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(package-y) $(package-m))
+DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m))
 COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m))
 INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
 
+$(STAMP_DIR) $(TARGET_DIR):
+       mkdir -p $@
+
+%-prereq: $(STAMP_DIR) $(TARGET_DIR)
+       $(MAKE) -C $(patsubst %-prereq,%,$@) prereq
+
+%-download: $(STAMP_DIR) $(TARGET_DIR)
+       $(MAKE) -C $(patsubst %-download,%,$@) download
+
+%-prepare: $(STAMP_DIR) $(TARGET_DIR)
+       $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
+
+%-compile: $(STAMP_DIR) $(TARGET_DIR)
+       $(MAKE) -C $(patsubst %-compile,%,$@) compile
+
+%-install: $(STAMP_DIR) $(TARGET_DIR)
+       $(MAKE) -C $(patsubst %-install,%,$@) install
+
+%-clean: $(STAMP_DIR) $(TARGET_DIR)
+       $(MAKE) -C $(patsubst %-clean,%,$@) clean
+
+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))
-compile: $(COMPILE_PACKAGES)
-install: base-files-install $(INSTALL_PACKAGES)
-
-$(COMPILE_PACKAGES): base-files-compile
-$(INSTALL_PACKAGES): base-files-install
+prereq: $(PREREQ_PACKAGES)
+download: $(DOWNLOAD_PACKAGES)
+compile-targets: $(COMPILE_PACKAGES)
+compile:
+       $(MAKE) compile-targets
+install-targets: base-files-install $(INSTALL_PACKAGES)
+install:
+       rm -rf $(BUILD_DIR)/root
+       $(MAKE) install-targets
 
-$(STAMP_DIR):
-       mkdir -p $@
+index: $(PACKAGE_DIR)/Packages
 
-$(TARGET_DIR):
-       mkdir -p $(TARGET_DIR)
+$(PACKAGE_DIR)/Packages: $(PACKAGE_DIR)/*.ipk
+       (cd $(PACKAGE_DIR); $(STAGING_DIR)/usr/bin/ipkg-make-index . > Packages)
 
-%-prepare: $(STAMP_DIR) $(TARGET_DIR)
-       @[ -f $(STAMP_DIR)/.$@ ] || { \
-               $(START_TRACE) "package/$(patsubst %-prepare,%,$@)-prepare: "; \
-               $(MAKE) -C $(patsubst %-prepare,%,$@) prepare && { \
-                       touch $(STAMP_DIR)/.$@; \
-                       $(CMD_TRACE) " done"; \
-                       $(END_TRACE); \
-               } \
-       }
-
-%-compile:
-       @[ -f $(STAMP_DIR)/.$@ ] || { \
-               $(START_TRACE) "package/$(patsubst %-compile,%,$@)-compile: "; \
-               $(MAKE) -C $(patsubst %-compile,%,$@) compile && { \
-                       touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare; \
-                       touch $(STAMP_DIR)/.$@; \
-                       $(CMD_TRACE) " done"; \
-                       $(END_TRACE); \
-               } \
-       }
-
-%-install: %-compile
-       @$(START_TRACE) "package/$(patsubst %-install,%,$@)-install: "
-       @$(MAKE) -C $(patsubst %-install,%,$@) install
-       @$(CMD_TRACE) " done"
-       @$(END_TRACE)
-
-%-rebuild: 
-       @$(START_TRACE) "package/$(patsubst %-rebuild,%,$@)-rebuild: "
-       @rm -f $(STAMP_DIR)/.$(patsubst %-rebuild,%,$@)-*
-       $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
-       @$(CMD_TRACE) " done"
-       @$(END_TRACE)
-
-%-clean:
-       @$(START_TRACE) "package/$(patsubst %-clean,%,$@)-clean: "
-       @$(MAKE) -C $(patsubst %-clean,%,$@) clean
-       @rm -f $(STAMP_DIR)/.$(patsubst %-clean,%,$@)-*
-       @$(CMD_TRACE) " done"
-       @$(END_TRACE)
 
+ifeq ($(MAKECMDGOALS),compile-targets)
+MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL)
+else
+.NOTPARALLEL:
+endif