From: Lars-Peter Clausen Date: Sat, 12 Feb 2011 18:26:52 +0000 (+0000) Subject: xfce: Use nls.mk Patch by xiangfu X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=8cff2ff74637a7f855db751ae9daf644f9fad175;p=openwrt%2Fsvn-archive%2Ffeeds.git xfce: Use nls.mk Patch by xiangfu SVN-Revision: 25481 --- diff --git a/xfce/app/orage/Makefile b/xfce/app/orage/Makefile index 4e1eea4..a2424a8 100644 --- 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 fceaa72..5f00505 100644 --- 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 c156157..2bdcee6 100644 --- 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 b239d0c..1d0fb24 100644 --- 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 723b202..1ae7412 100644 --- 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 4f937c3..2c1ad2e 100644 --- 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 2b9ab5e..9df68ea 100644 --- 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 99943df..f8b5764 100644 --- 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 057d25c..d86afbd 100644 --- 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 88ce487..a6e0c26 100644 --- 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 d6117dd..b02ef1b 100644 --- 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 93e849b..420c836 100644 --- 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 6cb746f..1b356f5 100644 --- 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 0c50c46..7d48ab2 100644 --- 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 818948a..9425956 100644 --- 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 c141b3b..938ac84 100644 --- 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 84cc1d8..6eb8a9e 100644 --- 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 b92da6c..354bd49 100644 --- 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 a73e037..1af81c5 100644 --- 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 57625e7..d5e90c9 100644 --- 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 d054c97..63ea0d1 100644 --- 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 fce8813..3a4b78d 100644 --- 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