Update to new upstream release (v0.71)

[openwrt.git] / openwrt / package / Makefile

diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index c3432bd..8d7dd75 100644 (file)
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -100,6 +100,7 @@ package-$(BR2_PACKAGE_TTCP) += ttcp
 package-$(BR2_PACKAGE_UCLIBCXX) += uclibc++
 package-$(BR2_PACKAGE_ULOGD) += ulogd
 package-$(BR2_PACKAGE_USBUTILS) += usbutils
 package-$(BR2_PACKAGE_UCLIBCXX) += uclibc++
 package-$(BR2_PACKAGE_ULOGD) += ulogd
 package-$(BR2_PACKAGE_USBUTILS) += usbutils

+package-$(BR2_PACKAGE_VTUN) += vtun

 package-$(BR2_PACKAGE_VSFTPD) += vsftpd
 package-$(BR2_PACKAGE_WIRELESS_TOOLS) += wireless-tools
 package-$(BR2_PACKAGE_WOL) += wol
 package-$(BR2_PACKAGE_VSFTPD) += vsftpd
 package-$(BR2_PACKAGE_WIRELESS_TOOLS) += wireless-tools
 package-$(BR2_PACKAGE_WOL) += wol


@@ -128,6 +129,7 @@ libgd-compile: libpng-compile
 libnet-compile: libpcap-compile
 lighttpd-compile: openssl-compile pcre-compile
 mysql-compile: ncurses-compile zlib-compile
 libnet-compile: libpcap-compile
 lighttpd-compile: openssl-compile pcre-compile
 mysql-compile: ncurses-compile zlib-compile

+net-snmp-compile: libelf-compile

 nfs-server-compile: portmap-compile
 nmap-compile: uclibc++-compile pcre-compile libpcap-compile
 nocatsplash-compile: glib-compile
 nfs-server-compile: portmap-compile
 nmap-compile: uclibc++-compile pcre-compile libpcap-compile
 nocatsplash-compile: glib-compile


@@ -142,11 +144,12 @@ siproxd-compile: libosip2-compile
 sipsak-compile: openssl-compile
 tcpdump-compile: libpcap-compile
 tinc-compile: zlib-compile openssl-compile lzo-compile
 sipsak-compile: openssl-compile
 tcpdump-compile: libpcap-compile
 tinc-compile: zlib-compile openssl-compile lzo-compile

+vtun-compile: zlib-compile openssl-compile lzo-compile

 tor-compile: libevent-compile openssl-compile zlib-compile
 wpa_supplicant-compile: openssl-compile
 
 asterisk-compile: openssl-compile
 tor-compile: libevent-compile openssl-compile zlib-compile
 wpa_supplicant-compile: openssl-compile
 
 asterisk-compile: openssl-compile

-ifneq ($(BR2_PACKAGE_ASTERISK_SPEEX),)
+ifneq ($(BR2_PACKAGE_ASTERISK_CODEC_SPEEX),)

 asterisk-compile: speex-compile
 endif
 ifneq ($(BR2_PACKAGE_ASTERISK_PGSQL),)
 asterisk-compile: speex-compile
 endif
 ifneq ($(BR2_PACKAGE_ASTERISK_PGSQL),)


@@ -213,6 +216,10 @@ sdk-compile: $(DEV_LIBS_COMPILE) $(SDK_DEFAULT_COMPILE) openwrt-install
        @[ -f $(STAMP_DIR)/.$@ ] || $(MAKE) -C $(patsubst %-install,%,$@) install
        @touch $(STAMP_DIR)/.$@
 
        @[ -f $(STAMP_DIR)/.$@ ] || $(MAKE) -C $(patsubst %-install,%,$@) install
        @touch $(STAMP_DIR)/.$@
 

+%-rebuild: 
+       @rm -f $(STAMP_DIR)/.$(patsubst %-rebuild,%,$@)-*
+       $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
+

 %-clean:
        @$(MAKE) -C $(patsubst %-clean,%,$@) clean
        @rm -f $(STAMP_DIR)/.$(patsubst %-clean,%,$@)-*
 %-clean:
        @$(MAKE) -C $(patsubst %-clean,%,$@) clean
        @rm -f $(STAMP_DIR)/.$(patsubst %-clean,%,$@)-*