X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/02059e7283fa828bb98a52754ec6d9019e858bf0..c291b847846f5921d669b17478cbf59f0c83ee19:/package/Makefile diff --git a/package/Makefile b/package/Makefile index 151942de3..2a3354cf0 100644 --- a/package/Makefile +++ b/package/Makefile @@ -1,67 +1,60 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2006-2008 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 $(TMP_DIR)/.pkgdeps -include $(INCLUDE_DIR)/host.mk - -PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-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 - -$(eval $(call default_subtargets,$(TARGET_DIR))) +curdir:=package +-include $(TMP_DIR)/.packagedeps +$(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m)) ifeq ($(SDK),1) -GENDEP_OPTS := -s + $(curdir)/builddirs-install:=. +else + $(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m)) + $(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m)) + $(curdir)/builddirs-install:=. $(sort $(package-y)) +endif +ifneq ($(IGNORE_ERRORS),) + $(curdir)/builddirs-ignore-compile:= $(if $(filter m y, $(IGNORE_ERRORS)),$(foreach m,$(IGNORE_ERRORS),$(package-$(m))),$(package-m)) endif -$(TMP_DIR)/.pkgdeps: $(TMP_DIR)/.pkginfo - @$(TOPDIR)/scripts/gen_deps.pl $(GENDEP_OPTS) < $< > $@ || rm -f $@ +$(curdir)/install:=$(curdir)/install-cleanup -all: compile -clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m)) -prereq: $(PREREQ_PACKAGES) -download: $(DOWNLOAD_PACKAGES) -compile: $(COMPILE_PACKAGES) +$(curdir)/cleanup: $(TMP_DIR)/.build + rm -rf $(TARGET_DIR) -install-targets: $(INSTALL_PACKAGES) -install: - rm -rf $(BUILD_DIR)/root - $(MAKE) install-targets +$(curdir)/rootfs-prepare: $(TMP_DIR)/.build + @-$(MAKE) package/preconfig @if [ -d $(TOPDIR)/files ]; then \ - $(CP) $(TOPDIR)/files/. $(BUILD_DIR)/root; \ + $(CP) $(TOPDIR)/files/. $(TARGET_DIR); \ fi + @mkdir -p $(TARGET_DIR)/etc/rc.d @( \ - cd $(BUILD_DIR)/root; \ + cd $(TARGET_DIR); \ 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; \ + IPKG_INSTROOT=$(TARGET_DIR) $(which bash) ./etc/rc.common $$script enable; \ + done || true \ + ) + @-find $(TARGET_DIR) -name CVS | $(XARGS) rm -rf + @-find $(TARGET_DIR) -name .svn | $(XARGS) rm -rf + @-find $(TARGET_DIR) -name '.#*' | $(XARGS) rm -f + $(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/ipkg) + +$(curdir)/index: FORCE + @(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \ + gzip -9c Packages > Packages.gz \ ) -index: $(PACKAGE_DIR)/Packages - -$(PACKAGE_DIR)/Packages: $(PACKAGE_DIR)/*.ipk - (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages) +$(curdir)/flags-install:= -j1 -symlinks: - ../scripts/feeds.sh $(CONFIG_SOURCE_FEEDS) +$(eval $(call stampfile,$(curdir),package,prereq,.config)) +$(eval $(call stampfile,$(curdir),package,cleanup,$(TMP_DIR)/.build)) +$(eval $(call stampfile,$(curdir),package,compile,$(TMP_DIR)/.build)) +$(eval $(call stampfile,$(curdir),package,install,$(TMP_DIR)/.build)) +$(eval $(call stampfile,$(curdir),package,rootfs-prepare,$(TMP_DIR)/.build)) -ifeq ($(MAKECMDGOALS),compile) -MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL) -else -.NOTPARALLEL: -endif +$(eval $(call subdir,$(curdir)))