X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/6db2db3a9c41ef447a6ac351f8408fa2cfb7ddad..2ce9219a0eaee1513fe615409b48903f31072379:/openwrt/package/Makefile?ds=sidebyside

diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index 4aa9b3a74..0a5f00fdf 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/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
@@ -50,6 +49,7 @@ package-$(BR2_PACKAGE_GLIB) += glib
 package-$(BR2_PACKAGE_GMEDIASERVER) += gmediaserver
 package-$(BR2_PACKAGE_GMP) += gmp
 package-$(BR2_COMPILE_GNUTLS) += gnutls
+package-$(BR2_PACKAGE_GPSD) += gpsd
 package-$(BR2_PACKAGE_HASERL) += haserl
 package-$(BR2_PACKAGE_HOSTAPD) += hostapd
 package-$(BR2_PACKAGE_HOWL) += howl
@@ -109,7 +109,8 @@ package-$(BR2_PACKAGE_MICROCOM) += microcom
 package-$(BR2_PACKAGE_MICROPERL) += microperl
 package-$(BR2_COMPILE_MINI_HTTPD) += mini_httpd
 package-$(BR2_PACKAGE_MINI_SENDMAIL) += mini_sendmail
-package-$(BR2_PACKAGE_MONIT) += monit
+package-$(BR2_COMPILE_MIREDO) += miredo
+package-$(BR2_COMPILE_MONIT) += monit
 package-$(BR2_PACKAGE_MPD) += mpd
 package-$(BR2_PACKAGE_MT_DAAPD) += mt-daapd
 package-$(BR2_PACKAGE_MTD) += mtd
@@ -118,12 +119,13 @@ package-$(BR2_PACKAGE_MYSQL) += mysql
 package-$(BR2_PACKAGE_NANO) += nano
 package-$(BR2_PACKAGE_NCURSES) += ncurses
 package-$(BR2_COMPILE_NDISC6) += ndisc
-package-$(BR2_PACKAGE_NET_SNMP) += net-snmp
+package-$(BR2_COMPILE_NET_SNMP) += net-snmp
 package-$(BR2_PACKAGE_NETSTAT_NAT) += netstat-nat
 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
@@ -202,9 +204,10 @@ package-$(BR2_PACKAGE_WPA_SUPPLICANT) += wpa_supplicant
 package-$(BR2_PACKAGE_WPUT) += wput
 package-$(BR2_PACKAGE_WRT_RADAUTH) += wrt-radauth
 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 id3lib
 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))
@@ -234,6 +237,7 @@ fprobe-compile: libpcap-compile
 gdbserver-compile: ncurses-compile
 gmediaserver-compile: id3lib-compile libupnp-compile
 gnutls-compile: libgcrypt-compile opencdk-compile libtasn1-compile
+gpsd-compile: uclibc++-compile
 icecast-compile: curl-compile libvorbisidec-compile libxml2-compile libxslt-compile
 id3lib-compile: uclibc++-compile zlib-compile
 irssi-compile: glib-compile ncurses-compile
@@ -250,6 +254,7 @@ libvorbis-compile: libogg-compile
 libxml2-compile: zlib-compile
 libxslt-compile: libxml2-compile
 lighttpd-compile: openssl-compile pcre-compile
+miredo-compile: uclibc++-compile
 mt-daapd-compile: howl-compile libgdbm-compile libid3tag-compile
 mtr-compile: ncurses-compile
 mysql-compile: ncurses-compile zlib-compile
@@ -293,6 +298,7 @@ usbutils-compile: libusb-compile
 vtun-compile: zlib-compile openssl-compile lzo-compile
 wificonf-compile: wireless-tools-compile nvram-compile
 wpa_supplicant-compile: openssl-compile
+xsupplicant-compile: openssl-compile
 
 asterisk-compile: bluez-libs-compile ncurses-compile openssl-compile
 ifneq ($(BR2_PACKAGE_ASTERISK_CODEC_SPEEX),)
@@ -433,27 +439,47 @@ sdk-compile: $(DEV_LIBS_COMPILE) $(SDK_DEFAULT_COMPILE)
 $(STAMP_DIR):
 	mkdir -p $@
 
-%-prepare: $(STAMP_DIR)
-	@[ -f $(STAMP_DIR)/.$@ ] || $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
-	@touch $(STAMP_DIR)/.$@
+$(TARGET_DIR):
+	mkdir -p $(TARGET_DIR)
 
-%-compile: %-prepare 
-	@[ -f $(STAMP_DIR)/.$@ ] || $(MAKE) -C $(patsubst %-compile,%,$@) compile
-	@touch $(STAMP_DIR)/.$@
+%-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
-	@$(MAKE) -C $(patsubst %-install,%,$@) \
-		TARGET_DIR="$(TARGET_DIR)" \
-		IPKG_CONF="$(IPKG_CONF)" \
-		BOARD="$(BOARD)" \
-		KERNEL="$(KERNEL)" \
-		install
+	@$(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)