diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-08-14 16:22:31 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-08-14 16:22:31 +0000 |
| commit | 5c53387d3a5f0422ae2c93477dad755e1b83bb92 (patch) | |
| tree | e59a91c5ad2c6141c12a28b51ba8c79e863ab992 /openwrt/package/Makefile | |
| parent | 12142a2b5d946082d69c44067b12d0e4dc2c5878 (diff) | |
change config screen,
fix build dependencies,
make -mod-xml use expat instead of builtin xml impl,
bump release number.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1666 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/package/Makefile')
| -rw-r--r-- | openwrt/package/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile index e855e6f4ec..0344b79f44 100644 --- a/openwrt/package/Makefile +++ b/openwrt/package/Makefile @@ -105,7 +105,7 @@ package-$(BR2_PACKAGE_OPENVPN) += openvpn package-$(BR2_PACKAGE_OSIRIS) += osiris package-$(BR2_PACKAGE_PARPROUTED) += parprouted package-$(BR2_PACKAGE_PCRE) += pcre -package-$(BR2_PACKAGE_PHP4) += php4 +package-$(BR2_COMPILE_PHP4) += php4 package-$(BR2_PACKAGE_PICOCOM) += picocom package-$(BR2_PACKAGE_PMACCT) += pmacct package-$(BR2_PACKAGE_POPT) += popt @@ -250,6 +250,7 @@ ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y) openvpn-compile: lzo-compile endif +php4-compile: openssl-compile zlib-compile ifneq ($(BR2_PACKAGE_PHP4_MOD_GD),) php4-compile: libgd-compile libpng-compile endif @@ -259,9 +260,6 @@ endif ifneq ($(BR2_PACKAGE_PHP4_MOD_MYSQL),) php4-compile: mysql-compile endif -ifneq ($(BR2_PACKAGE_PHP4_MOD_OPENSSL),) -php4-compile: openssl-compile -endif ifneq ($(BR2_PACKAGE_PHP4_MOD_PCRE),) php4-compile: pcre-compile endif @@ -271,6 +269,9 @@ endif ifneq ($(BR2_PACKAGE_PHP4_MOD_SQLITE),) php4-compile: sqlite2-compile endif +ifneq ($(BR2_PACKAGE_PHP4_MOD_XML),) +php4-compile: expat-compile +endif pmacct-compile: libpcap-compile ifneq ($(BR2_PACKAGE_PMACCT_MYSQL),) |