projects / openwrt / svn-archive / archive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7210006)
[lxde] use nls.mk
authorJo-Philipp Wich <jow@openwrt.org>
Wed, 2 Feb 2011 20:43:07 +0000 (20:43 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Wed, 2 Feb 2011 20:43:07 +0000 (20:43 +0000)
SVN-Revision: 25331

lxde/apps/lxappearance/Makefile patch | blob | history
lxde/apps/lxpanel/Makefile patch | blob | history
lxde/apps/lxrandr/Makefile patch | blob | history
lxde/apps/lxsession-edit/Makefile patch | blob | history
lxde/apps/lxsession-lite/Makefile patch | blob | history
lxde/apps/lxshortcut/Makefile patch | blob | history
lxde/apps/lxtask/Makefile patch | blob | history
lxde/apps/lxterminal/Makefile patch | blob | history
lxde/data/lxde-common/Makefile patch | blob | history
lxde/data/lxmenu-data/Makefile patch | blob | history
lxde/libs/libmenu-cache/Makefile patch | blob | history

diff --git a/lxde/apps/lxappearance/Makefile b/lxde/apps/lxappearance/Makefile
index 0b3c06185ded53ba40fe06ef5783e25a10eb7c8d..b06d05dbd6b0d8aecea54dd578ebf96ea827a2a0 100644 (file)
--- a/lxde/apps/lxappearance/Makefile
+++ b/lxde/apps/lxappearance/Makefile
@@ -19,15 +19,10 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+= \
-    -I$(STAGING_DIR)/usr/lib/libintl/include/ \
-    -I$(STAGING_DIR)/usr/lib/libiconv/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
-       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib \
-       -L$(STAGING_DIR)/usr/lib/libiconv/lib
+       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/lxappearance
   SECTION:=xorg-app
diff --git a/lxde/apps/lxpanel/Makefile b/lxde/apps/lxpanel/Makefile
index dd591c25bbd7fe1772dd2799f75c4f782879adda..f0730da6e7484a93769c36e8e09903ebf318dbcb 100644 (file)
--- a/lxde/apps/lxpanel/Makefile
+++ b/lxde/apps/lxpanel/Makefile
@@ -19,15 +19,10 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+= \
-       -I$(STAGING_DIR)/usr/lib/libintl/include/ \
-       -I$(STAGING_DIR)/usr/lib/libiconv/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
-       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib \
-       -L$(STAGING_DIR)/usr/lib/libiconv/lib
+       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/lxpanel
   SECTION:=xorg-app
diff --git a/lxde/apps/lxrandr/Makefile b/lxde/apps/lxrandr/Makefile
index 373228b54dd9e9ea5f06913d3284f7ca91dbb702..5cc8995b9191718ca0a6b5250041b3cbc37ba76e 100644 (file)
--- a/lxde/apps/lxrandr/Makefile
+++ b/lxde/apps/lxrandr/Makefile
@@ -19,15 +19,10 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+= \
-    -I$(STAGING_DIR)/usr/lib/libintl/include/ \
-    -I$(STAGING_DIR)/usr/lib/libiconv/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
-       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib \
-       -L$(STAGING_DIR)/usr/lib/libiconv/lib
+       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/lxrandr
   SECTION:=xorg-app
diff --git a/lxde/apps/lxsession-edit/Makefile b/lxde/apps/lxsession-edit/Makefile
index 02a47f4488c063546fa2783605b4384973741e33..59b08a8ebddee374a465f72e7dbde9707c5822e5 100644 (file)
--- a/lxde/apps/lxsession-edit/Makefile
+++ b/lxde/apps/lxsession-edit/Makefile
@@ -19,15 +19,10 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+= \
-    -I$(STAGING_DIR)/usr/lib/libintl/include/ \
-    -I$(STAGING_DIR)/usr/lib/libiconv/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
-       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib \
-       -L$(STAGING_DIR)/usr/lib/libiconv/lib
+       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/lxsession-edit
   SECTION:=xorg-app
diff --git a/lxde/apps/lxsession-lite/Makefile b/lxde/apps/lxsession-lite/Makefile
index 415faf9031f94e240014205b30c370a12af676e7..f8a157d42f2a2e5c45e608e3775eb09aab74e012 100644 (file)
--- a/lxde/apps/lxsession-lite/Makefile
+++ b/lxde/apps/lxsession-lite/Makefile
@@ -19,15 +19,10 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+= \
-    -I$(STAGING_DIR)/usr/lib/libintl/include/ \
-    -I$(STAGING_DIR)/usr/lib/libiconv/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
-       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib \
-       -L$(STAGING_DIR)/usr/lib/libiconv/lib
+       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/lxsession-lite
   SECTION:=xorg-app
diff --git a/lxde/apps/lxshortcut/Makefile b/lxde/apps/lxshortcut/Makefile
index e7235ccc5612e5e74c55c315d1e21c0607e87d16..c8cd8bd2406d35782807fc29687c96327f47f03e 100644 (file)
--- a/lxde/apps/lxshortcut/Makefile
+++ b/lxde/apps/lxshortcut/Makefile
@@ -19,15 +19,10 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+= \
-    -I$(STAGING_DIR)/usr/lib/libintl/include/ \
-    -I$(STAGING_DIR)/usr/lib/libiconv/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
-       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib \
-       -L$(STAGING_DIR)/usr/lib/libiconv/lib
+       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/lxshortcut
   SECTION:=xorg-app
diff --git a/lxde/apps/lxtask/Makefile b/lxde/apps/lxtask/Makefile
index c1bd2acf4327e65825b56616886e3e3549ba38e3..df08c4b76b76191cf2324c82598855acadc784d8 100644 (file)
--- a/lxde/apps/lxtask/Makefile
+++ b/lxde/apps/lxtask/Makefile
@@ -19,23 +19,17 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+= \
-    -I$(STAGING_DIR)/usr/lib/libintl/include/ \
-    -I$(STAGING_DIR)/usr/lib/libiconv/include/ \
-    -include $(STAGING_DIR)/usr/include/libintl.h
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
-       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib \
-       -L$(STAGING_DIR)/usr/lib/libiconv/lib
+       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/lxtask
   SECTION:=xorg-app
   CATEGORY:=Xorg
   SUBMENU:=app
   TITLE:=lxtask
-  DEPENDS:=+gtk2 +lxde-common +libintl +libiconv
+  DEPENDS:=+gtk2 +lxde-common $(ICONV_DEPENDS) $(INTL_DEPENDS)
 endef
 
 define Package/lxtask/install
diff --git a/lxde/apps/lxterminal/Makefile b/lxde/apps/lxterminal/Makefile
index 87a97276882b8352e2748b4dd68b5ddc4db792f8..3f4a289d412b80fba47651291ce6217ca9e59cd1 100644 (file)
--- a/lxde/apps/lxterminal/Makefile
+++ b/lxde/apps/lxterminal/Makefile
@@ -19,15 +19,10 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+= \
-    -I$(STAGING_DIR)/usr/lib/libintl/include/ \
-    -I$(STAGING_DIR)/usr/lib/libiconv/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
-       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib \
-       -L$(STAGING_DIR)/usr/lib/libiconv/lib
+       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/lxterminal
   SECTION:=xorg-app
diff --git a/lxde/data/lxde-common/Makefile b/lxde/data/lxde-common/Makefile
index c3fa694b2ea0de17b6d0163936057819a465fefd..a40793783ac6c36268fb8612a3bbc0aacd7e47ac 100644 (file)
--- a/lxde/data/lxde-common/Makefile
+++ b/lxde/data/lxde-common/Makefile
@@ -19,15 +19,10 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+= \
-       -I$(STAGING_DIR)/usr/lib/libintl/include/ \
-       -I$(STAGING_DIR)/usr/lib/libiconv/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
-       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib \
-       -L$(STAGING_DIR)/usr/lib/libiconv/lib
+       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/lxde-common
   SECTION:=xorg-app
diff --git a/lxde/data/lxmenu-data/Makefile b/lxde/data/lxmenu-data/Makefile
index d70cf2b413e4e09b50e76d1e4ae08303e47d5a33..641e7d41e2488b2193dd7ef79ba701689b8d3c42 100644 (file)
--- a/lxde/data/lxmenu-data/Makefile
+++ b/lxde/data/lxmenu-data/Makefile
@@ -19,15 +19,10 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+= \
-       -I$(STAGING_DIR)/usr/lib/libintl/include/ \
-       -I$(STAGING_DIR)/usr/lib/libiconv/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
-       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib \
-       -L$(STAGING_DIR)/usr/lib/libiconv/lib
+       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/lxmenu-data
   SECTION:=xorg-app
diff --git a/lxde/libs/libmenu-cache/Makefile b/lxde/libs/libmenu-cache/Makefile
index 9974f9332b017945f84c1e0d82c491397a3a5cf1..a96c093d007fca04fc83139cf9d7511b7f36a914 100644 (file)
--- a/lxde/libs/libmenu-cache/Makefile
+++ b/lxde/libs/libmenu-cache/Makefile
@@ -18,17 +18,12 @@ PKG_MD5SUM:=
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 PKG_INSTALL=1
 
-TARGET_CFLAGS+= \
-       -I$(STAGING_DIR)/usr/lib/libintl/include/ \
-       -I$(STAGING_DIR)/usr/lib/libiconv/include/
-
 TARGET_LDFLAGS+= \
-       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib \
-       -L$(STAGING_DIR)/usr/lib/libiconv/lib
+       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/libmenu-cache
   SECTION:=xorg-app
OpenWrt SVN history