fix missing x86 dependency to some XOrg makefiles

[openwrt/svn-archive/archive.git] / XOrg / lib / gtk-2.8.20 / Makefile

diff --git a/XOrg/lib/gtk-2.8.20/Makefile b/XOrg/lib/gtk-2.8.20/Makefile
index 6eb3e097a723c21172e8188c39c936fa931da9da..027f4e6c96216264acede74fcd94a63f417ceb3b 100644 (file)
--- a/XOrg/lib/gtk-2.8.20/Makefile
+++ b/XOrg/lib/gtk-2.8.20/Makefile
@@ -18,17 +18,16 @@ PKG_BUILD_DIR=$(BUILD_DIR)/gtk+-2.8.20
 
 include $(INCLUDE_DIR)/package.mk
 
-EXTRA_CFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -I$(STAGING_DIR)/usr/lib/libintl/include/
+EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
 
-#needed as -lintl is nor in $(STAGING_DIR)/usr/lib ?!?!
-EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib/libintl/lib/ -L$(STAGING_DIR)/usr/lib/
+EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libintl/lib/ -L$(STAGING_DIR)/usr/lib/libiconv/lib/ -L$(STAGING_DIR)/usr/lib/
 
 define Package/gtk-2.8.20
   SECTION:=xorg-framework
   CATEGORY:=Xorg
   SUBMENU:=framework
   TITLE:=GTK+ 2.8.20 package
-  DEPENDS:=+cairo +pango +libjpeg
+  DEPENDS:=+cairo +pango +libjpeg +atk +libtiff @TARGET_x86
 endef
 
 define Build/Configure
@@ -49,13 +48,11 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       $(INSTALL_DIR)  $(STAGING_DIR)/usr/{lib/pkgconfig,include}
-       $(CP) -r $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{la,so} $(STAGING_DIR)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) "s,"prefix\=.*",prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/{gtk,gdk}*.pc
-       $(SED) "s,"exec_prefix\=.*",exec_prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/{gtk,gdk}*.pc
-       $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/lib{gtk,gdk}*.la
+       $(INSTALL_DIR)  $(1)/usr/{lib/pkgconfig,include}
+       $(CP) -r $(PKG_INSTALL_DIR)/usr/include/* $(1)/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{la,so.*} $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
+       $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/lib{gtk,gdk}*-2.0.la
 endef
 
 $(eval $(call BuildPackage,gtk-2.8.20))