mac80211: fix depends

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index ff7075d..5734f98 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -1,82 +1,94 @@
-# 
-# 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.
 #
 #
 # 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
-
-%-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
+curdir:=package

 
 

+-include $(TMP_DIR)/.packagedeps
+$(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m))

 ifeq ($(SDK),1)
 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
 
 endif
 

-$(TMP_DIR)/.pkgdeps: $(TMP_DIR)/.pkginfo
-       @$(TOPDIR)/scripts/gen_deps.pl $(GENDEP_OPTS) < $< > $@ || rm -f $@
-
-all: compile
-clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
-prereq: $(PREREQ_PACKAGES)
-download: $(DOWNLOAD_PACKAGES)
-compile-targets: $(COMPILE_PACKAGES)
-compile:
-       $(MAKE) compile-targets
+$(curdir)/install:=$(curdir)/install-cleanup
+
+$(curdir)/cleanup: $(TMP_DIR)/.build
+       rm -rf $(TARGET_DIR) $(STAGING_DIR_ROOT)
+
+ifdef CONFIG_USE_MKLIBS
+  define mklibs
+       rm -rf $(TMP_DIR)/mklibs-progs $(TMP_DIR)/mklibs-out
+       # first find all programs and add them to the mklibs list
+       find $(STAGING_DIR_ROOT) -type f -perm +100 -exec \
+               file -r -N -F '' {} + | \
+               awk ' /executable.*dynamically/ { print $$1 }' > $(TMP_DIR)/mklibs-progs
+       # find all loadable objects that are not regular libraries and add them to the list as well
+       find $(STAGING_DIR_ROOT) -type f -name \*.so\* -exec \
+               file -r -N -F '' {} + | \
+               awk ' /shared object/ { print $$1 }' >> $(TMP_DIR)/mklibs-progs
+       mkdir -p $(TMP_DIR)/mklibs-out
+       $(STAGING_DIR_HOST)/bin/mklibs.py -D \
+               -d $(TMP_DIR)/mklibs-out \
+               --sysroot $(STAGING_DIR_ROOT) \
+               -L /lib \
+               -L /usr/lib \
+               --ldlib $(patsubst $(STAGING_DIR_ROOT)/%,/%,$(firstword $(wildcard \
+                       $(foreach name,ld-uClibc.so.* ld-linux.so.*, \
+                         $(STAGING_DIR_ROOT)/lib/$(name) \
+                       )))) \
+               --target $(REAL_GNU_TARGET_NAME) \
+               `cat $(TMP_DIR)/mklibs-progs` 2>&1
+       $(RSTRIP) $(TMP_DIR)/mklibs-out
+       for lib in `ls $(TMP_DIR)/mklibs-out/*.so.* 2>/dev/null`; do \
+               LIB="$${lib##*/}"; \
+               DEST="`ls "$(TARGET_DIR)/lib/$$LIB" "$(TARGET_DIR)/usr/lib/$$LIB" 2>/dev/null`"; \
+               [ -n "$$DEST" ] || continue; \
+               echo "Copying stripped library $$lib to $$DEST"; \
+               cp "$$lib" "$$DEST" || exit 1; \
+       done
+  endef
+endif

 
 

-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 \
        @if [ -d $(TOPDIR)/files ]; then \

-               $(CP) $(TOPDIR)/files/. $(BUILD_DIR)/root; \
+               $(CP) $(TOPDIR)/files/. $(TARGET_DIR); \

        fi
        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; \
                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/opkg)
+       $(call mklibs)
+
+$(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-targets)
-MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL)
-else
-.NOTPARALLEL:
-endif
+$(eval $(call subdir,$(curdir)))