bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] gtk2: depend on glib2, remove libintl, libiconv stuff, that is glib2's business

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@24831 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2010-12-26 03:52:33 +00:00
parent 811305a921
commit 29abf25387
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Xorg/lib/gtk2/Makefile
View File

@ -21,14 +21,8 @@ PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
TARGET_CFLAGS+=\
-I$(STAGING_DIR)/usr/lib/libintl/include/ \
-I$(STAGING_DIR)/usr/lib/libiconv/include/
TARGET_LDFLAGS+=\ TARGET_LDFLAGS+=\
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-L$(STAGING_DIR)/usr/lib/libiconv/lib/
STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_gtk2 CONFIG_PACKAGE_gtk2-cups) STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_gtk2 CONFIG_PACKAGE_gtk2-cups)
@ -39,7 +33,7 @@ define Package/gtk2
CATEGORY:=Xorg CATEGORY:=Xorg
SUBMENU:=framework SUBMENU:=framework
TITLE:=GTK+-2.0 TITLE:=GTK+-2.0
DEPENDS:=@DISPLAY_SUPPORT +cairo +pango +libpng +libjpeg +atk +libtiff \ DEPENDS:=@DISPLAY_SUPPORT +cairo +pango +libpng +libjpeg +atk +libtiff +glib2 \
+FEATURE_drawing-backend_DirectFB:directfb \ +FEATURE_drawing-backend_DirectFB:directfb \
+FEATURE_drawing-backend_libX11:libX11 \ +FEATURE_drawing-backend_libX11:libX11 \
+FEATURE_drawing-backend_libX11:libXext \ +FEATURE_drawing-backend_libX11:libXext \