diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-07-25 09:13:44 +0200 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-07-25 09:13:44 +0200 |
commit | 441c122606e3a921a947f4126a414c9974d64533 (patch) | |
tree | a6ad7f810150142b2d0f2a51ee49a1ddbff285a5 /package/dillo | |
parent | 8c1fc169ab7330ddaed774d1e780b9d81edb4f25 (diff) | |
parent | 74ecbaa23da486182a1bb20b43361aaf2a478877 (diff) | |
download | buildroot-novena-441c122606e3a921a947f4126a414c9974d64533.tar.gz buildroot-novena-441c122606e3a921a947f4126a414c9974d64533.zip |
Merge branch 'xorg' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/dillo')
-rw-r--r-- | package/dillo/Config.in | 15 | ||||
-rw-r--r-- | package/dillo/dillo.mk | 2 |
2 files changed, 7 insertions, 10 deletions
diff --git a/package/dillo/Config.in b/package/dillo/Config.in index f0682d9fd..87418d297 100644 --- a/package/dillo/Config.in +++ b/package/dillo/Config.in @@ -1,15 +1,12 @@ config BR2_PACKAGE_DILLO bool "dillo" - depends on BR2_PACKAGE_JPEG - depends on BR2_PACKAGE_LIBGLIB12 - depends on BR2_PACKAGE_LIBGTK12 - depends on BR2_PACKAGE_ZLIB - depends on BR2_PACKAGE_LIBPNG - depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7 + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBGLIB12 + select BR2_PACKAGE_LIBGTK12 + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_LIBPNG + depends on BR2_PACKAGE_XORG7 help Dillo is a small GTK+ based web browser written in C. http://www.dillo.org/ - -comment "dillo - disabled (requires jpeg,libglib12,libgtk12,zlib,libpng and Xorg(7))" - depends on !BR2_PACKAGE_JPEG || !BR2_PACKAGE_LIBGLIB12 || !BR2_PACKAGE_LIBGTK12 || !BR2_PACKAGE_ZLIB || !BR2_PACKAGE_LIBPNG || !(BR2_PACKAGE_XORG || BR2_PACKAGE_XORG7) diff --git a/package/dillo/dillo.mk b/package/dillo/dillo.mk index 12d9a5ce1..1dcfd5557 100644 --- a/package/dillo/dillo.mk +++ b/package/dillo/dillo.mk @@ -39,7 +39,7 @@ $(DILLO_DIR)/.installed: $(DILLO_DIR)/src/dillo $(MAKE) -C $(DILLO_DIR) DESTDIR=$(TARGET_DIR) install touch $(DILLO_DIR)/.installed -dillo: uclibc $(XSERVER) libglib12 libgtk12 jpeg libpng $(DILLO_DIR)/.installed +dillo: uclibc xserver_xorg-server libglib12 libgtk12 jpeg libpng $(DILLO_DIR)/.installed dillo-source: $(DL_DIR)/$(DILLO_SOURCE) |