X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e2e1aff44f063dd354505f06e8e7f92dd966e194..f70dbda432439dd2f489ebf4adb808a5a8f71ea4:/package/Makefile?ds=sidebyside diff --git a/package/Makefile b/package/Makefile index eb6b6c9b3..39648ead1 100644 --- a/package/Makefile +++ b/package/Makefile @@ -21,6 +21,7 @@ package-$(BR2_PACKAGE_BWM) += bwm package-$(BR2_PACKAGE_CGILIB) += cgilib package-$(BR2_PACKAGE_CHILLISPOT) += chillispot package-$(BR2_PACKAGE_CIFSMOUNT) += cifsmount +package-$(BR2_PACKAGE_CLINKC) += clinkc package-$(BR2_PACKAGE_COLLECTD) += collectd package-$(BR2_PACKAGE_CUPS) += cups package-$(BR2_COMPILE_CURL) += curl @@ -61,8 +62,10 @@ package-$(BR2_PACKAGE_HOSTAP_UTILS) += hostap-utils package-$(BR2_PACKAGE_HOSTAPD) += hostapd package-$(BR2_COMPILE_HOWL) += howl package-$(BR2_PACKAGE_HTPDATE) += htpdate +package-$(BR2_PACKAGE_HTTPING) += httping package-$(BR2_PACKAGE_ICECAST) += icecast package-$(BR2_PACKAGE_ID3LIB) += id3lib +package-$(BR2_PACKAGE_IFTOP) += iftop package-$(BR2_PACKAGE_IPCAD) += ipcad package-$(BR2_PACKAGE_IPERF) += iperf package-$(BR2_PACKAGE_IPKG) += ipkg @@ -114,11 +117,11 @@ 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_LOGROTATE) += logrotate package-$(BR2_PACKAGE_LRZSZ) += lrzsz package-$(BR2_COMPILE_LUA) += lua package-$(BR2_PACKAGE_MACCHANGER) += macchanger package-$(BR2_PACKAGE_MADPLAY) += madplay -package-$(BR2_COMPILE_MADWIFI_TOOLS) += madwifi-tools package-$(BR2_PACKAGE_MARADNS) += maradns package-$(BR2_COMPILE_MATRIXSSL) += matrixssl package-$(BR2_PACKAGE_MIAX) += miax @@ -138,6 +141,7 @@ package-$(BR2_PACKAGE_NANO) += nano package-$(BR2_COMPILE_NCURSES) += ncurses package-$(BR2_COMPILE_NDISC6) += ndisc package-$(BR2_COMPILE_NET_SNMP) += net-snmp +package-$(BR2_PACKAGE_NETPERF) += netperf package-$(BR2_PACKAGE_NETSTAT_NAT) += netstat-nat package-$(BR2_PACKAGE_NFS_SERVER) += nfs-server package-$(BR2_PACKAGE_NMAP) += nmap @@ -148,6 +152,7 @@ package-$(BR2_PACKAGE_OLSRD) += olsrd package-$(BR2_COMPILE_OPENCDK) += opencdk package-$(BR2_COMPILE_OPENLDAP) += openldap package-$(BR2_PACKAGE_OPENNTPD) += openntpd +package-$(BR2_PACKAGE_OPENSER) += openser package-$(BR2_COMPILE_OPENSSH) += openssh package-$(BR2_COMPILE_OPENSSL) += openssl package-$(BR2_PACKAGE_OPENSWAN) += openswan @@ -156,6 +161,7 @@ package-$(BR2_COMPILE_OSIRIS) += osiris package-$(BR2_PACKAGE_PALANTIR) += palantir package-$(BR2_PACKAGE_P910ND) += p910nd package-$(BR2_PACKAGE_PARPROUTED) += parprouted +package-$(BR2_PACKAGE_PCIUTILS) += pciutils package-$(BR2_COMPILE_PCMCIA_CS) += pcmcia-cs package-$(BR2_COMPILE_PCRE) += pcre package-$(BR2_PACKAGE_PEERCAST) += peercast @@ -190,10 +196,10 @@ package-$(BR2_PACKAGE_SABLEVM) += sablevm package-$(BR2_COMPILE_SABLEVM_CLASSPATH) += sablevm-classpath package-$(BR2_COMPILE_SAMBA) += samba package-$(BR2_PACKAGE_SANE_BACKENDS) += sane-backends +package-$(BR2_PACKAGE_SCANLOGD) += scanlogd package-$(BR2_PACKAGE_SCDP) += scdp package-$(BR2_PACKAGE_SCREEN) += screen package-$(BR2_PACKAGE_SDK) += sdk -package-$(BR2_PACKAGE_SER) += ser package-$(BR2_PACKAGE_SERDISPLIB) += serdisplib package-$(BR2_PACKAGE_SETPWC) += setpwc package-$(BR2_PACKAGE_SETSERIAL) += setserial @@ -209,13 +215,16 @@ package-$(BR2_COMPILE_SPEEX) += speex package-$(BR2_COMPILE_SQLITE) += sqlite package-$(BR2_COMPILE_SQLITE2) += sqlite2 package-$(BR2_PACKAGE_SSMTP) += ssmtp +package-$(BR2_PACKAGE_SSLTUNNEL) += ssltunnel package-$(BR2_PACKAGE_SRELAY) += srelay package-$(BR2_PACKAGE_STRACE) += strace package-$(BR2_PACKAGE_TCPDUMP) += tcpdump package-$(BR2_PACKAGE_TINC) += tinc +package-$(BR2_PACKAGE_TINYPROXY) += tinyproxy package-$(BR2_PACKAGE_TOR) += tor package-$(BR2_PACKAGE_TTCP) += ttcp package-$(BR2_PACKAGE_UCLIBCXX) += uclibc++ +package-$(BR2_PACKAGE_UDP_BROADCAST_RELAY) += udp-broadcast-relay package-$(BR2_PACKAGE_ULOGD) += ulogd package-$(BR2_PACKAGE_UPDATEDD) += updatedd package-$(BR2_COMPILE_USBUTILS) += usbutils @@ -229,6 +238,7 @@ package-$(BR2_PACKAGE_VPNC) += vpnc package-$(BR2_PACKAGE_VRRPD) += vrrpd package-$(BR2_PACKAGE_VTUN) += vtun package-$(BR2_PACKAGE_VSFTPD) += vsftpd +package-$(BR2_PACKAGE_WATCHDOG) += watchdog package-$(BR2_PACKAGE_WCCPD) += wccpd package-$(BR2_PACKAGE_WIFICONF) += wificonf package-$(BR2_PACKAGE_WIFIDOG) += wifidog @@ -240,12 +250,12 @@ package-$(BR2_PACKAGE_WONDERSHAPER) += wondershaper package-$(BR2_PACKAGE_WPA_SUPPLICANT) += wpa_supplicant package-$(BR2_PACKAGE_WPUT) += wput package-$(BR2_PACKAGE_WRT_RADAUTH) += wrt-radauth -package-$(BR2_PAKCAGE_WX200D) += wx200d +package-$(BR2_PACKAGE_WX200D) += wx200d package-$(BR2_PACKAGE_XINETD) += xinetd package-$(BR2_PACKAGE_XSUPPLICANT) += xsupplicant package-$(BR2_PACKAGE_ZLIB) += zlib -DEV_LIBS:=tcp_wrappers glib ncurses openssl pcre popt zlib libnet libpcap mysql postgresql iptables matrixssl liblzo gmp fuse portmap libelf uclibc++ speex libpng libgd wireless-tools nvram linux-atm libamsel libao libart libdaemon libdb libdnet libevent libffi-sable libgcrypt libgdbm libgpg-error libid3tag libmad libnet libnids libogg libosip2 libpcap libtasn1 libupnp libusb libvorbis libvorbisidec libxml2 libxslt id3lib +DEV_LIBS:=tcp_wrappers glib ncurses openssl pcre popt zlib libnet libpcap mysql postgresql iptables matrixssl liblzo gmp fuse portmap libelf uclibc++ speex libpng libgd wireless-tools nvram linux-atm libamsel libao libart libdaemon libdb libdnet libevent libffi-sable libgcrypt libgdbm libgpg-error libid3tag libmad libnet libnids libogg libosip2 libpcap libtasn1 libupnp libusb libvorbis libvorbisidec libxml2 libxslt id3lib net-snmp DEV_LIBS_COMPILE:=$(patsubst %,%-compile,$(DEV_LIBS)) SDK_DEFAULT_PACKAGES:=busybox dnsmasq iptables wireless-tools dropbear bridge ipkg ppp SDK_DEFAULT_COMPILE:=$(patsubst %,%-compile,$(SDK_DEFAULT_PACKAGES)) @@ -263,8 +273,10 @@ $(INSTALL_PACKAGES): base-files-install amwall-compile: libamsel-compile arpd-compile: libpcap-compile libdnet-compile libevent-compile arpwatch-compile: libpcap-compile +atftp-compile: readline-compile avahi-compile: libdaemon-compile expat-compile libgdbm-compile bind-compile: openssl-compile +clinkc-compile: expat-compile curl-compile: openssl-compile zlib-compile cyrus-sasl-compile: openssl-compile deco-compile: ncurses-compile @@ -279,12 +291,14 @@ gnutls-compile: libgcrypt-compile opencdk-compile libtasn1-compile gpsd-compile: uclibc++-compile icecast-compile: curl-compile libvorbisidec-compile libxml2-compile libxslt-compile id3lib-compile: uclibc++-compile zlib-compile +iftop-compile: libpcap-compile libpthread-compile ncurses-compile ipcad-compile: libpcap-compile irssi-compile: glib-compile ncurses-compile iperf-compile: uclibc++-compile iptables-snmp-compile: net-snmp-compile iptraf-compile: ncurses-compile hostapd-compile: openssl-compile wireless-tools-compile +httping-compile: openssl-compile kismet-compile: uclibc++-compile libpcap-compile ncurses-compile l2tpns-compile: libcli-compile less-compile: ncurses-compile @@ -298,12 +312,14 @@ libvorbis-compile: libogg-compile libxml2-compile: zlib-compile libxslt-compile: libxml2-compile lighttpd-compile: openssl-compile pcre-compile +logrotate-compile: popt-compile madplay-compile: libid3tag-compile libmad-compile miax-compile: bluez-libs-compile miredo-compile: uclibc++-compile +monit-compile: openssl-compile mt-daapd-compile: howl-compile libgdbm-compile libid3tag-compile mtr-compile: ncurses-compile -mysql-compile: ncurses-compile zlib-compile +mysql-compile: ncurses-compile zlib-compile readline-compile nano-compile: ncurses-compile net-snmp-compile: libelf-compile nfs-server-compile: portmap-compile @@ -320,7 +336,7 @@ peercast-compile: uclibc++-compile peerguardian-compile: libpthread-compile portmap-compile: tcp_wrappers-compile postgresql-compile: zlib-compile -ppp-compile: linux-atm-compile +ppp-compile: linux-atm-compile libpcap-compile ptunnel-compile: libpcap-compile quagga-compile: readline-compile ncurses-compile raddump-compile: openssl-compile libpcap-compile @@ -334,6 +350,7 @@ endif rrdtool-compile: cgilib-compile freetype-compile libart-compile libpng-compile rrdtool1-compile: zlib-compile rsync-compile: popt-compile +scanlogd-compile: libpcap-compile libnids-compile libnet-compile scdp-compile: libnet-compile screen-compile: ncurses-compile siproxd-compile: libosip2-compile @@ -341,6 +358,7 @@ sipsak-compile: openssl-compile socat-compile: openssl-compile sqlite-compile: ncurses-compile readline-compile sqlite2-compile: ncurses-compile readline-compile +ssltunnel-compile: openssl-compile ppp-compile tcpdump-compile: libpcap-compile tinc-compile: zlib-compile openssl-compile liblzo-compile tor-compile: libevent-compile openssl-compile zlib-compile @@ -349,10 +367,12 @@ vnc-reflector-compile: jpeg-compile zlib-compile vpnc-compile: libgcrypt-compile libgpg-error-compile vtun-compile: zlib-compile openssl-compile liblzo-compile wificonf-compile: wireless-tools-compile nvram-compile +wiviz-compile: libpcap-compile wknock-compile: libpcap-compile wpa_supplicant-compile: openssl-compile wx200d-compile: postgresql-compile xsupplicant-compile: openssl-compile +ipsec-tools-compile: openssl-compile asterisk-compile: bluez-libs-compile ncurses-compile openssl-compile ifneq ($(BR2_PACKAGE_ASTERISK_CODEC_SPEEX),) @@ -396,7 +416,9 @@ ifneq ($(BR2_PACKAGE_MPD_FLAC),) mpd-compile: flac-compile endif +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) openvpn-compile: openssl-compile +endif ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y) openvpn-compile: liblzo-compile endif @@ -466,6 +488,9 @@ endif ifneq ($(BR2_COMPILE_PMACCT_PGSQL),) pmacct-compile: postgresql-compile endif +ifneq ($(BR2_COMPILE_PMACCT_SQLITE),) +pmacct-compile: sqlite-compile +endif rrs-compile: uclibc++-compile ifneq ($(BR2_PACKAGE_RRS),) @@ -512,7 +537,7 @@ $(TARGET_DIR): %-prepare: $(STAMP_DIR) $(TARGET_DIR) @[ -f $(STAMP_DIR)/.$@ ] || { \ - $(START_TRACE) "package/$(patsubst %-prepare,%,$@)/prepare: "; \ + $(START_TRACE) "package/$(patsubst %-prepare,%,$@)-prepare: "; \ $(MAKE) -C $(patsubst %-prepare,%,$@) prepare && { \ touch $(STAMP_DIR)/.$@; \ $(CMD_TRACE) " done"; \ @@ -522,7 +547,7 @@ $(TARGET_DIR): %-compile: @[ -f $(STAMP_DIR)/.$@ ] || { \ - $(START_TRACE) "package/$(patsubst %-compile,%,$@)/compile: "; \ + $(START_TRACE) "package/$(patsubst %-compile,%,$@)-compile: "; \ $(MAKE) -C $(patsubst %-compile,%,$@) compile && { \ touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare; \ touch $(STAMP_DIR)/.$@; \ @@ -532,20 +557,20 @@ $(TARGET_DIR): } %-install: %-compile - @$(START_TRACE) "package/$(patsubst %-install,%,$@)/install: " + @$(START_TRACE) "package/$(patsubst %-install,%,$@)-install: " @$(MAKE) -C $(patsubst %-install,%,$@) install @$(CMD_TRACE) " done" @$(END_TRACE) %-rebuild: - @$(START_TRACE) "package/$(patsubst %-rebuild,%,$@)/rebuild: " + @$(START_TRACE) "package/$(patsubst %-rebuild,%,$@)-rebuild: " @rm -f $(STAMP_DIR)/.$(patsubst %-rebuild,%,$@)-* $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild @$(CMD_TRACE) " done" @$(END_TRACE) %-clean: - @$(START_TRACE) "package/$(patsubst %-clean,%,$@)/clean: " + @$(START_TRACE) "package/$(patsubst %-clean,%,$@)-clean: " @$(MAKE) -C $(patsubst %-clean,%,$@) clean @rm -f $(STAMP_DIR)/.$(patsubst %-clean,%,$@)-* @$(CMD_TRACE) " done"