security update

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index 872489f..63cd737 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -2,141 +2,308 @@
 include $(TOPDIR)/rules.mk
 
 package-:=tcp_wrappers
 include $(TOPDIR)/rules.mk
 
 package-:=tcp_wrappers

-package-y:=openwrt
+package-y:=nvram

 package-$(BR2_PACKAGE_AICCU) += aiccu
 package-$(BR2_PACKAGE_AICCU) += aiccu

+package-$(BR2_PACKAGE_AMWALL) += amwall

 package-$(BR2_PACKAGE_ARPTABLES) += arptables
 package-$(BR2_PACKAGE_ARPWATCH) += arpwatch
 package-$(BR2_PACKAGE_ASTERISK) += asterisk
 package-$(BR2_PACKAGE_ARPTABLES) += arptables
 package-$(BR2_PACKAGE_ARPWATCH) += arpwatch
 package-$(BR2_PACKAGE_ASTERISK) += asterisk

+package-$(BR2_PACKAGE_ATFP) += atftp
+package-$(BR2_PACKAGE_BIND) += bind
+package-$(BR2_PACKAGE_BLUEZ_LIBS) += bluez-libs
+package-$(BR2_PACKAGE_BLUEZ_UTILS) += bluez-utils

 package-$(BR2_PACKAGE_BRIDGE) += bridge
 package-$(BR2_PACKAGE_BUSYBOX) += busybox
 package-$(BR2_PACKAGE_BWM) += bwm
 package-$(BR2_PACKAGE_BRIDGE) += bridge
 package-$(BR2_PACKAGE_BUSYBOX) += busybox
 package-$(BR2_PACKAGE_BWM) += bwm

+package-$(BR2_PACKAGE_CGILIB) += cgilib

 package-$(BR2_PACKAGE_CHILLISPOT) += chillispot
 package-$(BR2_PACKAGE_CIFSMOUNT) += cifsmount
 package-$(BR2_PACKAGE_CUPS) += cups
 package-$(BR2_PACKAGE_CHILLISPOT) += chillispot
 package-$(BR2_PACKAGE_CIFSMOUNT) += cifsmount
 package-$(BR2_PACKAGE_CUPS) += cups

-package-$(BR2_PACKAGE_DROPBEAR) += dropbear
+package-$(BR2_PACKAGE_CYRUS_SASL) += cyrus-sasl
+package-$(BR2_PACKAGE_DHCP) += dhcp
+package-$(BR2_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder

 package-$(BR2_PACKAGE_DNSMASQ) += dnsmasq
 package-$(BR2_PACKAGE_DNSMASQ) += dnsmasq

+package-$(BR2_PACKAGE_DOSFSTOOLS) += dosfstools
+package-$(BR2_PACKAGE_DROPBEAR) += dropbear
+package-$(BR2_PACKAGE_DSNIFF) += dsniff
+package-$(BR2_PACKAGE_E2FSPROGS) += e2fsprogs

 package-$(BR2_PACKAGE_EBTABLES) += ebtables
 package-$(BR2_PACKAGE_EBTABLES) += ebtables

+package-$(BR2_PACKAGE_ETHER_WAKE) += ether-wake
+package-$(BR2_COMPILE_EXPAT) += expat

 package-$(BR2_PACKAGE_EZIPUPDATE) += ez-ipupdate
 package-$(BR2_PACKAGE_FPING) += fping
 package-$(BR2_PACKAGE_FPROBE) += fprobe
 package-$(BR2_PACKAGE_EZIPUPDATE) += ez-ipupdate
 package-$(BR2_PACKAGE_FPING) += fping
 package-$(BR2_PACKAGE_FPROBE) += fprobe

+package-$(BR2_PACKAGE_FPROBE_ULOG) += fprobe-ulog
+package-$(BR2_PACKAGE_FREERADIUS) += freeradius
+package-$(BR2_PACKAGE_FREETYPE) += freetype
+package-$(BR2_PACKAGE_FRICKIN) += frickin

 package-$(BR2_PACKAGE_FUSE) += fuse
 package-$(BR2_PACKAGE_FUSE) += fuse

-package-$(BR2_PACKAGE_GLIB1) += glib
+package-$(BR2_PACKAGE_GDBSERVER) += gdbserver
+package-$(BR2_PACKAGE_GLIB) += glib
+package-$(BR2_PACKAGE_GMP) += gmp
+package-$(BR2_PACKAGE_GNUTLS) += gnutls

 package-$(BR2_PACKAGE_HASERL) += haserl
 package-$(BR2_PACKAGE_HASERL) += haserl

+package-$(BR2_PACKAGE_HOSTAPD) += hostapd
+package-$(BR2_PACKAGE_HOWL) += howl
+package-$(BR2_PACKAGE_HTPDATE) += htpdate

 package-$(BR2_PACKAGE_IPKG) += ipkg
 package-$(BR2_PACKAGE_IPKG) += ipkg

-package-$(BR2_PACKAGE_IPTABLES) += iptables

 package-$(BR2_PACKAGE_IPROUTE2) += iproute2
 package-$(BR2_PACKAGE_IPROUTE2) += iproute2

+package-$(BR2_PACKAGE_IPTABLES) += iptables
+package-$(BR2_PACKAGE_IRSSI) += irssi

 package-$(BR2_PACKAGE_KISMET) += kismet
 package-$(BR2_PACKAGE_L2TPD) += l2tpd
 package-$(BR2_PACKAGE_LCD4LINUX) += lcd4linux
 package-$(BR2_PACKAGE_KISMET) += kismet
 package-$(BR2_PACKAGE_L2TPD) += l2tpd
 package-$(BR2_PACKAGE_LCD4LINUX) += lcd4linux

+package-$(BR2_PACKAGE_LESS) += less
+package-$(BR2_PACKAGE_LIBAMSEL) += libamsel
+package-$(BR2_PACKAGE_LIBART) += libart
+package-$(BR2_PACKAGE_LIBDB) += libdb

 package-$(BR2_PACKAGE_LIBELF) += libelf
 package-$(BR2_PACKAGE_LIBELF) += libelf

-package-$(BR2_PACKAGE_LIBGMP) += gmp
-package-$(BR2_PACKAGE_LIBLZO) += lzo
+package-$(BR2_PACKAGE_LIBEVENT) += libevent
+package-$(BR2_PACKAGE_LIBFFI_SABLE) += libffi-sable
+package-$(BR2_PACKAGE_LIBGCRYPT) += libgcrypt
+package-$(BR2_PACKAGE_LIBGD) += libgd
+package-$(BR2_PACKAGE_LIBGDBM) += libgdbm
+package-$(BR2_PACKAGE_LIBGPG_ERROR) += libgpg-error
+package-$(BR2_PACKAGE_LIBNET) += libnet
+package-$(BR2_PACKAGE_LIBNIDS) += libnids
+package-$(BR2_PACKAGE_LIBOSIP2) += libosip2
+package-$(BR2_PACKAGE_LIBPCAP) += libpcap
+package-$(BR2_PACKAGE_LIBPNG) += libpng

 package-$(BR2_PACKAGE_LIBPTHREAD) += libpthread
 package-$(BR2_PACKAGE_LIBPTHREAD) += libpthread

+package-$(BR2_PACKAGE_LIBTASN1) += libtasn1
+package-$(BR2_PACKAGE_LIBTOOL) += libtool

 package-$(BR2_PACKAGE_LIBUSB) += libusb
 package-$(BR2_PACKAGE_LIBUSB) += libusb

-package-$(BR2_PACKAGE_MATRIXSSL) += matrixssl
+package-$(BR2_PACKAGE_LIBXML2) += libxml2
+package-$(BR2_PACKAGE_LIGHTTPD) += lighttpd
+package-$(BR2_PACKAGE_LINUX_ATM) += linux-atm
+package-$(BR2_PACKAGE_LUA) += lua
+package-$(BR2_PACKAGE_LZO) += lzo

 package-$(BR2_PACKAGE_MARADNS) += maradns
 package-$(BR2_PACKAGE_MARADNS) += maradns

+package-$(BR2_PACKAGE_MATRIXSSL) += matrixssl
+package-$(BR2_PACKAGE_MICROCOM) += microcom

 package-$(BR2_PACKAGE_MICROPERL) += microperl
 package-$(BR2_PACKAGE_MICROPERL) += microperl

+package-$(BR2_PACKAGE_MINI_HTTPD) += mini_httpd
+package-$(BR2_PACKAGE_MINI_SENDMAIL) += mini_sendmail

 package-$(BR2_PACKAGE_MONIT) += monit
 package-$(BR2_PACKAGE_MONIT) += monit

+package-$(BR2_PACKAGE_MTD) += mtd
+package-$(BR2_PACKAGE_MYSQL) += mysql

 package-$(BR2_PACKAGE_NCURSES) += ncurses
 package-$(BR2_PACKAGE_NCURSES) += ncurses

-package-$(BR2_PACKAGE_NFSD) += nfs-server
+package-$(BR2_PACKAGE_NDISC) += ndisc
+package-$(BR2_PACKAGE_NET_SNMP) += net-snmp
+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_OLSRD) += olsrd
 package-$(BR2_PACKAGE_NMAP) += nmap
 package-$(BR2_PACKAGE_NOCATSPLASH) += nocatsplash
 package-$(BR2_PACKAGE_NTPCLIENT) += ntpclient
 package-$(BR2_PACKAGE_OLSRD) += olsrd

+package-$(BR2_PACKAGE_OPENCDK) += opencdk

 package-$(BR2_PACKAGE_OPENLDAP) += openldap
 package-$(BR2_PACKAGE_OPENLDAP) += openldap

+package-$(BR2_PACKAGE_OPENNTPD) += openntpd
+package-$(BR2_PACKAGE_OPENSSH) += openssh

 package-$(BR2_PACKAGE_OPENSSL) += openssl
 package-$(BR2_PACKAGE_OPENSWAN) += openswan
 package-$(BR2_PACKAGE_OPENSSL) += openssl
 package-$(BR2_PACKAGE_OPENSWAN) += openswan

-package-$(BR2_PACKAGE_OPENNTPD) += openntpd

 package-$(BR2_PACKAGE_OPENVPN) += openvpn
 package-$(BR2_PACKAGE_OPENVPN) += openvpn

+package-$(BR2_PACKAGE_OSIRIS) += osiris
+package-$(BR2_PACKAGE_PARPROUTED) += parprouted

 package-$(BR2_PACKAGE_PCRE) += pcre
 package-$(BR2_PACKAGE_PCRE) += pcre

+package-$(BR2_COMPILE_PHP4) += php4
+package-$(BR2_COMPILE_PHP5) += php5
+package-$(BR2_PACKAGE_PICOCOM) += picocom
+package-$(BR2_PACKAGE_PMACCT) += pmacct

 package-$(BR2_PACKAGE_POPT) += popt
 package-$(BR2_PACKAGE_PORTMAP) += portmap
 package-$(BR2_PACKAGE_POPT) += popt
 package-$(BR2_PACKAGE_PORTMAP) += portmap

+package-$(BR2_PACKAGE_PORTSENTRY) += portsentry
+package-$(BR2_PACKAGE_POSTGRESQL) += postgresql

 package-$(BR2_PACKAGE_PPP) += ppp
 package-$(BR2_PACKAGE_PPTP) += pptp
 package-$(BR2_PACKAGE_PPTPD) += pptpd
 package-$(BR2_PACKAGE_QUAGGA) += quagga
 package-$(BR2_PACKAGE_RADVD) += radvd
 package-$(BR2_PACKAGE_PPP) += ppp
 package-$(BR2_PACKAGE_PPTP) += pptp
 package-$(BR2_PACKAGE_PPTPD) += pptpd
 package-$(BR2_PACKAGE_QUAGGA) += quagga
 package-$(BR2_PACKAGE_RADVD) += radvd

+package-$(BR2_PACKAGE_READLINE) += readline

 package-$(BR2_PACKAGE_ROBOCFG) += robocfg
 package-$(BR2_PACKAGE_ROBOCFG) += robocfg

+package-$(BR2_PACKAGE_RP_PPPOE) += rp-pppoe
+package-$(BR2_PACKAGE_RRDCOLLECT) += rrdcollect
+package-$(BR2_COMPILE_RRDTOOL) += rrdtool
+package-$(BR2_PACKAGE_RSYNC) += rsync
+package-$(BR2_PACKAGE_SABLEVM) += sablevm
+package-$(BR2_PACKAGE_SABLEVM_CLASSPATH) += sablevm-classpath

 package-$(BR2_PACKAGE_SCREEN) += screen
 package-$(BR2_PACKAGE_SDK) += sdk
 package-$(BR2_PACKAGE_SER) += ser
 package-$(BR2_PACKAGE_SETSERIAL) += setserial
 package-$(BR2_PACKAGE_SHAT) += shat
 package-$(BR2_PACKAGE_SHFS) += shfs
 package-$(BR2_PACKAGE_SCREEN) += screen
 package-$(BR2_PACKAGE_SDK) += sdk
 package-$(BR2_PACKAGE_SER) += ser
 package-$(BR2_PACKAGE_SETSERIAL) += setserial
 package-$(BR2_PACKAGE_SHAT) += shat
 package-$(BR2_PACKAGE_SHFS) += shfs

+package-$(BR2_PACKAGE_SIPROXD) += siproxd
+package-$(BR2_PACKAGE_SIPSAK) += sipsak

 package-$(BR2_PACKAGE_SNORT) += snort
 package-$(BR2_PACKAGE_SPEEX) += speex
 package-$(BR2_PACKAGE_SNORT) += snort
 package-$(BR2_PACKAGE_SPEEX) += speex

+package-$(BR2_PACKAGE_SQLITE) += sqlite
+package-$(BR2_PACKAGE_SQLITE2) += sqlite2
+package-$(BR2_PACKAGE_SSMTP) += ssmtp

 package-$(BR2_PACKAGE_STRACE) += strace
 package-$(BR2_PACKAGE_TCPDUMP) += tcpdump
 package-$(BR2_PACKAGE_TINC) += tinc
 package-$(BR2_PACKAGE_STRACE) += strace
 package-$(BR2_PACKAGE_TCPDUMP) += tcpdump
 package-$(BR2_PACKAGE_TINC) += tinc

+package-$(BR2_PACKAGE_TOR) += tor

 package-$(BR2_PACKAGE_TTCP) += ttcp
 package-$(BR2_PACKAGE_UCLIBCXX) += uclibc++
 package-$(BR2_PACKAGE_TTCP) += ttcp
 package-$(BR2_PACKAGE_UCLIBCXX) += uclibc++

+package-$(BR2_PACKAGE_ULOGD) += ulogd

 package-$(BR2_PACKAGE_USBUTILS) += usbutils
 package-$(BR2_PACKAGE_USBUTILS) += usbutils

+package-$(BR2_PACKAGE_VTUN) += vtun
+package-$(BR2_PACKAGE_VSFTPD) += vsftpd
+package-$(BR2_PACKAGE_WIFICONF) += wificonf

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

+package-$(BR2_PACKAGE_WPA_SUPPLICANT) += wpa_supplicant
+package-$(BR2_PACKAGE_WPUT) += wput
+package-$(BR2_PACKAGE_XINETD) += xinetd

 package-$(BR2_PACKAGE_ZLIB) += zlib
 package-$(BR2_PACKAGE_ZLIB) += zlib

-package-$(BR2_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder
-package-$(BR2_PACKAGE_LIBGD) += libgd
-package-$(BR2_PACKAGE_LIBNET) += libnet
-package-$(BR2_PACKAGE_LIBMYSQLCLIENT) += mysql
-package-$(BR2_PACKAGE_LIBPCAP) += libpcap
-package-$(BR2_PACKAGE_LIBPNG) += libpng
-package-$(BR2_PACKAGE_LIBPQ) += postgresql
-package-$(BR2_PACKAGE_LIBSASL2) += cyrus-sasl
-package-$(BR2_PACKAGE_LIBLTDL) += libtool
-package-$(BR2_PACKAGE_LIBOSIP2) += libosip2
-package-$(BR2_PACKAGE_SIPROXD) += siproxd
-package-$(BR2_PACKAGE_SIPSAK) += sipsak
-package-$(BR2_PACKAGE_HTPDATE) += htpdate
-package-$(BR2_PACKAGE_HOWL) += howl
-package-$(BR2_PACKAGE_OSIRISD) += osiris

 
 

-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
+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

 DEV_LIBS_COMPILE:=$(patsubst %,%-compile,$(DEV_LIBS))
 DEV_LIBS_COMPILE:=$(patsubst %,%-compile,$(DEV_LIBS))

-SDK_DEFAULT_PACKAGES:=busybox dnsmasq iptables wireless-tools dropbear bridge ipkg
+SDK_DEFAULT_PACKAGES:=busybox dnsmasq iptables wireless-tools dropbear bridge ipkg ppp

 SDK_DEFAULT_COMPILE:=$(patsubst %,%-compile,$(SDK_DEFAULT_PACKAGES))
 SDK_DEFAULT_COMPILE:=$(patsubst %,%-compile,$(SDK_DEFAULT_PACKAGES))

+COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m))
+INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))

 
 

-all: compile install
-clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m)) linux-clean
-compile: $(patsubst %,%-compile,$(package-y) $(package-m))
-install: $(patsubst %,%-install,$(package-y))
+all: compile
+clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
+compile: $(COMPILE_PACKAGES)
+install: base-files-install $(INSTALL_PACKAGES)

 
 

-ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y)
-openvpn-compile: lzo-compile
-endif
-asterisk-compile: openssl-compile
-ifneq ($(BR2_PACKAGE_ASTERISK_SPEEX),)
-asterisk-compile: speex-compile
-endif
-ifneq ($(BR2_PACKAGE_ASTERISK_PGSQL),)
-asterisk-compile: postgresql-compile
-endif
-ifneq ($(BR2_PACKAGE_ASTERISK_MYSQL),)
-asterisk-compile: mysql-compile
-endif
-libgd-compile: libpng-compile
-screen-compile: ncurses-compile
-openswan-compile: gmp-compile
-nocatsplash-compile: glib-compile
+$(COMPILE_PACKAGES): base-files-compile
+$(INSTALL_PACKAGES): base-files-install
+
+amwall-compile: libamsel-compile

 arpwatch-compile: libpcap-compile
 arpwatch-compile: libpcap-compile

-tcpdump-compile: libpcap-compile
+bind-compile: openssl-compile
+cyrus-sasl-compile: openssl-compile

 dropbear-compile: zlib-compile
 dropbear-compile: zlib-compile

-openssl-compile: zlib-compile
-openvpn-compile: openssl-compile
-nfs-server-compile: portmap-compile
-portmap-compile: tcp_wrappers-compile
+dsniff-compile: libnids-compile openssl-compile libgdbm-compile
+freetype-compile: zlib-compile
+fprobe-compile: libpcap-compile
+gdbserver-compile: ncurses-compile
+gnutls-compile: libgcrypt-compile opencdk-compile libtasn1-compile
+irssi-compile: glib-compile ncurses-compile
+hostapd-compile: openssl-compile
+kismet-compile: uclibc++-compile libpcap-compile ncurses-compile
+less-compile: ncurses-compile

 lcd4linux-compile: ncurses-compile
 lcd4linux-compile: ncurses-compile

+libgcrypt-compile: libgpg-error-compile
+libgd-compile: libpng-compile

 libnet-compile: libpcap-compile
 libnet-compile: libpcap-compile

+libnids-compile: libnet-compile
+libxml2-compile: zlib-compile
+lighttpd-compile: openssl-compile pcre-compile
+mini_httpd-compile: matrixssl-compile

 mysql-compile: ncurses-compile zlib-compile
 mysql-compile: ncurses-compile zlib-compile

-postgresql-compile: zlib-compile
+net-snmp-compile: libelf-compile
+nfs-server-compile: portmap-compile

 nmap-compile: uclibc++-compile pcre-compile libpcap-compile
 nmap-compile: uclibc++-compile pcre-compile libpcap-compile

-kismet-compile: uclibc++-compile libpcap-compile
-tinc-compile: zlib-compile openssl-compile lzo-compile
-fprobe-compile: libpcap-compile
-cyrus-sasl-compile: openssl-compile
+nocatsplash-compile: glib-compile
+opencdk-compile: libgcrypt-compile

 openldap-compile: cyrus-sasl-compile openssl-compile
 openldap-compile: cyrus-sasl-compile openssl-compile

+openssh-compile: zlib-compile openssl-compile
+openssl-compile: zlib-compile
+openswan-compile: gmp-compile
+osiris-compile: openssl-compile
+portmap-compile: tcp_wrappers-compile
+postgresql-compile: zlib-compile
+quagga-compile: readline-compile ncurses-compile
+rrdcollect-compile: rrdtool-compile
+rrdtool-compile: cgilib-compile freetype-compile libart-compile libpng-compile
+rsync-compile: popt-compile
+screen-compile: ncurses-compile

 siproxd-compile: libosip2-compile
 sipsak-compile: openssl-compile
 siproxd-compile: libosip2-compile
 sipsak-compile: openssl-compile

-osiris-compile: openssl-compile
+sqlite-compile: ncurses-compile readline-compile
+sqlite2-compile: ncurses-compile readline-compile
+tcpdump-compile: libpcap-compile
+tinc-compile: zlib-compile openssl-compile lzo-compile
+tor-compile: libevent-compile openssl-compile zlib-compile
+usbutils-compile: libusb-compile
+vtun-compile: zlib-compile openssl-compile lzo-compile
+wificonf-compile: wireless-tools-compile nvram-compile
+wpa_supplicant-compile: openssl-compile
+
+asterisk-compile: ncurses-compile openssl-compile
+ifneq ($(BR2_PACKAGE_ASTERISK_CODEC_SPEEX),)
+asterisk-compile: speex-compile
+endif
+ifneq ($(BR2_PACKAGE_ASTERISK_PGSQL),)
+asterisk-compile: postgresql-compile
+endif
+ifneq ($(BR2_PACKAGE_ASTERISK_MYSQL),)
+asterisk-compile: mysql-compile
+endif
+
+freeradius-compile: libtool-compile openssl-compile
+ifneq ($(BR2_PACKAGE_FREERADIUS_MOD_LDAP),)
+freeradius-compile: openldap-compile
+endif
+ifneq ($(BR2_PACKAGE_FREERADIUS_MOD_SQL_MYSQL),)
+freeradius-compile: mysql-compile
+endif
+ifneq ($(BR2_PACKAGE_FREERADIUS_MOD_SQL_PGSQL),)
+freeradius-compile: postgresql-compile
+endif
+
+openvpn-compile: openssl-compile
+ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y)
+openvpn-compile: lzo-compile
+endif
+
+php4-compile: openssl-compile zlib-compile
+ifneq ($(BR2_PACKAGE_PHP4_MOD_GD),)
+php4-compile: libgd-compile libpng-compile
+endif
+ifneq ($(BR2_PACKAGE_PHP4_MOD_LDAP),)
+php4-compile: openldap-compile
+endif
+ifneq ($(BR2_PACKAGE_PHP4_MOD_MYSQL),)
+php4-compile: mysql-compile
+endif
+ifneq ($(BR2_PACKAGE_PHP4_MOD_PCRE),)
+php4-compile: pcre-compile
+endif
+ifneq ($(BR2_PACKAGE_PHP4_MOD_PGSQL),)
+php4-compile: postgresql-compile
+endif
+ifneq ($(BR2_PACKAGE_PHP4_MOD_SQLITE),)
+php4-compile: sqlite2-compile
+endif
+ifneq ($(BR2_PACKAGE_PHP4_MOD_XML),)
+php4-compile: expat-compile
+endif
+
+php5-compile: openssl-compile zlib-compile
+ifneq ($(BR2_PACKAGE_PHP5_MOD_GD),)
+php5-compile: libgd-compile libpng-compile
+endif
+ifneq ($(BR2_PACKAGE_PHP5_MOD_LDAP),)
+php5-compile: openldap-compile
+endif
+ifneq ($(BR2_PACKAGE_PHP5_MOD_MYSQL),)
+php5-compile: mysql-compile
+endif
+ifneq ($(BR2_PACKAGE_PHP5_MOD_PCRE),)
+php5-compile: pcre-compile
+endif
+ifneq ($(BR2_PACKAGE_PHP5_MOD_PGSQL),)
+php5-compile: postgresql-compile
+endif
+ifneq ($(BR2_PACKAGE_PHP5_MOD_SQLITE),)
+php5-compile: sqlite2-compile
+endif
+ifneq ($(BR2_PACKAGE_PHP5_MOD_XML),)
+php5-compile: expat-compile
+endif
+
+pmacct-compile: libpcap-compile
+ifneq ($(BR2_PACKAGE_PMACCT_MYSQL),)
+pmacct-compile: mysql-compile
+endif
+ifneq ($(BR2_PACKAGE_PMACCT_PGSQL),)
+pmacct-compile: postgresql-compile
+endif

 
 snort-compile: libnet-compile libpcap-compile pcre-compile
 ifeq ($(BR2_PACKAGE_SNORT_MYSQL),y)
 
 snort-compile: libnet-compile libpcap-compile pcre-compile
 ifeq ($(BR2_PACKAGE_SNORT_MYSQL),y)


@@ -145,11 +312,24 @@ endif
 ifeq ($(BR2_PACKAGE_SNORT_PGSQL),y)
 snort-compile: postgresql-compile
 endif
 ifeq ($(BR2_PACKAGE_SNORT_PGSQL),y)
 snort-compile: postgresql-compile
 endif

+ifeq ($(BR2_PACKAGE_SNORT_ENABLE_INLINE),y)
+snort-compile: iptables-compile
+endif

 
 

-sdk-compile: $(DEV_LIBS_COMPILE) $(SDK_DEFAULT_COMPILE) openwrt-install
-$(patsubst %,%-prepare,$(package-y) $(package-m) $(package-)): linux-install
+ulogd-compile: iptables-compile
+ifneq ($(BR2_PACKAGE_ULOGD_MYSQL),)
+ulogd-compile: mysql-compile
+endif
+ifneq ($(BR2_PACKAGE_ULOGD_PGSQL),)
+ulogd-compile: postgresql-compile
+endif
+
+sdk-compile: $(DEV_LIBS_COMPILE) $(SDK_DEFAULT_COMPILE)

 
 

-%-prepare:
+$(STAMP_DIR):
+       mkdir -p $@
+
+%-prepare: $(STAMP_DIR)

        @[ -f $(STAMP_DIR)/.$@ ] || $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
        @touch $(STAMP_DIR)/.$@
 
        @[ -f $(STAMP_DIR)/.$@ ] || $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
        @touch $(STAMP_DIR)/.$@
 


@@ -158,8 +338,15 @@ $(patsubst %,%-prepare,$(package-y) $(package-m) $(package-)): linux-install
        @touch $(STAMP_DIR)/.$@
 
 %-install: %-compile
        @touch $(STAMP_DIR)/.$@
 
 %-install: %-compile

-       @[ -f $(STAMP_DIR)/.$@ ] || $(MAKE) -C $(patsubst %-install,%,$@) install
-       @touch $(STAMP_DIR)/.$@
+       @$(MAKE) -C $(patsubst %-install,%,$@) \
+               TARGET_DIR="$(TARGET_DIR)" \
+               IPKG_CONF="$(IPKG_CONF)" \
+               BOARD="$(BOARD)" \
+               install
+
+%-rebuild: 
+       @rm -f $(STAMP_DIR)/.$(patsubst %-rebuild,%,$@)-*
+       $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild

 
 %-clean:
        @$(MAKE) -C $(patsubst %-clean,%,$@) clean
 
 %-clean:
        @$(MAKE) -C $(patsubst %-clean,%,$@) clean