remove circular dependency,

[openwrt.git] / openwrt / package / Makefile

diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index 99447a8..dcb695f 100644 (file)
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -121,6 +121,7 @@ package-$(BR2_PACKAGE_OPENSSL) += openssl
 package-$(BR2_PACKAGE_OPENSWAN) += openswan
 package-$(BR2_PACKAGE_OPENVPN) += openvpn
 package-$(BR2_PACKAGE_OSIRIS) += osiris
 package-$(BR2_PACKAGE_OPENSWAN) += openswan
 package-$(BR2_PACKAGE_OPENVPN) += openvpn
 package-$(BR2_PACKAGE_OSIRIS) += osiris

+package-$(BR2_PACKAGE_PALANTIR) += palantir

 package-$(BR2_PACKAGE_PARPROUTED) += parprouted
 package-$(BR2_PACKAGE_PCRE) += pcre
 package-$(BR2_COMPILE_PHP4) += php4
 package-$(BR2_PACKAGE_PARPROUTED) += parprouted
 package-$(BR2_PACKAGE_PCRE) += pcre
 package-$(BR2_COMPILE_PHP4) += php4


@@ -238,6 +239,7 @@ openssh-compile: zlib-compile openssl-compile
 openssl-compile: zlib-compile
 openswan-compile: gmp-compile
 osiris-compile: openssl-compile
 openssl-compile: zlib-compile
 openswan-compile: gmp-compile
 osiris-compile: openssl-compile

+palantir-compile: jpeg-compile

 portmap-compile: tcp_wrappers-compile
 postgresql-compile: zlib-compile
 ppp-compile: linux-atm-compile
 portmap-compile: tcp_wrappers-compile
 postgresql-compile: zlib-compile
 ppp-compile: linux-atm-compile


@@ -322,9 +324,15 @@ php4-compile: expat-compile
 endif
 
 php5-compile: openssl-compile zlib-compile
 endif
 
 php5-compile: openssl-compile zlib-compile

+ifneq ($(BR2_PACKAGE_PHP5_MOD_CURL),)
+php5-compile: curl-compile
+endif

 ifneq ($(BR2_PACKAGE_PHP5_MOD_GD),)
 php5-compile: libgd-compile libpng-compile
 endif
 ifneq ($(BR2_PACKAGE_PHP5_MOD_GD),)
 php5-compile: libgd-compile libpng-compile
 endif

+ifneq ($(BR2_PACKAGE_PHP5_MOD_GMP),)
+php5-compile: gmp-compile
+endif

 ifneq ($(BR2_PACKAGE_PHP5_MOD_LDAP),)
 php5-compile: openldap-compile
 endif
 ifneq ($(BR2_PACKAGE_PHP5_MOD_LDAP),)
 php5-compile: openldap-compile
 endif