summaryrefslogtreecommitdiffstats
path: root/package/libgtk12
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-07-25 09:13:44 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2009-07-25 09:13:44 +0200
commit441c122606e3a921a947f4126a414c9974d64533 (patch)
treea6ad7f810150142b2d0f2a51ee49a1ddbff285a5 /package/libgtk12
parent8c1fc169ab7330ddaed774d1e780b9d81edb4f25 (diff)
parent74ecbaa23da486182a1bb20b43361aaf2a478877 (diff)
downloadbuildroot-novena-441c122606e3a921a947f4126a414c9974d64533.tar.gz
buildroot-novena-441c122606e3a921a947f4126a414c9974d64533.zip
Merge branch 'xorg' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/libgtk12')
-rw-r--r--package/libgtk12/Config.in2
-rw-r--r--package/libgtk12/libgtk12.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/package/libgtk12/Config.in b/package/libgtk12/Config.in
index e0f643ff2..01393f96f 100644
--- a/package/libgtk12/Config.in
+++ b/package/libgtk12/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_LIBGTK12
bool "libgtk12"
select BR2_PACKAGE_LIBGLIB12
- depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX
+ depends on BR2_PACKAGE_XORG7
help
The GTK+ graphical user interface library
diff --git a/package/libgtk12/libgtk12.mk b/package/libgtk12/libgtk12.mk
index a578ae8ae..bb121f01d 100644
--- a/package/libgtk12/libgtk12.mk
+++ b/package/libgtk12/libgtk12.mk
@@ -86,7 +86,7 @@ $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1: $(STAGING_DIR)/lib/$(LIBGTK12_BINARY)
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgdk-1.2.so.0.9.1
touch -c $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1
-libgtk12: uclibc libglib12 $(XSERVER) $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1
+libgtk12: uclibc libglib12 xserver_xorg-server $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1
libgtk12-clean:
rm -f $(TARGET_DIR)/lib/libgtk* $(TARGET_DIR)/lib/libgdk*