diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/Depends.mk | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/Depends.mk')
| -rw-r--r-- | package/Depends.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/package/Depends.mk b/package/Depends.mk index d60000e6b..a606e3756 100644 --- a/package/Depends.mk +++ b/package/Depends.mk @@ -36,7 +36,7 @@ endif davfs2-compile: libiconv-compile neon-compile dbus-compile: expat-compile deco-compile: ncurses-compile -dhcp6-compile: ncurses-compile +dhcpv6-compile: libnl-compile ncurses-compile digitemp-compile: libusb-compile dsniff-compile: libnids-compile openssl-compile libgdbm-compile elinks-compile: openssl-compile @@ -76,7 +76,6 @@ ifeq (${ADK_COMPILE_IPERF_WITH_UCLIBCXX},y) iperf-compile: uclibc++-compile endif ipsec-tools-compile: openssl-compile -iptables-snmp-compile: net-snmp-compile iptraf-compile: ncurses-compile irssi-compile: glib2-compile ncurses-compile iw-compile: libnl-compile @@ -151,7 +150,6 @@ ifeq (${ADK_COMPILE_NMAP_WITH_UCLIBCXX},y) nmap-compile: uclibc++-compile endif nmap-compile: pcre-compile libpcap-compile -nocatsplash-compile: glib-compile obexftp-compile: openobex-compile libiconv-compile opencdk-compile: libgcrypt-compile libgpg-error-compile zlib-compile openct-compile: libtool-compile libusb-compile |