From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 2 Feb 2011 20:42:37 +0000 (+0000)
Subject: [efl] use nls.mk
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=db29829e7177f2b572ddf04da169b0786c4fd986;p=openwrt%2Fsvn-archive%2Farchive.git

[efl] use nls.mk


SVN-Revision: 25329
---

diff --git a/efl/ecore/Makefile b/efl/ecore/Makefile
index 6878634d5f..954c64e1ea 100644
--- a/efl/ecore/Makefile
+++ b/efl/ecore/Makefile
@@ -26,6 +26,7 @@ PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/ecore
   SECTION:=xorg-lib
@@ -33,8 +34,8 @@ define Package/ecore
   SUBMENU:=libraries
   TITLE:=Ecore is the core event abstraction layer and X abstraction layer
   URL:=http://wiki.enlightenment.org/index.php/Ecore
-  DEPENDS:=+fribidi +eina +evas +libiconv +libintl +libXtst +libXrandr +libX11 \
-  +libXcursor +libXdpms @!LINUX_2_4
+  DEPENDS:=+fribidi +eina +evas +libXtst +libXrandr +libX11 \
+	+libXcursor +libXdpms @!LINUX_2_4 $(ICONV_DEPENDS) $(INTL_DEPENDS)
 endef
 
 define Package/ecore/description
@@ -42,9 +43,8 @@ define Package/ecore/description
 endef
 
 # iconv needed for ecore-txt
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include
 TARGET_LDFLAGS+= \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib -liconv \
+	-liconv \
 	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
 	-Wl,-rpath=/usr/lib \
 
diff --git a/efl/python-ecore/Makefile b/efl/python-ecore/Makefile
index f4f53cb095..402ad95032 100644
--- a/efl/python-ecore/Makefile
+++ b/efl/python-ecore/Makefile
@@ -23,6 +23,7 @@ PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/BINDINGS/python/$(PKG_N
 PKG_BUILD_DEPENDS:=cython python
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 -include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
 
 define Package/python-ecore
@@ -37,9 +38,6 @@ define Package/python-ecore/description
   ecore python bindings
 endef
 
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include
-TARGET_LDFLAGS+=-liconv -L$(STAGING_DIR)/usr/lib/libiconv/lib
-
 define Build/Compile
 	$(call Build/Compile/PyMod,,install --prefix="$(PKG_INSTALL_DIR)/usr")
 endef
diff --git a/efl/python-elementary/Makefile b/efl/python-elementary/Makefile
index f11f0bb2d6..c8632e7e52 100644
--- a/efl/python-elementary/Makefile
+++ b/efl/python-elementary/Makefile
@@ -23,6 +23,7 @@ PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/BINDINGS/python/$(PKG_N
 PKG_BUILD_DEPENDS:=cython python
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 -include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
 
 define Package/python-elementary
@@ -37,9 +38,6 @@ define Package/python-elementary/description
   elementary python bindings
 endef
 
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include
-TARGET_LDFLAGS+=-liconv -L$(STAGING_DIR)/usr/lib/libiconv/lib
-
 define Build/Compile
 	$(call Build/Compile/PyMod,,install --prefix="$(PKG_INSTALL_DIR)/usr")
 endef
diff --git a/efl/python-etk/Makefile b/efl/python-etk/Makefile
index 1ba7d766cb..a0fa2d4732 100644
--- a/efl/python-etk/Makefile
+++ b/efl/python-etk/Makefile
@@ -23,6 +23,7 @@ PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/OLD/BINDINGS/python/$(P
 PKG_BUILD_DEPENDS:=cython python
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 -include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
 
 define Package/python-etk
@@ -37,9 +38,6 @@ define Package/python-etk/description
   etk python bindings
 endef
 
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include
-TARGET_LDFLAGS+=-liconv -L$(STAGING_DIR)/usr/lib/libiconv/lib
-
 define Build/Compile
 	$(call Build/Compile/PyMod,,install --prefix="$(PKG_INSTALL_DIR)/usr")
 endef