replace device in wlcompat(non-debug), add wlcompat.h and refuse to load wlcompat...

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index 404d890..f9d161f 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -20,8 +20,7 @@ package-$(BR2_PACKAGE_EZIPUPDATE) += ez-ipupdate
 package-$(BR2_PACKAGE_FPING) += fping
 package-$(BR2_PACKAGE_FPROBE) += fprobe
 package-$(BR2_PACKAGE_FUSE) += fuse
-package-$(BR2_PACKAGE_GLIB) += glib
-package-$(BR2_PACKAGE_GMP) += gmp
+package-$(BR2_PACKAGE_GLIB1) += glib
 package-$(BR2_PACKAGE_HASERL) += haserl
 package-$(BR2_PACKAGE_IPKG) += ipkg
 package-$(BR2_PACKAGE_IPTABLES) += iptables
@@ -30,6 +29,7 @@ package-$(BR2_PACKAGE_KISMET) += kismet
 package-$(BR2_PACKAGE_L2TPD) += l2tpd
 package-$(BR2_PACKAGE_LCD4LINUX) += lcd4linux
 package-$(BR2_PACKAGE_LIBELF) += libelf
+package-$(BR2_PACKAGE_LIBGMP) += gmp
 package-$(BR2_PACKAGE_LIBPTHREAD) += libpthread
 package-$(BR2_PACKAGE_LIBUSB) += libusb
 package-$(BR2_PACKAGE_LZO) += lzo
@@ -43,6 +43,7 @@ package-$(BR2_PACKAGE_NMAP) += nmap
 package-$(BR2_PACKAGE_NOCATSPLASH) += nocatsplash
 package-$(BR2_PACKAGE_NTPCLIENT) += ntpclient
 package-$(BR2_PACKAGE_OLSRD) += olsrd
+package-$(BR2_PACKAGE_OPENLDAP) += openldap
 package-$(BR2_PACKAGE_OPENSSL) += openssl
 package-$(BR2_PACKAGE_OPENSWAN) += openswan
 package-$(BR2_PACKAGE_OPENNTPD) += openntpd
@@ -73,13 +74,16 @@ package-$(BR2_PACKAGE_WIRELESS_TOOLS) += wireless-tools
 package-$(BR2_PACKAGE_WOL) += wol
 package-$(BR2_PACKAGE_ZLIB) += zlib
 package-$(BR2_PACKAGE_DHCPFWD) += 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
 
-DEV_LIBS:=tcp_wrappers glib ncurses openssl pcre popt zlib libnet libpcap mysql postgresql iptables matrixssl lzo gmp fuse portmap libelf uclibc++ speex libpng
+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_COMPILE:=$(patsubst %,%-compile,$(SDK_DEFAULT_PACKAGES))
@@ -92,6 +96,7 @@ install: $(patsubst %,%-install,$(package-y))
 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
@@ -101,6 +106,7 @@ 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
@@ -119,6 +125,8 @@ 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
+openldap-compile: cyrus-sasl-compile openssl-compile
 
 snort-compile: libnet-compile libpcap-compile pcre-compile
 ifeq ($(BR2_PACKAGE_SNORT_MYSQL),y)