diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-31 16:50:53 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-31 16:50:53 +0200 |
commit | eee3718f1ec72f689f3a241af008e985819826df (patch) | |
tree | 6c3f58ac7adb7e2ce85f53ed71a418b656a5b162 /package/Makefile | |
parent | b74845e7a1608a96af70e1b3ae4c6c28e5052e7a (diff) | |
parent | 1cd31f169fab4ab0ce45617c161da3fec9f7359d (diff) |
Merge branch 'master' of ssh://openadk.org/git/openadk
Diffstat (limited to 'package/Makefile')
-rw-r--r-- | package/Makefile | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/package/Makefile b/package/Makefile index b6bb33f03..8a26c7113 100644 --- a/package/Makefile +++ b/package/Makefile @@ -106,8 +106,7 @@ package-$(ADK_PACKAGE_GDB) += gdb package-$(ADK_PACKAGE_GDBSERVER) += gdbserver package-$(ADK_PACKAGE_GETTEXT) += gettext package-$(ADK_PACKAGE_GKRELLMD) += gkrellmd -package-$(ADK_COMPILE_GLIB) += glib -package-$(ADK_PACKAGE_GLIB2) += glib2 +package-$(ADK_PACKAGE_GLIB) += glib ifeq (${ADK_TARGET_LIB_GLIBC},y) package-$(ADK_PACKAGE_GLIBC) += glibc endif @@ -165,7 +164,7 @@ package-$(ADK_PACKAGE_LIBFFI) += libffi package-$(ADK_PACKAGE_LIBFONTENC) += libfontenc package-$(ADK_PACKAGE_LIBGCRYPT) += libgcrypt package-$(ADK_PACKAGE_LIBGD) += libgd -package-$(ADK_PACKAGE_LIBGDBM) += libgdbm +package-$(ADK_PACKAGE_LIBGDBM) += gdbm package-$(ADK_PACKAGE_LIBGPG_ERROR) += libgpg-error package-$(ADK_PACKAGE_LIBGSSGLUE) += libgssglue package-$(ADK_PACKAGE_LIBICONV) += libiconv @@ -198,6 +197,7 @@ package-$(ADK_PACKAGE_LIBTORRENT) += libtorrent package-$(ADK_COMPILE_LIBTOOL) += libtool package-$(ADK_PACKAGE_LIBUPNP) += libupnp package-$(ADK_PACKAGE_LIBUSB) += libusb +package-$(ADK_PACKAGE_LIBUSB_COMPAT) += libusb-compat package-$(ADK_PACKAGE_LIBVORBIS) += libvorbis package-$(ADK_PACKAGE_LIBVORBISIDEC) += libvorbisidec package-$(ADK_PACKAGE_LIBICE) += libICE @@ -332,7 +332,6 @@ package-${ADK_PACKAGE_SHOREWALL_SHELL} += shorewall-shell package-$(ADK_PACKAGE_SIPROXD) += siproxd package-$(ADK_PACKAGE_SIPSAK) += sipsak package-$(ADK_PACKAGE_SISPMCTL) += sispmctl -package-$(ADK_PACKAGE_SLURM) += slurm package-$(ADK_COMPILE_SNORT) += snort package-$(ADK_COMPILE_SNORT_WIRELESS) += snort-wireless package-$(ADK_PACKAGE_SOCAT) += socat @@ -390,7 +389,6 @@ package-$(ADK_PACKAGE_WDFS) += wdfs package-$(ADK_PACKAGE_WEECHAT) += weechat package-$(ADK_PACKAGE_WIFIDOG) += wifidog package-$(ADK_DOWNLOAD_WIRELESS_FIRMWARE) += wireless-firmware -package-$(ADK_PACKAGE_WIRELESS_TOOLS) += wireless-tools package-$(ADK_PACKAGE_WOL) += wol package-$(ADK_PACKAGE_WONDERSHAPER) += wondershaper package-$(ADK_PACKAGE_WPA_SUPPLICANT) += wpa_supplicant |