[packages] xfce: Use nls.mk

Patch by xiangfu

SVN-Revision: 25481

diff --git a/xfce/app/orage/Makefile b/xfce/app/orage/Makefile
index 4e1eea45b5355f96ece157774fdaa9c1f5824142..a2424a8fdf62db7e98fcbde19227b8616ac8b496 100644 (file)
--- a/xfce/app/orage/Makefile
+++ b/xfce/app/orage/Makefile
@@ -19,13 +19,11 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -Wl,-rpath=/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib
+       -Wl,-rpath=/usr/lib
 
 define Package/orage
   SECTION:=xorg-app

diff --git a/xfce/app/thunar/Makefile b/xfce/app/thunar/Makefile
index fceaa72a61124b729e2d5e362eb2b4ce83a77d2b..5f0050526ee4a5b575ed073d8d70aff5bb06fb78 100644 (file)
--- a/xfce/app/thunar/Makefile
+++ b/xfce/app/thunar/Makefile
@@ -20,13 +20,11 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -Wl,-rpath=/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib
+       -Wl,-rpath=/usr/lib
 
 define Package/libthunar-vfs
   SECTION:=xorg-lib

diff --git a/xfce/app/xarchiver/Makefile b/xfce/app/xarchiver/Makefile
index c156157d82e89d1b25d149c04b0bdcf0929dbdf6..2bdcee6f978797c1652987872a4386a65ec403b6 100644 (file)
--- a/xfce/app/xarchiver/Makefile
+++ b/xfce/app/xarchiver/Makefile
@@ -19,13 +19,12 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -Wl,-rpath=/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib
+       -Wl,-rpath=/usr/lib
 
 define Package/xarchiver
   SECTION:=xorg-app

diff --git a/xfce/app/xfburn/Makefile b/xfce/app/xfburn/Makefile
index b239d0c6957ee028646cd08c3b18248ebd126069..1d0fb240581fc77c644245db87f189d6b463f3f3 100644 (file)
--- a/xfce/app/xfburn/Makefile
+++ b/xfce/app/xfburn/Makefile
@@ -19,13 +19,11 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -Wl,-rpath=/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib
+       -Wl,-rpath=/usr/lib
 
 define Package/xfburn
   SECTION:=xorg-app

diff --git a/xfce/app/xfce-mousepad/Makefile b/xfce/app/xfce-mousepad/Makefile
index 723b2029adc20372a8de0c5624881a86b1a1d47b..1ae741293f1abae79d2a07e710b2b122f1963312 100644 (file)
--- a/xfce/app/xfce-mousepad/Makefile
+++ b/xfce/app/xfce-mousepad/Makefile
@@ -19,13 +19,11 @@ PKG_MD5SUM:=d98854edb76d823ac20b266fdf5a64a1
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -Wl,-rpath=/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib
+       -Wl,-rpath=/usr/lib
 
 define Package/xfce-mousepad
   SECTION:=xorg-app

diff --git a/xfce/app/xfce-terminal/Makefile b/xfce/app/xfce-terminal/Makefile
index 4f937c35fbf72bc4ca3495c86bd3237551ffacd8..2c1ad2e09d3c33c96e8afe76fd341b7caad46870 100644 (file)
--- a/xfce/app/xfce-terminal/Makefile
+++ b/xfce/app/xfce-terminal/Makefile
@@ -19,13 +19,11 @@ PKG_MD5SUM:=adb419d279c9fc16d02291c052190717
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -Wl,-rpath=/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib
+       -Wl,-rpath=/usr/lib
 
 define Package/xfce-terminal
   SECTION:=xorg-app

diff --git a/xfce/app/xfce-utils/Makefile b/xfce/app/xfce-utils/Makefile
index 2b9ab5eff14a2aabf7b926239813cd1305f3be46..9df68eae1a3fdb883cc7d430fe93a2858eecef0c 100644 (file)
--- a/xfce/app/xfce-utils/Makefile
+++ b/xfce/app/xfce-utils/Makefile
@@ -19,13 +19,11 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -Wl,-rpath=/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib
+       -Wl,-rpath=/usr/lib
 
 define Package/xfce-utils
   SECTION:=xorg-app

diff --git a/xfce/app/xfce4-appfinder/Makefile b/xfce/app/xfce4-appfinder/Makefile
index 99943dfd27ac8d7330f98877ddf20049be9e27fc..f8b57643608d956ebe506bf742df807ba52a0071 100644 (file)
--- a/xfce/app/xfce4-appfinder/Makefile
+++ b/xfce/app/xfce4-appfinder/Makefile
@@ -19,13 +19,11 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -Wl,-rpath=/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib
+       -Wl,-rpath=/usr/lib
 
 define Package/xfce4-appfinder
   SECTION:=xorg-app

diff --git a/xfce/app/xfce4-mixer/Makefile b/xfce/app/xfce4-mixer/Makefile
index 057d25cfb263cbe44b24ccddad81ebe56e229106..d86afbd5ecc36e3bcf0e55b1f07306b1813bee8b 100644 (file)
--- a/xfce/app/xfce4-mixer/Makefile
+++ b/xfce/app/xfce4-mixer/Makefile
@@ -19,13 +19,11 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -Wl,-rpath=/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib
+       -Wl,-rpath=/usr/lib
 
 define Package/xfce4-mixer
   SECTION:=xorg-app

diff --git a/xfce/app/xfce4-panel/Makefile b/xfce/app/xfce4-panel/Makefile
index 88ce487a0a8d04210ac71d1838b51e57c224267b..a6e0c268824334470176dc097f7839815d7dc36b 100644 (file)
--- a/xfce/app/xfce4-panel/Makefile
+++ b/xfce/app/xfce4-panel/Makefile
@@ -19,13 +19,11 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -Wl,-rpath=/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib/
+       -Wl,-rpath=/usr/lib
 
 define Package/libxfce4-panel
   SECTION:=xorg-lib

diff --git a/xfce/app/xfce4-session/Makefile b/xfce/app/xfce4-session/Makefile
index d6117dd62b4ae1848a904b7ee673c3d55fe73291..b02ef1ba96b2b469f64777587a643f3d6a0254cc 100644 (file)
--- a/xfce/app/xfce4-session/Makefile
+++ b/xfce/app/xfce4-session/Makefile
@@ -19,13 +19,11 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -Wl,-rpath=/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib
+       -Wl,-rpath=/usr/lib
 
 define Package/xfce4-session
   SECTION:=xorg-app

diff --git a/xfce/app/xfce4-settings/Makefile b/xfce/app/xfce4-settings/Makefile
index 93e849bd215f55d4a282c6ca856b379e878ecf85..420c836abe8e72e014a470c50a469ba03e1db8ea 100644 (file)
--- a/xfce/app/xfce4-settings/Makefile
+++ b/xfce/app/xfce4-settings/Makefile
@@ -19,13 +19,11 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -Wl,-rpath=/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib
+       -Wl,-rpath=/usr/lib
 
 define Package/xfce4-settings
   SECTION:=xorg-app

diff --git a/xfce/app/xfconf/Makefile b/xfce/app/xfconf/Makefile
index 6cb746fa7957d5193d1ac334b6003b32c1f06003..1b356f5a87ee3b3dff4f5560cce8211255c86668 100644 (file)
--- a/xfce/app/xfconf/Makefile
+++ b/xfce/app/xfconf/Makefile
@@ -19,13 +19,11 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -Wl,-rpath=/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib
+       -Wl,-rpath=/usr/lib
 
 define Package/libxfconf
   SECTION:=xorg-app

diff --git a/xfce/app/xfdesktop/Makefile b/xfce/app/xfdesktop/Makefile
index 0c50c46d0cf91f6432f05ef0fcb4c078a85b74bd..7d48ab2e81ebdd404eb0fb9b56663a2660a593aa 100644 (file)
--- a/xfce/app/xfdesktop/Makefile
+++ b/xfce/app/xfdesktop/Makefile
@@ -19,13 +19,11 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -Wl,-rpath=/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib
+       -Wl,-rpath=/usr/lib
 
 define Package/xfdesktop
   SECTION:=xorg-app

diff --git a/xfce/app/xfmedia/Makefile b/xfce/app/xfmedia/Makefile
index 818948a60b2de2a5f7a62ac587262b1099e7b6da..94259562ad229b9be5e716b2dc9e4f1397678866 100644 (file)
--- a/xfce/app/xfmedia/Makefile
+++ b/xfce/app/xfmedia/Makefile
@@ -19,13 +19,11 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -Wl,-rpath=/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib
+       -Wl,-rpath=/usr/lib
 
 define Package/xfmedia
   SECTION:=xorg-app

diff --git a/xfce/app/xfprint/Makefile b/xfce/app/xfprint/Makefile
index c141b3bc1ecbeaa4602ae0bb316fcad373ef3d09..938ac84fbf6cb35153e18cceebfbca30c26741a3 100644 (file)
--- a/xfce/app/xfprint/Makefile
+++ b/xfce/app/xfprint/Makefile
@@ -19,13 +19,11 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -Wl,-rpath=/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib
+       -Wl,-rpath=/usr/lib
 
 define Package/xfprint
   SECTION:=xorg-app

diff --git a/xfce/data/gtk-xfce-engine/Makefile b/xfce/data/gtk-xfce-engine/Makefile
index 84cc1d8eb7e86fc1484745bbf018cc2e7d0b768a..6eb8a9eeeaa64674ff4f82bd1f9fb4e49411b6b1 100644 (file)
--- a/xfce/data/gtk-xfce-engine/Makefile
+++ b/xfce/data/gtk-xfce-engine/Makefile
@@ -19,13 +19,11 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -Wl,-rpath=/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib \
+       -Wl,-rpath=/usr/lib
 
 define Package/gtk-xfce-engine
   SECTION:=xorg-app

diff --git a/xfce/libs/libexo/Makefile b/xfce/libs/libexo/Makefile
index b92da6c847865efffdafffeedc3cf1ecf2e597c5..354bd49607304290a0cd733678aea0eee8e9f38f 100644 (file)
--- a/xfce/libs/libexo/Makefile
+++ b/xfce/libs/libexo/Makefile
@@ -19,13 +19,11 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -Wl,-rpath=/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib/
+       -Wl,-rpath=/usr/lib
 
 define Package/libexo
   SECTION:=xorg-framework

diff --git a/xfce/libs/libxfce4menu/Makefile b/xfce/libs/libxfce4menu/Makefile
index a73e037da80ef5c81f56d265be821537b6483d72..1af81c5d93a30c4bc6220f88c9ddf5fdf30d78a3 100644 (file)
--- a/xfce/libs/libxfce4menu/Makefile
+++ b/xfce/libs/libxfce4menu/Makefile
@@ -19,12 +19,7 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+= \
-    -I$(STAGING_DIR)/usr/lib/libintl/include
-
-TARGET_LDFLAGS+= \
-    -L$(STAGING_DIR)/usr/lib/libintl/lib
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/libxfce4menu
   SECTION:=xorg-framework

diff --git a/xfce/libs/libxfce4util/Makefile b/xfce/libs/libxfce4util/Makefile
index 57625e72c1b3b343ed908fb278d28ccc47c5901e..d5e90c9d17337f7e6777bb2b110c21e382aaa4e1 100644 (file)
--- a/xfce/libs/libxfce4util/Makefile
+++ b/xfce/libs/libxfce4util/Makefile
@@ -19,8 +19,7 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/libxfce4util
   SECTION:=xorg-framework

diff --git a/xfce/libs/libxfcegui4/Makefile b/xfce/libs/libxfcegui4/Makefile
index d054c9764c6883e4a7f9fb2995cabe38a67f9727..63ea0d1df2cb4e595956776537530e23c65590b2 100644 (file)
--- a/xfce/libs/libxfcegui4/Makefile
+++ b/xfce/libs/libxfcegui4/Makefile
@@ -19,12 +19,7 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+= \
-       -I$(STAGING_DIR)/usr/lib/libintl/include/
-
-TARGET_CFLAGS+= \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib/
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/libxfcegui4
   SECTION:=xorg-framework

diff --git a/xfce/wm/xfwm4/Makefile b/xfce/wm/xfwm4/Makefile
index fce8813f8a0363a55544b34050a1b53da41d58d4..3a4b78da8b6bfb9526684eb3dac874a06042bbc8 100644 (file)
--- a/xfce/wm/xfwm4/Makefile
+++ b/xfce/wm/xfwm4/Makefile
@@ -19,14 +19,11 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+= \
-    -I$(STAGING_DIR)/usr/lib/libintl/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -Wl,-rpath=/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib
+       -Wl,-rpath=/usr/lib
 
 define Package/xfwm4
   SECTION:=xorg-app