change cp to $(CP)

[openwrt.git] / openwrt / package / Makefile

diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index 7b1a742..f2ad1c2 100644 (file)
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -11,6 +11,7 @@ package-$(BR2_PACKAGE_ARPWATCH) += arpwatch
 package-$(BR2_PACKAGE_ASTERISK) += asterisk
 package-$(BR2_COMPILE_ATFTP) += atftp
 package-$(BR2_COMPILE_AVAHI) += avahi
+package-$(BR2_COMPILE_BC) += bc
 package-$(BR2_COMPILE_BIND) += bind
 package-$(BR2_PACKAGE_BLUEZ_LIBS) += bluez-libs
 package-$(BR2_PACKAGE_BLUEZ_UTILS) += bluez-utils
@@ -20,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_COLLECTD) += collectd
 package-$(BR2_PACKAGE_CUPS) += cups
 package-$(BR2_COMPILE_CURL) += curl
 package-$(BR2_PACKAGE_CUTTER) += cutter
@@ -54,6 +56,7 @@ package-$(BR2_COMPILE_GNUTLS) += gnutls
 package-$(BR2_PACKAGE_GPSD) += gpsd
 package-$(BR2_COMPILE_GSM) += gsm
 package-$(BR2_PACKAGE_HASERL) += haserl
+package-$(BR2_PACKAGE_HEYU) += heyu
 package-$(BR2_PACKAGE_HOSTAP_UTILS) += hostap-utils
 package-$(BR2_PACKAGE_HOSTAPD) += hostapd
 package-$(BR2_COMPILE_HOWL) += howl
@@ -111,10 +114,10 @@ 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_LRZSZ) += lrzsz
 package-$(BR2_COMPILE_LUA) += lua
 package-$(BR2_PACKAGE_MACCHANGER) += macchanger
 package-$(BR2_PACKAGE_MADPLAY) += madplay
-package-$(BR2_PACKAGE_MADWIFI_TOOLS) += madwifi-tools
 package-$(BR2_PACKAGE_MARADNS) += maradns
 package-$(BR2_COMPILE_MATRIXSSL) += matrixssl
 package-$(BR2_PACKAGE_MIAX) += miax
@@ -125,6 +128,7 @@ 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_MRD6) += mrd6
 package-$(BR2_PACKAGE_MT_DAAPD) += mt-daapd
 package-$(BR2_PACKAGE_MTD) += mtd
 package-$(BR2_PACKAGE_MTR) += mtr
@@ -133,6 +137,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
@@ -143,6 +148,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
@@ -158,6 +164,7 @@ package-$(BR2_PACKAGE_PEERGUARDIAN) += peerguardian
 package-$(BR2_COMPILE_PHP4) += php4
 package-$(BR2_COMPILE_PHP5) += php5
 package-$(BR2_PACKAGE_PICOCOM) += picocom
+package-$(BR2_PACKAGE_PIPACS) += pipacs
 package-$(BR2_COMPILE_PMACCT) += pmacct
 package-$(BR2_COMPILE_POPT) += popt
 package-$(BR2_PACKAGE_PORTMAP) += portmap
@@ -187,7 +194,6 @@ package-$(BR2_PACKAGE_SANE_BACKENDS) += sane-backends
 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
@@ -207,9 +213,11 @@ 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
@@ -223,6 +231,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
@@ -234,6 +243,7 @@ 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_PACKAGE_WX200D) += wx200d
 package-$(BR2_PACKAGE_XINETD) += xinetd
 package-$(BR2_PACKAGE_XSUPPLICANT) += xsupplicant
 package-$(BR2_PACKAGE_ZLIB) += zlib
@@ -256,6 +266,7 @@ $(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
 curl-compile: openssl-compile zlib-compile
@@ -296,7 +307,7 @@ miax-compile: bluez-libs-compile
 miredo-compile: uclibc++-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
@@ -342,9 +353,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),)
@@ -504,7 +518,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"; \
@@ -514,7 +528,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)/.$@; \
@@ -524,20 +538,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"