summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-10-22 00:06:20 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-10-22 00:06:20 +0000
commitd0f611787c94090697587c02e1b5c2f3d45b0b0a (patch)
treea92ac9dac91681e2551a6aab8ad6fa24b9d91611 /package
parent6b4f28c3798f491b29518b802ef1fad87211930c (diff)
large build system cleanup. added some stuff to control the verbosity level, but not complete, yet.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2221 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/Config.in1
-rw-r--r--package/Makefile29
-rw-r--r--package/nvram/Config.in7
-rw-r--r--package/nvram/Makefile7
-rw-r--r--package/rules.mk2
5 files changed, 26 insertions, 20 deletions
diff --git a/package/Config.in b/package/Config.in
index b5a8e49eb..75955fbad 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -9,6 +9,7 @@ source "package/dnsmasq/Config.in"
source "package/ipkg/Config.in"
source "package/iptables/Config.in"
source "package/mtd/Config.in"
+source "package/nvram/Config.in"
comment "Applications"
source "package/deco/Config.in"
diff --git a/package/Makefile b/package/Makefile
index 55fb1e107..91307cd6c 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -2,7 +2,6 @@
include $(TOPDIR)/rules.mk
package-:=tcp_wrappers
-package-y:=nvram
package-$(BR2_PACKAGE_6TUNNEL) += 6tunnel
package-$(BR2_PACKAGE_AICCU) += aiccu
package-$(BR2_PACKAGE_AIRCRACK) += aircrack
@@ -125,6 +124,7 @@ package-$(BR2_PACKAGE_NFS_SERVER) += nfs-server
package-$(BR2_PACKAGE_NMAP) += nmap
package-$(BR2_PACKAGE_NOCATSPLASH) += nocatsplash
package-$(BR2_PACKAGE_NTPCLIENT) += ntpclient
+package-$(BR2_PACKAGE_NVRAM) += nvram
package-$(BR2_PACKAGE_OLSRD) += olsrd
package-$(BR2_PACKAGE_OPENCDK) += opencdk
package-$(BR2_PACKAGE_OPENLDAP) += openldap
@@ -206,7 +206,7 @@ package-$(BR2_PACKAGE_XINETD) += xinetd
package-$(BR2_PACKAGE_XSUPPLICANT) += xsupplicant
package-$(BR2_PACKAGE_ZLIB) += zlib
-DEV_LIBS:=tcp_wrappers glib ncurses openssl pcre popt zlib libnet libpcap mysql postgresql iptables matrixssl lzo gmp fuse portmap libelf uclibc++ speex libpng libgd wireless-tools nvram linux-atm
+DEV_LIBS:=tcp_wrappers glib ncurses openssl pcre popt zlib libnet libpcap mysql postgresql iptables matrixssl lzo gmp fuse portmap libelf uclibc++ speex libpng libgd wireless-tools nvram linux-atm libamsel libao libart libdaemon libdb libdnet libevent libffi-sable libgcrypt libgdbm libgpg-error libid3tag libmad libnet libnids libogg libosip2 libpcap libtasn1 libupnp libusb libvorbis libvorbisidec libxml2 libxslt
DEV_LIBS_COMPILE:=$(patsubst %,%-compile,$(DEV_LIBS))
SDK_DEFAULT_PACKAGES:=busybox dnsmasq iptables wireless-tools dropbear bridge ipkg ppp
SDK_DEFAULT_COMPILE:=$(patsubst %,%-compile,$(SDK_DEFAULT_PACKAGES))
@@ -437,27 +437,34 @@ sdk-compile: $(DEV_LIBS_COMPILE) $(SDK_DEFAULT_COMPILE)
$(STAMP_DIR):
mkdir -p $@
-%-prepare: $(STAMP_DIR)
- @[ -f $(STAMP_DIR)/.$@ ] || $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
+$(TARGET_DIR):
+ mkdir -p $(TARGET_DIR)
+
+%-prepare: $(STAMP_DIR) $(TARGET_DIR)
+ @[ -f $(STAMP_DIR)/.$@ ] || { \
+ $(TRACE) package/$(patsubst %-prepare,%,$@)/prepare; \
+ $(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \
+ }
@touch $(STAMP_DIR)/.$@
%-compile: %-prepare
- @[ -f $(STAMP_DIR)/.$@ ] || $(MAKE) -C $(patsubst %-compile,%,$@) compile
+ @[ -f $(STAMP_DIR)/.$@ ] || { \
+ $(TRACE) package/$(patsubst %-compile,%,$@)/compile; \
+ $(MAKE) -C $(patsubst %-compile,%,$@) compile; \
+ }
@touch $(STAMP_DIR)/.$@
%-install: %-compile
- @$(MAKE) -C $(patsubst %-install,%,$@) \
- TARGET_DIR="$(TARGET_DIR)" \
- IPKG_CONF="$(IPKG_CONF)" \
- BOARD="$(BOARD)" \
- KERNEL="$(KERNEL)" \
- install
+ @$(TRACE) package/$(patsubst %-install,%,$@)/install
+ @$(MAKE) -C $(patsubst %-install,%,$@) install
%-rebuild:
+ @$(TRACE) package/$(patsubst %-rebuild,%,$@)/rebuild
@rm -f $(STAMP_DIR)/.$(patsubst %-rebuild,%,$@)-*
$(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
%-clean:
+ @$(TRACE) package/$(patsubst %-clean,%,$@)/clean
@$(MAKE) -C $(patsubst %-clean,%,$@) clean
@rm -f $(STAMP_DIR)/.$(patsubst %-clean,%,$@)-*
diff --git a/package/nvram/Config.in b/package/nvram/Config.in
new file mode 100644
index 000000000..968a23fdb
--- /dev/null
+++ b/package/nvram/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_NVRAM
+ tristate "nvram - broadcom config utility"
+ default y
+ depends BR2_LINUX_2_4_BRCM
+ help
+ control utility for broadcom's 'nvram' config area
+
diff --git a/package/nvram/Makefile b/package/nvram/Makefile
index b1b87fd15..eea5a3aa0 100644
--- a/package/nvram/Makefile
+++ b/package/nvram/Makefile
@@ -9,13 +9,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
include $(TOPDIR)/package/rules.mk
-# does not depend on menuconfig
-ifneq ($(BOARD)-$(KERNEL),brcm-2.4)
-BR2_PACKAGE_NVRAM:=m
-else
-BR2_PACKAGE_NVRAM:=y
-endif
-
$(eval $(call PKG_template,NVRAM,nvram,$(PKG_RELEASE),$(ARCH)))
$(PKG_BUILD_DIR)/.prepared:
diff --git a/package/rules.mk b/package/rules.mk
index f7b81c62a..67fad9ae3 100644
--- a/package/rules.mk
+++ b/package/rules.mk
@@ -1,6 +1,4 @@
# invoke ipkg with configuration in $(STAGING_DIR)/etc/ipkg.conf
-IPKG := IPKG_INSTROOT=$(TARGET_DIR) IPKG_CONF_DIR=$(IPKG_CONF) $(SCRIPT_DIR)/ipkg -force-defaults -force-depends
-IPKG_STATE_DIR := $(TARGET_DIR)/usr/lib/ipkg
define PKG_template
IPKG_$(1):=$(PACKAGE_DIR)/$(2)_$(3)_$(4).ipk