add slurm package (thanks to Thomas Reifferscheid)

[openwrt.git] / openwrt / package / Makefile

diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index 1bdbbbf..8cb9ecf 100644 (file)
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -10,9 +10,9 @@ package-$(BR2_PACKAGE_ARPD) += arpd
 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_COMPILE_ATFTP) += atftp

 package-$(BR2_COMPILE_AVAHI) += avahi
 package-$(BR2_COMPILE_AVAHI) += avahi

-package-$(BR2_PACKAGE_BIND) += bind
+package-$(BR2_COMPILE_BIND) += bind

 package-$(BR2_PACKAGE_BLUEZ_LIBS) += bluez-libs
 package-$(BR2_PACKAGE_BLUEZ_UTILS) += bluez-utils
 package-$(BR2_PACKAGE_BRIDGE) += bridge
 package-$(BR2_PACKAGE_BLUEZ_LIBS) += bluez-libs
 package-$(BR2_PACKAGE_BLUEZ_UTILS) += bluez-utils
 package-$(BR2_PACKAGE_BRIDGE) += bridge


@@ -23,9 +23,10 @@ package-$(BR2_PACKAGE_CHILLISPOT) += chillispot
 package-$(BR2_PACKAGE_CIFSMOUNT) += cifsmount
 package-$(BR2_PACKAGE_CUPS) += cups
 package-$(BR2_COMPILE_CURL) += curl
 package-$(BR2_PACKAGE_CIFSMOUNT) += cifsmount
 package-$(BR2_PACKAGE_CUPS) += cups
 package-$(BR2_COMPILE_CURL) += curl

-package-$(BR2_PACKAGE_CYRUS_SASL) += cyrus-sasl
+package-$(BR2_COMPILE_CYRUS_SASL) += cyrus-sasl
+package-$(BR2_COMPILE_DB) += libdb

 package-$(BR2_PACKAGE_DECO) += deco
 package-$(BR2_PACKAGE_DECO) += deco

-package-$(BR2_PACKAGE_DHCP) += dhcp
+package-$(BR2_COMPILE_DHCP) += dhcp

 package-$(BR2_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder
 package-$(BR2_PACKAGE_DNSMASQ) += dnsmasq
 package-$(BR2_PACKAGE_DOSFSTOOLS) += dosfstools
 package-$(BR2_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder
 package-$(BR2_PACKAGE_DNSMASQ) += dnsmasq
 package-$(BR2_PACKAGE_DOSFSTOOLS) += dosfstools


@@ -41,30 +42,30 @@ 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_FPROBE) += fprobe
 package-$(BR2_PACKAGE_FPROBE_ULOG) += fprobe-ulog
 package-$(BR2_PACKAGE_FREERADIUS) += freeradius

-package-$(BR2_PACKAGE_FREETYPE) += freetype
+package-$(BR2_COMPILE_FREETYPE) += freetype

 package-$(BR2_PACKAGE_FRICKIN) += frickin
 package-$(BR2_PACKAGE_FRICKIN) += frickin

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

 package-$(BR2_PACKAGE_GDBSERVER) += gdbserver
 package-$(BR2_PACKAGE_GDBSERVER) += gdbserver

-package-$(BR2_PACKAGE_GLIB) += glib
+package-$(BR2_COMPILE_GLIB) += glib

 package-$(BR2_PACKAGE_GMEDIASERVER) += gmediaserver
 package-$(BR2_PACKAGE_GMEDIASERVER) += gmediaserver

-package-$(BR2_PACKAGE_GMP) += gmp
+package-$(BR2_COMPILE_GMP) += gmp

 package-$(BR2_COMPILE_GNUTLS) += gnutls
 package-$(BR2_PACKAGE_GPSD) += gpsd
 package-$(BR2_PACKAGE_HASERL) += haserl
 package-$(BR2_PACKAGE_HOSTAPD) += hostapd
 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
+package-$(BR2_COMPILE_HOWL) += howl

 package-$(BR2_PACKAGE_HTPDATE) += htpdate
 package-$(BR2_PACKAGE_ICECAST) += icecast
 package-$(BR2_PACKAGE_ID3LIB) += id3lib
 package-$(BR2_PACKAGE_IPERF) += iperf
 package-$(BR2_PACKAGE_IPKG) += ipkg
 package-$(BR2_PACKAGE_HTPDATE) += htpdate
 package-$(BR2_PACKAGE_ICECAST) += icecast
 package-$(BR2_PACKAGE_ID3LIB) += id3lib
 package-$(BR2_PACKAGE_IPERF) += iperf
 package-$(BR2_PACKAGE_IPKG) += ipkg

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

 package-$(BR2_PACKAGE_IPSET) += ipset
 package-$(BR2_PACKAGE_IPSET) += ipset

-package-$(BR2_PACKAGE_IPTABLES) += iptables
+package-$(BR2_COMPILE_IPTABLES) += iptables

 package-$(BR2_PACKAGE_IPTRAF) += iptraf
 package-$(BR2_PACKAGE_IRSSI) += irssi
 package-$(BR2_COMPILE_JPEG) += jpeg
 package-$(BR2_PACKAGE_IPTRAF) += iptraf
 package-$(BR2_PACKAGE_IRSSI) += irssi
 package-$(BR2_COMPILE_JPEG) += jpeg

-package-$(BR2_PACKAGE_KISMET) += kismet
+package-$(BR2_COMPILE_KISMET) += kismet

 package-$(BR2_PACKAGE_L2TPD) += l2tpd
 package-$(BR2_PACKAGE_LCD4LINUX) += lcd4linux
 package-$(BR2_PACKAGE_LESS) += less
 package-$(BR2_PACKAGE_L2TPD) += l2tpd
 package-$(BR2_PACKAGE_LCD4LINUX) += lcd4linux
 package-$(BR2_PACKAGE_LESS) += less


@@ -72,7 +73,6 @@ package-$(BR2_PACKAGE_LIBAMSEL) += libamsel
 package-$(BR2_PACKAGE_LIBAO) += libao
 package-$(BR2_PACKAGE_LIBART) += libart
 package-$(BR2_PACKAGE_LIBDAEMON) += libdaemon
 package-$(BR2_PACKAGE_LIBAO) += libao
 package-$(BR2_PACKAGE_LIBART) += libart
 package-$(BR2_PACKAGE_LIBDAEMON) += libdaemon

-package-$(BR2_PACKAGE_LIBDB) += libdb

 package-$(BR2_PACKAGE_LIBDNET) += libdnet
 package-$(BR2_PACKAGE_LIBELF) += libelf
 package-$(BR2_PACKAGE_LIBEVENT) += libevent
 package-$(BR2_PACKAGE_LIBDNET) += libdnet
 package-$(BR2_PACKAGE_LIBELF) += libelf
 package-$(BR2_PACKAGE_LIBEVENT) += libevent


@@ -91,7 +91,7 @@ package-$(BR2_PACKAGE_LIBPCAP) += libpcap
 package-$(BR2_PACKAGE_LIBPNG) += libpng
 package-$(BR2_PACKAGE_LIBPTHREAD) += libpthread
 package-$(BR2_PACKAGE_LIBTASN1) += libtasn1
 package-$(BR2_PACKAGE_LIBPNG) += libpng
 package-$(BR2_PACKAGE_LIBPTHREAD) += libpthread
 package-$(BR2_PACKAGE_LIBTASN1) += libtasn1

-package-$(BR2_PACKAGE_LIBTOOL) += libtool
+package-$(BR2_COMPILE_LIBTOOL) += libtool

 package-$(BR2_PACKAGE_LIBUPNP) += libupnp
 package-$(BR2_PACKAGE_LIBUSB) += libusb
 package-$(BR2_PACKAGE_LIBVORBIS) += libvorbis
 package-$(BR2_PACKAGE_LIBUPNP) += libupnp
 package-$(BR2_PACKAGE_LIBUSB) += libusb
 package-$(BR2_PACKAGE_LIBVORBIS) += libvorbis


@@ -100,23 +100,24 @@ package-$(BR2_PACKAGE_LIBXML2) += libxml2
 package-$(BR2_PACKAGE_LIBXSLT) += libxslt
 package-$(BR2_PACKAGE_LIGHTTPD) += lighttpd
 package-$(BR2_PACKAGE_LINUX_ATM) += linux-atm
 package-$(BR2_PACKAGE_LIBXSLT) += libxslt
 package-$(BR2_PACKAGE_LIGHTTPD) += lighttpd
 package-$(BR2_PACKAGE_LINUX_ATM) += linux-atm

-package-$(BR2_PACKAGE_LUA) += lua
-package-$(BR2_PACKAGE_LZO) += lzo
+package-$(BR2_COMPILE_LUA) += lua
+package-$(BR2_COMPILE_LZO) += lzo

 package-$(BR2_PACKAGE_MADWIFI_TOOLS) += madwifi-tools
 package-$(BR2_PACKAGE_MARADNS) += maradns
 package-$(BR2_PACKAGE_MADWIFI_TOOLS) += madwifi-tools
 package-$(BR2_PACKAGE_MARADNS) += maradns

-package-$(BR2_PACKAGE_MATRIXSSL) += matrixssl
+package-$(BR2_COMPILE_MATRIXSSL) += matrixssl

 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_MICROCOM) += microcom
 package-$(BR2_PACKAGE_MICROPERL) += microperl
 package-$(BR2_COMPILE_MINI_HTTPD) += mini_httpd
 package-$(BR2_PACKAGE_MINI_SENDMAIL) += mini_sendmail

+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
 package-$(BR2_PACKAGE_MTR) += mtr
 package-$(BR2_COMPILE_MONIT) += monit
 package-$(BR2_PACKAGE_MPD) += mpd
 package-$(BR2_PACKAGE_MT_DAAPD) += mt-daapd
 package-$(BR2_PACKAGE_MTD) += mtd
 package-$(BR2_PACKAGE_MTR) += mtr

-package-$(BR2_PACKAGE_MYSQL) += mysql
+package-$(BR2_COMPILE_MYSQL) += mysql

 package-$(BR2_PACKAGE_NANO) += nano
 package-$(BR2_PACKAGE_NANO) += nano

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

 package-$(BR2_COMPILE_NDISC6) += ndisc
 package-$(BR2_COMPILE_NET_SNMP) += net-snmp
 package-$(BR2_PACKAGE_NETSTAT_NAT) += netstat-nat
 package-$(BR2_COMPILE_NDISC6) += ndisc
 package-$(BR2_COMPILE_NET_SNMP) += net-snmp
 package-$(BR2_PACKAGE_NETSTAT_NAT) += netstat-nat


@@ -126,33 +127,34 @@ package-$(BR2_PACKAGE_NOCATSPLASH) += nocatsplash
 package-$(BR2_PACKAGE_NTPCLIENT) += ntpclient
 package-$(BR2_PACKAGE_NVRAM) += nvram
 package-$(BR2_PACKAGE_OLSRD) += olsrd
 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
+package-$(BR2_COMPILE_OPENCDK) += opencdk
+package-$(BR2_COMPILE_OPENLDAP) += openldap

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

-package-$(BR2_PACKAGE_OPENSSH) += openssh
-package-$(BR2_PACKAGE_OPENSSL) += openssl
+package-$(BR2_COMPILE_OPENSSH) += openssh
+package-$(BR2_COMPILE_OPENSSL) += openssl

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

-package-$(BR2_PACKAGE_OSIRIS) += osiris
+package-$(BR2_COMPILE_OSIRIS) += osiris

 package-$(BR2_PACKAGE_PALANTIR) += palantir
 package-$(BR2_PACKAGE_P910ND) += p910nd
 package-$(BR2_PACKAGE_PARPROUTED) += parprouted
 package-$(BR2_PACKAGE_PALANTIR) += palantir
 package-$(BR2_PACKAGE_P910ND) += p910nd
 package-$(BR2_PACKAGE_PARPROUTED) += parprouted

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

 package-$(BR2_COMPILE_PHP4) += php4
 package-$(BR2_COMPILE_PHP5) += php5
 package-$(BR2_PACKAGE_PICOCOM) += picocom
 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_COMPILE_PMACCT) += pmacct
+package-$(BR2_COMPILE_POPT) += popt

 package-$(BR2_PACKAGE_PORTMAP) += portmap
 package-$(BR2_PACKAGE_PORTSENTRY) += portsentry
 package-$(BR2_PACKAGE_PORTMAP) += portmap
 package-$(BR2_PACKAGE_PORTSENTRY) += portsentry

-package-$(BR2_PACKAGE_POSTGRESQL) += postgresql
+package-$(BR2_COMPILE_POSTGRESQL) += postgresql

 package-$(BR2_PACKAGE_PPP) += ppp
 package-$(BR2_PACKAGE_PPTP) += pptp
 package-$(BR2_PACKAGE_PPTPD) += pptpd
 package-$(BR2_PACKAGE_PPP) += ppp
 package-$(BR2_PACKAGE_PPTP) += pptp
 package-$(BR2_PACKAGE_PPTPD) += pptpd

+package-$(BR2_PACKAGE_PSYBNC) += psybnc

 package-$(BR2_PACKAGE_QUAGGA) += quagga
 package-$(BR2_PACKAGE_RADVD) += radvd
 package-$(BR2_PACKAGE_RARPD) += rarpd
 package-$(BR2_PACKAGE_QUAGGA) += quagga
 package-$(BR2_PACKAGE_RADVD) += radvd
 package-$(BR2_PACKAGE_RARPD) += rarpd

-package-$(BR2_PACKAGE_READLINE) += readline
+package-$(BR2_COMPILE_READLINE) += readline

 package-$(BR2_PACKAGE_REAIM) += reaim
 package-$(BR2_PACKAGE_ROBOCFG) += robocfg
 package-$(BR2_COMPILE_RP_PPPOE) += rp-pppoe
 package-$(BR2_PACKAGE_REAIM) += reaim
 package-$(BR2_PACKAGE_ROBOCFG) += robocfg
 package-$(BR2_COMPILE_RP_PPPOE) += rp-pppoe


@@ -162,7 +164,7 @@ package-$(BR2_COMPILE_RRDTOOL1) += rrdtool1
 package-$(BR2_COMPILE_RRS) += rrs
 package-$(BR2_PACKAGE_RSYNC) += rsync
 package-$(BR2_PACKAGE_SABLEVM) += sablevm
 package-$(BR2_COMPILE_RRS) += rrs
 package-$(BR2_PACKAGE_RSYNC) += rsync
 package-$(BR2_PACKAGE_SABLEVM) += sablevm

-package-$(BR2_PACKAGE_SABLEVM_CLASSPATH) += sablevm-classpath
+package-$(BR2_COMPILE_SABLEVM_CLASSPATH) += sablevm-classpath

 package-$(BR2_COMPILE_SAMBA) += samba
 package-$(BR2_PACKAGE_SCDP) += scdp
 package-$(BR2_PACKAGE_SCREEN) += screen
 package-$(BR2_COMPILE_SAMBA) += samba
 package-$(BR2_PACKAGE_SCDP) += scdp
 package-$(BR2_PACKAGE_SCREEN) += screen


@@ -171,14 +173,16 @@ package-$(BR2_PACKAGE_SER) += ser
 package-$(BR2_PACKAGE_SETPWC) += setpwc
 package-$(BR2_PACKAGE_SETSERIAL) += setserial
 package-$(BR2_PACKAGE_SHAT) += shat
 package-$(BR2_PACKAGE_SETPWC) += setpwc
 package-$(BR2_PACKAGE_SETSERIAL) += setserial
 package-$(BR2_PACKAGE_SHAT) += shat

-package-$(BR2_PACKAGE_SHFS) += shfs
+package-$(BR2_COMPILE_SHFS) += shfs

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

-package-$(BR2_PACKAGE_SNORT) += snort
+package-$(BR2_PACKAGE_SLURM) += slurm
+package-$(BR2_COMPILE_SNORT) += snort
+package-$(BR2_COMPILE_SNORT_WIRELESS) += snort-wireless

 package-$(BR2_PACKAGE_SOCAT) += socat
 package-$(BR2_PACKAGE_SOCAT) += socat

-package-$(BR2_PACKAGE_SPEEX) += speex
-package-$(BR2_PACKAGE_SQLITE) += sqlite
-package-$(BR2_PACKAGE_SQLITE2) += sqlite2
+package-$(BR2_COMPILE_SPEEX) += speex
+package-$(BR2_COMPILE_SQLITE) += sqlite
+package-$(BR2_COMPILE_SQLITE2) += sqlite2

 package-$(BR2_PACKAGE_SSMTP) += ssmtp
 package-$(BR2_PACKAGE_SRELAY) += srelay
 package-$(BR2_PACKAGE_STRACE) += strace
 package-$(BR2_PACKAGE_SSMTP) += ssmtp
 package-$(BR2_PACKAGE_SRELAY) += srelay
 package-$(BR2_PACKAGE_STRACE) += strace


@@ -189,7 +193,7 @@ package-$(BR2_PACKAGE_TTCP) += ttcp
 package-$(BR2_PACKAGE_UCLIBCXX) += uclibc++
 package-$(BR2_PACKAGE_ULOGD) += ulogd
 package-$(BR2_PACKAGE_UPDATEDD) += updatedd
 package-$(BR2_PACKAGE_UCLIBCXX) += uclibc++
 package-$(BR2_PACKAGE_ULOGD) += ulogd
 package-$(BR2_PACKAGE_UPDATEDD) += updatedd

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

 package-$(BR2_COMPILE_UTIL_LINUX) += util-linux
 package-$(BR2_PACKAGE_VTUN) += vtun
 package-$(BR2_PACKAGE_VSFTPD) += vsftpd
 package-$(BR2_COMPILE_UTIL_LINUX) += util-linux
 package-$(BR2_PACKAGE_VTUN) += vtun
 package-$(BR2_PACKAGE_VSFTPD) += vsftpd


@@ -253,6 +257,7 @@ libvorbis-compile: libogg-compile
 libxml2-compile: zlib-compile
 libxslt-compile: libxml2-compile
 lighttpd-compile: openssl-compile pcre-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
 mt-daapd-compile: howl-compile libgdbm-compile libid3tag-compile
 mtr-compile: ncurses-compile
 mysql-compile: ncurses-compile zlib-compile


@@ -401,10 +406,10 @@ php5-compile: expat-compile
 endif
 
 pmacct-compile: libpcap-compile
 endif
 
 pmacct-compile: libpcap-compile

-ifneq ($(BR2_PACKAGE_PMACCT_MYSQL),)
+ifneq ($(BR2_COMPILE_PMACCT_MYSQL),)

 pmacct-compile: mysql-compile
 endif
 pmacct-compile: mysql-compile
 endif

-ifneq ($(BR2_PACKAGE_PMACCT_PGSQL),)
+ifneq ($(BR2_COMPILE_PMACCT_PGSQL),)

 pmacct-compile: postgresql-compile
 endif
 
 pmacct-compile: postgresql-compile
 endif
 


@@ -414,21 +419,32 @@ rrs-compile: openssl-compile
 endif
 
 snort-compile: libnet-compile libpcap-compile pcre-compile
 endif
 
 snort-compile: libnet-compile libpcap-compile pcre-compile

-ifeq ($(BR2_PACKAGE_SNORT_MYSQL),y)
+ifeq ($(BR2_PACKAGE_SNORT_WITH_MYSQL),y)

 snort-compile: mysql-compile
 endif
 snort-compile: mysql-compile
 endif

-ifeq ($(BR2_PACKAGE_SNORT_PGSQL),y)
+ifeq ($(BR2_PACKAGE_SNORT_WITH_PGSQL),y)

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

+snort-wireless-compile: libnet-compile libpcap-compile pcre-compile
+ifeq ($(BR2_PACKAGE_SNORT_WIRELESS_WITH_MYSQL),y)
+snort-wireless-compile: mysql-compile
+endif
+ifeq ($(BR2_PACKAGE_SNORT_WIRELESS_WITH_PGSQL),y)
+snort-wireless-compile: postgresql-compile
+endif
+ifeq ($(BR2_PACKAGE_SNORT_WIRELESS_ENABLE_INLINE),y)
+snort-wireless-compile: iptables-compile
+endif
+

 ulogd-compile: iptables-compile
 ulogd-compile: iptables-compile

-ifneq ($(BR2_PACKAGE_ULOGD_MYSQL),)
+ifneq ($(BR2_PACKAGE_ULOGD_MOD_MYSQL),)

 ulogd-compile: mysql-compile
 endif
 ulogd-compile: mysql-compile
 endif

-ifneq ($(BR2_PACKAGE_ULOGD_PGSQL),)
+ifneq ($(BR2_PACKAGE_ULOGD_MOD_PGSQL),)

 ulogd-compile: postgresql-compile
 endif
 
 ulogd-compile: postgresql-compile
 endif
 


@@ -445,7 +461,6 @@ $(TARGET_DIR):
                $(START_TRACE) "package/$(patsubst %-prepare,%,$@)/prepare: "; \
                $(MAKE) -C $(patsubst %-prepare,%,$@) prepare && { \
                        touch $(STAMP_DIR)/.$@; \
                $(START_TRACE) "package/$(patsubst %-prepare,%,$@)/prepare: "; \
                $(MAKE) -C $(patsubst %-prepare,%,$@) prepare && { \
                        touch $(STAMP_DIR)/.$@; \

-               } || { \

                        $(CMD_TRACE) " done"; \
                        $(END_TRACE); \
                } \
                        $(CMD_TRACE) " done"; \
                        $(END_TRACE); \
                } \


@@ -457,7 +472,6 @@ $(TARGET_DIR):
                $(MAKE) -C $(patsubst %-compile,%,$@) compile && { \
                        touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare; \
                        touch $(STAMP_DIR)/.$@; \
                $(MAKE) -C $(patsubst %-compile,%,$@) compile && { \
                        touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare; \
                        touch $(STAMP_DIR)/.$@; \

-               } || { \

                        $(CMD_TRACE) " done"; \
                        $(END_TRACE); \
                } \
                        $(CMD_TRACE) " done"; \
                        $(END_TRACE); \
                } \