Change dhcp-forwarder, rename config var, uniformize package makefile, move ipkg...

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index 8aab7f1..bd93880 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -1,48 +1,113 @@
 # Main makefile for the packages
 include $(TOPDIR)/rules.mk
 
 # Main makefile for the packages
 include $(TOPDIR)/rules.mk
 

+package-:=tcp_wrappers

 package-y:=openwrt
 package-y:=openwrt

+package-$(BR2_PACKAGE_AICCU) += aiccu

 package-$(BR2_PACKAGE_ARPTABLES) += arptables
 package-$(BR2_PACKAGE_ARPTABLES) += arptables

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

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

+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_DNSMASQ) += dnsmasq
 package-$(BR2_PACKAGE_EBTABLES) += ebtables
 package-$(BR2_PACKAGE_EZIPUPDATE) += ez-ipupdate
 package-$(BR2_PACKAGE_CIFSMOUNT) += cifsmount
 package-$(BR2_PACKAGE_CUPS) += cups
 package-$(BR2_PACKAGE_DROPBEAR) += dropbear
 package-$(BR2_PACKAGE_DNSMASQ) += dnsmasq
 package-$(BR2_PACKAGE_EBTABLES) += ebtables
 package-$(BR2_PACKAGE_EZIPUPDATE) += ez-ipupdate

+package-$(BR2_PACKAGE_FPING) += fping
+package-$(BR2_PACKAGE_FUSE) += fuse
+package-$(BR2_PACKAGE_GLIB) += glib

 package-$(BR2_PACKAGE_GMP) += gmp
 package-$(BR2_PACKAGE_HASERL) += haserl
 package-$(BR2_PACKAGE_IPTABLES) += iptables
 package-$(BR2_PACKAGE_IPROUTE2) += iproute2
 package-$(BR2_PACKAGE_LCD4LINUX) += lcd4linux
 package-$(BR2_PACKAGE_LIBELF) += libelf
 package-$(BR2_PACKAGE_GMP) += gmp
 package-$(BR2_PACKAGE_HASERL) += haserl
 package-$(BR2_PACKAGE_IPTABLES) += iptables
 package-$(BR2_PACKAGE_IPROUTE2) += iproute2
 package-$(BR2_PACKAGE_LCD4LINUX) += lcd4linux
 package-$(BR2_PACKAGE_LIBELF) += libelf

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

 package-$(BR2_PACKAGE_LZO) += lzo
 package-$(BR2_PACKAGE_MATRIXSSL) += matrixssl
 package-$(BR2_PACKAGE_MICROPERL) += microperl
 package-$(BR2_PACKAGE_NCURSES) += ncurses
 package-$(BR2_PACKAGE_LZO) += lzo
 package-$(BR2_PACKAGE_MATRIXSSL) += matrixssl
 package-$(BR2_PACKAGE_MICROPERL) += microperl
 package-$(BR2_PACKAGE_NCURSES) += ncurses

+package-$(BR2_PACKAGE_NFSD) += nfs-server
+package-$(BR2_PACKAGE_NOCATSPLASH) += nocatsplash
+package-$(BR2_PACKAGE_NTPCLIENT) += ntpclient

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

+package-$(BR2_PACKAGE_OPENSWAN) += openswan

 package-$(BR2_PACKAGE_OPENNTPD) += openntpd
 package-$(BR2_PACKAGE_OPENVPN) += openvpn
 package-$(BR2_PACKAGE_PCRE) += pcre
 package-$(BR2_PACKAGE_POPT) += popt
 package-$(BR2_PACKAGE_OPENNTPD) += openntpd
 package-$(BR2_PACKAGE_OPENVPN) += openvpn
 package-$(BR2_PACKAGE_PCRE) += pcre
 package-$(BR2_PACKAGE_POPT) += popt

+package-$(BR2_PACKAGE_PORTMAP) += portmap

 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_QUAGGA) += quagga
+package-$(BR2_PACKAGE_RADVD) += radvd
+package-$(BR2_PACKAGE_SDK) += sdk
+package-$(BR2_PACKAGE_SER) += ser
+package-$(BR2_PACKAGE_SETSERIAL) += setserial
+package-$(BR2_PACKAGE_SHFS) += shfs
+package-$(BR2_PACKAGE_SNORT) += snort
+package-$(BR2_PACKAGE_SPEEX) += speex

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

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

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

+package-$(BR2_PACKAGE_DHCPFWD) += dhcp-forwarder
+package-$(BR2_PACKAGE_LIBNET) += libnet
+package-$(BR2_PACKAGE_LIBMYSQLCLIENT) += mysql
+package-$(BR2_PACKAGE_LIBPCAP) += libpcap
+package-$(BR2_PACKAGE_LIBPQ) += postgresql
+
+DEV_LIBS:=tcp_wrappers glib ncurses openssl pcre popt zlib libnet libpcap mysql postgresql iptables matrixssl lzo gmp fuse portmap libelf
+DEV_LIBS_COMPILE:=$(patsubst %,%-compile,$(DEV_LIBS))

 
 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 install
 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
+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
+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
 tcpdump-compile: libpcap-compile
 dropbear-compile: zlib-compile
 openssl-compile: zlib-compile
 openvpn-compile: openssl-compile

-$(patsubst %,%-prepare,$(package-y) $(package-m)): linux-install
+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
+
+snort-compile: libnet-compile libpcap-compile pcre-compile
+ifeq ($(BR2_PACKAGE_SNORT_MYSQL),y)
+snort-compile: mysql-compile
+endif
+ifeq ($(BR2_PACKAGE_SNORT_PGSQL),y)
+snort-compile: postgresql-compile
+endif
+
+sdk-compile: $(DEV_LIBS_COMPILE)
+$(patsubst %,%-prepare,$(package-y) $(package-m) $(package-)): linux-install

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