From 24c1836c0ee152abe2c990a324c34093a76948e4 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 2 Feb 2011 20:43:07 +0000 Subject: [PATCH] use nls.mk SVN-Revision: 25331 --- lxde/apps/lxappearance/Makefile | 9 ++------- lxde/apps/lxpanel/Makefile | 9 ++------- lxde/apps/lxrandr/Makefile | 9 ++------- lxde/apps/lxsession-edit/Makefile | 9 ++------- lxde/apps/lxsession-lite/Makefile | 9 ++------- lxde/apps/lxshortcut/Makefile | 9 ++------- lxde/apps/lxtask/Makefile | 12 +++--------- lxde/apps/lxterminal/Makefile | 9 ++------- lxde/data/lxde-common/Makefile | 9 ++------- lxde/data/lxmenu-data/Makefile | 9 ++------- lxde/libs/libmenu-cache/Makefile | 9 ++------- 11 files changed, 23 insertions(+), 79 deletions(-) diff --git a/lxde/apps/lxappearance/Makefile b/lxde/apps/lxappearance/Makefile index 0b3c061..b06d05d 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 dd591c2..f0730da 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 373228b..5cc8995 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 02a47f4..59b08a8 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 415faf9..f8a157d 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 e7235cc..c8cd8bd 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 c1bd2ac..df08c4b 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 87a9727..3f4a289 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 c3fa694..a407937 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 d70cf2b..641e7d4 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 9974f93..a96c093 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 -- 2.30.2