X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ac9948c60f692881e1df417863ac8cee1f694ce7..2e44ce533da6b2fb1ae5c8471aaf21db86783ada:/openwrt/package/Makefile

diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index 9b54af292..64144c557 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -38,7 +38,7 @@ package-$(BR2_PACKAGE_MARADNS) += maradns
 package-$(BR2_PACKAGE_MICROPERL) += microperl
 package-$(BR2_PACKAGE_MONIT) += monit
 package-$(BR2_PACKAGE_NCURSES) += ncurses
-package-$(BR2_PACKAGE_NFSD) += nfs-server
+package-$(BR2_PACKAGE_NFS_SERVER) += nfs-server
 package-$(BR2_PACKAGE_NMAP) += nmap
 package-$(BR2_PACKAGE_NOCATSPLASH) += nocatsplash
 package-$(BR2_PACKAGE_NTPCLIENT) += ntpclient
@@ -98,7 +98,7 @@ package-$(BR2_PACKAGE_XINETD) += xinetd
 
 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_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))
 
 all: compile install
@@ -144,9 +144,16 @@ siproxd-compile: libosip2-compile
 sipsak-compile: openssl-compile
 lighttpd-compile: openssl-compile pcre-compile
 osiris-compile: openssl-compile
-pmacct-compile: libpcap-compile
 freeradius-compile: libtool-compile mysql-compile openldap-compile openssl-compile postgresql-compile
 
+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: mysql-compile
@@ -154,6 +161,9 @@ 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