From: Nicolas Thill Date: Sat, 21 May 2005 01:56:15 +0000 (+0000) Subject: Reorder packages and dependencies X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=898d83787269ed4d67fb7710b661e8c564213f1f;p=openwrt%2Fstaging%2Fzorun.git Reorder packages and dependencies SVN-Revision: 1002 --- diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile index 033b2c17e2..59119ef68f 100644 --- a/openwrt/package/Makefile +++ b/openwrt/package/Makefile @@ -13,30 +13,43 @@ package-$(BR2_PACKAGE_BWM) += bwm 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_FORWARDER) += dhcp-forwarder package-$(BR2_PACKAGE_DNSMASQ) += dnsmasq +package-$(BR2_PACKAGE_DROPBEAR) += dropbear package-$(BR2_PACKAGE_EBTABLES) += ebtables package-$(BR2_PACKAGE_EZIPUPDATE) += ez-ipupdate package-$(BR2_PACKAGE_FPING) += fping package-$(BR2_PACKAGE_FPROBE) += fprobe +package-$(BR2_PACKAGE_FREERADIUS) += freeradius package-$(BR2_PACKAGE_FUSE) += fuse package-$(BR2_PACKAGE_GLIB) += glib +package-$(BR2_PACKAGE_GMP) += gmp package-$(BR2_PACKAGE_HASERL) += haserl +package-$(BR2_PACKAGE_HOWL) += howl +package-$(BR2_PACKAGE_HTPDATE) += htpdate package-$(BR2_PACKAGE_IPKG) += ipkg -package-$(BR2_PACKAGE_IPTABLES) += iptables package-$(BR2_PACKAGE_IPROUTE2) += iproute2 +package-$(BR2_PACKAGE_IPTABLES) += iptables package-$(BR2_PACKAGE_KISMET) += kismet package-$(BR2_PACKAGE_L2TPD) += l2tpd package-$(BR2_PACKAGE_LCD4LINUX) += lcd4linux package-$(BR2_PACKAGE_LIBELF) += libelf -package-$(BR2_PACKAGE_GMP) += gmp -package-$(BR2_PACKAGE_LZO) += lzo +package-$(BR2_PACKAGE_LIBGD) += libgd +package-$(BR2_PACKAGE_LIBNET) += libnet +package-$(BR2_PACKAGE_LIBOSIP2) += libosip2 +package-$(BR2_PACKAGE_LIBPCAP) += libpcap +package-$(BR2_PACKAGE_LIBPNG) += libpng package-$(BR2_PACKAGE_LIBPTHREAD) += libpthread +package-$(BR2_PACKAGE_LIBTOOL) += libtool package-$(BR2_PACKAGE_LIBUSB) += libusb -package-$(BR2_PACKAGE_MATRIXSSL) += matrixssl +package-$(BR2_PACKAGE_LIGHTTPD) += lighttpd +package-$(BR2_PACKAGE_LZO) += lzo package-$(BR2_PACKAGE_MARADNS) += maradns +package-$(BR2_PACKAGE_MATRIXSSL) += matrixssl package-$(BR2_PACKAGE_MICROPERL) += microperl package-$(BR2_PACKAGE_MONIT) += monit +package-$(BR2_PACKAGE_MYSQL) += mysql package-$(BR2_PACKAGE_NCURSES) += ncurses package-$(BR2_PACKAGE_NET_SNMP) += net-snmp package-$(BR2_PACKAGE_NFS_SERVER) += nfs-server @@ -45,13 +58,16 @@ package-$(BR2_PACKAGE_NOCATSPLASH) += nocatsplash package-$(BR2_PACKAGE_NTPCLIENT) += ntpclient package-$(BR2_PACKAGE_OLSRD) += olsrd package-$(BR2_PACKAGE_OPENLDAP) += openldap +package-$(BR2_PACKAGE_OPENNTPD) += openntpd package-$(BR2_PACKAGE_OPENSSL) += openssl package-$(BR2_PACKAGE_OPENSWAN) += openswan -package-$(BR2_PACKAGE_OPENNTPD) += openntpd package-$(BR2_PACKAGE_OPENVPN) += openvpn +package-$(BR2_PACKAGE_OSIRIS) += osiris package-$(BR2_PACKAGE_PCRE) += pcre +package-$(BR2_PACKAGE_PMACCT) += pmacct package-$(BR2_PACKAGE_POPT) += popt package-$(BR2_PACKAGE_PORTMAP) += portmap +package-$(BR2_PACKAGE_POSTGRESQL) += postgresql package-$(BR2_PACKAGE_PPP) += ppp package-$(BR2_PACKAGE_PPTP) += pptp package-$(BR2_PACKAGE_PPTPD) += pptpd @@ -64,6 +80,8 @@ 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_STRACE) += strace @@ -71,31 +89,13 @@ package-$(BR2_PACKAGE_TCPDUMP) += tcpdump package-$(BR2_PACKAGE_TINC) += tinc package-$(BR2_PACKAGE_TTCP) += ttcp package-$(BR2_PACKAGE_UCLIBCXX) += uclibc++ +package-$(BR2_PACKAGE_ULOGD) += ulogd package-$(BR2_PACKAGE_USBUTILS) += usbutils +package-$(BR2_PACKAGE_VSFTPD) += vsftpd package-$(BR2_PACKAGE_WIRELESS_TOOLS) += wireless-tools package-$(BR2_PACKAGE_WOL) += wol -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_MYSQL) += mysql -package-$(BR2_PACKAGE_LIBPCAP) += libpcap -package-$(BR2_PACKAGE_LIBPNG) += libpng -package-$(BR2_PACKAGE_POSTGRESQL) += postgresql -package-$(BR2_PACKAGE_CYRUS_SASL) += cyrus-sasl -package-$(BR2_PACKAGE_LIBTOOL) += libtool -package-$(BR2_PACKAGE_LIBOSIP2) += libosip2 -package-$(BR2_PACKAGE_SIPROXD) += siproxd -package-$(BR2_PACKAGE_SIPSAK) += sipsak -package-$(BR2_PACKAGE_FREERADIUS) += freeradius -package-$(BR2_PACKAGE_HTPDATE) += htpdate -package-$(BR2_PACKAGE_HOWL) += howl -package-$(BR2_PACKAGE_LIGHTTPD) += lighttpd -package-$(BR2_PACKAGE_OSIRIS) += osiris -package-$(BR2_PACKAGE_PMACCT) += pmacct -package-$(BR2_PACKAGE_ULOGD) += ulogd -package-$(BR2_PACKAGE_VSFTPD) += vsftpd package-$(BR2_PACKAGE_XINETD) += xinetd +package-$(BR2_PACKAGE_ZLIB) += zlib 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)) @@ -107,9 +107,32 @@ clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m)) linux-clean compile: $(patsubst %,%-compile,$(package-y) $(package-m)) install: $(patsubst %,%-install,$(package-y)) -ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y) -openvpn-compile: lzo-compile -endif +arpwatch-compile: libpcap-compile +cyrus-sasl-compile: openssl-compile +dropbear-compile: zlib-compile +fprobe-compile: libpcap-compile +freeradius-compile: libtool-compile mysql-compile openldap-compile openssl-compile postgresql-compile +kismet-compile: uclibc++-compile libpcap-compile ncurses-compile +lcd4linux-compile: ncurses-compile +libgd-compile: libpng-compile +libnet-compile: libpcap-compile +lighttpd-compile: openssl-compile pcre-compile +mysql-compile: ncurses-compile zlib-compile +nfs-server-compile: portmap-compile +nmap-compile: uclibc++-compile pcre-compile libpcap-compile +nocatsplash-compile: glib-compile +openldap-compile: cyrus-sasl-compile openssl-compile +openssl-compile: zlib-compile +openswan-compile: gmp-compile +osiris-compile: openssl-compile +portmap-compile: tcp_wrappers-compile +postgresql-compile: zlib-compile +screen-compile: ncurses-compile +siproxd-compile: libosip2-compile +sipsak-compile: openssl-compile +tcpdump-compile: libpcap-compile +tinc-compile: zlib-compile openssl-compile lzo-compile + asterisk-compile: openssl-compile ifneq ($(BR2_PACKAGE_ASTERISK_SPEEX),) asterisk-compile: speex-compile @@ -120,32 +143,11 @@ 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 -arpwatch-compile: libpcap-compile -tcpdump-compile: libpcap-compile -dropbear-compile: zlib-compile -openssl-compile: zlib-compile + openvpn-compile: openssl-compile -nfs-server-compile: portmap-compile -portmap-compile: tcp_wrappers-compile -lcd4linux-compile: ncurses-compile -libnet-compile: libpcap-compile -mysql-compile: ncurses-compile zlib-compile -postgresql-compile: zlib-compile -nmap-compile: uclibc++-compile pcre-compile libpcap-compile -kismet-compile: uclibc++-compile libpcap-compile ncurses-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 -siproxd-compile: libosip2-compile -sipsak-compile: openssl-compile -lighttpd-compile: openssl-compile pcre-compile -osiris-compile: openssl-compile -freeradius-compile: libtool-compile mysql-compile openldap-compile openssl-compile postgresql-compile +ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y) +openvpn-compile: lzo-compile +endif pmacct-compile: libpcap-compile ifneq ($(BR2_PACKAGE_PMACCT_MYSQL),)