From: Jo-Philipp Wich Date: Wed, 2 Feb 2011 20:43:07 +0000 (+0000) Subject: [lxde] use nls.mk X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=768e98bb416d34187414dda6d7f7e10d5888dfe6;p=openwrt%2Fsvn-archive%2Farchive.git [lxde] use nls.mk SVN-Revision: 25331 --- diff --git a/lxde/apps/lxappearance/Makefile b/lxde/apps/lxappearance/Makefile index 0b3c06185d..b06d05dbd6 100644 --- 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 dd591c25bb..f0730da6e7 100644 --- 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 373228b54d..5cc8995b91 100644 --- 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 02a47f4488..59b08a8ebd 100644 --- 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 415faf9031..f8a157d42f 100644 --- 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 e7235ccc56..c8cd8bd240 100644 --- 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 c1bd2acf43..df08c4b76b 100644 --- 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 87a9727688..3f4a289d41 100644 --- 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 c3fa694b2e..a40793783a 100644 --- 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 d70cf2b413..641e7d41e2 100644 --- 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 9974f9332b..a96c093d00 100644 --- 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