projects / openwrt / svn-archive / feeds.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 44f5b44)
use nls.mk
authorJo-Philipp Wich <jow@openwrt.org>
Wed, 2 Feb 2011 20:42:51 +0000 (20:42 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Wed, 2 Feb 2011 20:42:51 +0000 (20:42 +0000)
SVN-Revision: 25330

desktop/apps/gpxview/Makefile patch | blob | history
desktop/apps/recordmydesktop/Makefile patch | blob | history
desktop/apps/tangogps/Makefile patch | blob | history
desktop/libs/gtkhtml/Makefile patch | blob | history
desktop/libs/libgamin/Makefile patch | blob | history
desktop/libs/libglade/Makefile patch | blob | history
desktop/libs/libisofs/Makefile patch | blob | history
desktop/libs/libstartup-notification/Makefile patch | blob | history
desktop/wm/openbox/Makefile patch | blob | history

diff --git a/desktop/apps/gpxview/Makefile b/desktop/apps/gpxview/Makefile
index 9937ef20b58a2bdefca282adebdffe7abd0670d5..6aca557d6b1430e78e1234d48e8827a78041c739 100644 (file)
--- a/desktop/apps/gpxview/Makefile
+++ b/desktop/apps/gpxview/Makefile
@@ -21,6 +21,7 @@ PKG_BUILD_PARALLEL:=1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION_BASE)
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/gpxview
   SECTION:=xorg-app
@@ -29,7 +30,7 @@ define Package/gpxview
   TITLE:=GPXView Geocaching app
   MAINTAINER:=Michael Buesch <mb@bu3sch.de>
   URL:=http://www.harbaum.org/till/maemo/index.shtml#gpxview
-  DEPENDS:=+gpsd +libxml2 +libcurl +libsoup +gtkhtml +gtk2 +glib2 +libintl +libiconv +libsqlite3
+  DEPENDS:=+gpsd +libxml2 +libcurl +libsoup +gtkhtml +gtk2 +glib2 +libsqlite3 $(ICONV_DEPENDS) $(INTL_DEPENDS)
 endef
 
 define Package/gpxview/description
@@ -37,12 +38,12 @@ define Package/gpxview/description
 endef
 
 EXTRA_CFLAGS:= \
-       -I$(STAGING_DIR)/usr/lib/libintl/include \
-       -I$(STAGING_DIR)/usr/lib/libiconv/include
+       -I$(ICONV_PREFIX)/include \
+       -I$(INTL_PREFIX)/include
 
 EXTRA_LDFLAGS:= \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib \
-       -L$(STAGING_DIR)/usr/lib/libiconv/lib \
+       -L$(ICONV_PREFIX)/lib \
+       -L$(INTL_PREFIX)/lib \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
        -Wl,-rpath=/usr/lib/
 
diff --git a/desktop/apps/recordmydesktop/Makefile b/desktop/apps/recordmydesktop/Makefile
index 39361cf308d9c6c0c592927e8ab5617562ba744b..3edb6ef8cb3522c8432444e533d561f83fe320b4 100644 (file)
--- a/desktop/apps/recordmydesktop/Makefile
+++ b/desktop/apps/recordmydesktop/Makefile
@@ -17,13 +17,9 @@ PKG_MD5SUM:=6998b165540598965499bd99d8aa0eef
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
-TARGET_CFLAGS+= \
-       -I$(STAGING_DIR)/usr/lib/libintl/include \
-       -I$(STAGING_DIR)/usr/lib/libiconv/include
 TARGET_LDFLAGS+= \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib \
-       -L$(STAGING_DIR)/usr/lib/libiconv/lib \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
        -Wl,-rpath=/usr/lib \
 
@@ -34,7 +30,7 @@ define Package/recordmydesktop
   TITLE:=A X desktop session recorder
   URL:=http://recordmydesktop.sourceforge.net
   DEPENDS:=+libX11 +libSM +libICE +libXext +libXfixes +libXdamage +libvorbis \
-  +libtheora +libogg +libpthread +zlib
+         +libtheora +libogg +libpthread +zlib $(ICONV_DEPENDS) $(INTL_DEPENDS)
 endef
 
 define Build/Configure
diff --git a/desktop/apps/tangogps/Makefile b/desktop/apps/tangogps/Makefile
index 44fa7e564a4186f453b0565c130bf22f265208c3..956433a8fa8bd9512188389f7372afa756833f06 100644 (file)
--- a/desktop/apps/tangogps/Makefile
+++ b/desktop/apps/tangogps/Makefile
@@ -16,14 +16,9 @@ PKG_SOURCE_URL:=http://tangogps.org/downloads
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+= \
-       -I$(STAGING_DIR)/usr/lib/libintl/include \
-       -I$(STAGING_DIR)/usr/libiconv/include
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib \
-       -L$(STAGING_DIR)/usr/lib/libiconv/lib \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/tangogps
diff --git a/desktop/libs/gtkhtml/Makefile b/desktop/libs/gtkhtml/Makefile
index 43048be28d6d2b1aba5587fe115123eae74f711a..1652e61fd0c2eb3695e0a36b1907c9a02768655d 100644 (file)
--- a/desktop/libs/gtkhtml/Makefile
+++ b/desktop/libs/gtkhtml/Makefile
@@ -19,6 +19,7 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/gtkhtml
   SECTION:=xorg-app
@@ -29,14 +30,8 @@ define Package/gtkhtml
   URL:=http://www.gnome.org/projects/gtkhtml/
 endef
 
-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 Build/Configure
        $(call Build/Configure/Default, \
diff --git a/desktop/libs/libgamin/Makefile b/desktop/libs/libgamin/Makefile
index d23574528d6e63c64698e41b522e30c82ed4932f..6ae0e2fee73b9a18135161da69d361131c50577c 100644 (file)
--- a/desktop/libs/libgamin/Makefile
+++ b/desktop/libs/libgamin/Makefile
@@ -11,12 +11,13 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include \
-                         -I$(STAGING_DIR)/usr/libiconv/include
+EXTRA_CFLAGS+=-I$(ICONV_PREFIX)/include \
+                         -I$(INTL_PREFIX)/include
 
-EXTRA_LDFLAGS+=                           -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-                          -L$(STAGING_DIR)/usr/lib/libiconv/lib/
+EXTRA_LDFLAGS+=-L$(ICONV_PREFIX)/lib/ \
+                          -L$(INTL_PREFIX)/lib/
 #               -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
 
 
diff --git a/desktop/libs/libglade/Makefile b/desktop/libs/libglade/Makefile
index 22cadad2e211911d05fcc9f079f4672d39397534..2e97fb96060b31718e9dcc4fbe503900d7147f5a 100644 (file)
--- a/desktop/libs/libglade/Makefile
+++ b/desktop/libs/libglade/Makefile
@@ -19,13 +19,14 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include \
-                         -I$(STAGING_DIR)/usr/libiconv/include
+EXTRA_CFLAGS+=-I$(ICONV_PREFIX)/include \
+                         -I$(INTL_PREFIX)/include
 
 EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-                          -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-                          -L$(STAGING_DIR)/usr/lib/libiconv/lib/
+                          -L$(ICONV_PREFIX)/lib/ \
+                          -L$(INTL_PREFIX)/lib/
 
 define Package/libglade
   SECTION:=xorg-libs
diff --git a/desktop/libs/libisofs/Makefile b/desktop/libs/libisofs/Makefile
index 32b702cdaf0ca5b5aa9096e20935f6f049246860..799c7e2ba71cc8916e11dbbcc0741302d298a6f3 100644 (file)
--- a/desktop/libs/libisofs/Makefile
+++ b/desktop/libs/libisofs/Makefile
@@ -19,16 +19,16 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include
-TARGET_LDFLAGS+=-L$(STAGING_DIR)/usr/lib/libiconv/lib -liconv
+TARGET_LDFLAGS+=-liconv
 
 define Package/libisofs
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=libisofs
   URL:=http://www.libburnia-project.org
-  DEPENDS:=+libiconv +libburn +libpthread
+  DEPENDS:=+libburn +libpthread $(ICONV_DEPENDS)
 endef
 
 define Package/libisofs/description
diff --git a/desktop/libs/libstartup-notification/Makefile b/desktop/libs/libstartup-notification/Makefile
index d43ca006fecbff29d2fbd72f1369faf3c003297a..c3069adb37bcd136927df8d65fcc0caae712598c 100644 (file)
--- a/desktop/libs/libstartup-notification/Makefile
+++ b/desktop/libs/libstartup-notification/Makefile
@@ -11,13 +11,14 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include \
-                         -I$(STAGING_DIR)/usr/libiconv/include
+EXTRA_CFLAGS+=-I$(ICONV_PREFIX)/include \
+                         -I$(INTL_PREFIX)/include
 
 EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-                          -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-                          -L$(STAGING_DIR)/usr/lib/libiconv/lib/
+                          -L$(ICONV_PREFIX)/lib/ \
+                          -L$(INTL_PREFIX)/lib/
 
 define Package/libstartup-notification
   SECTION:=xorg-libs
diff --git a/desktop/wm/openbox/Makefile b/desktop/wm/openbox/Makefile
index 72ece94d82855b0aea7cbe75eb0084132313ed3c..8aa2cef1c0d5b819faf545a9bc04a749ef651df1 100644 (file)
--- a/desktop/wm/openbox/Makefile
+++ b/desktop/wm/openbox/Makefile
@@ -15,13 +15,11 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://icculus.org/openbox/releases
 PKG_MD5SUM:=9e7589e90519bc6ac2f4656ea6869439
 
-TARGET_LDFLAGS+= \
-        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib/libiconv/lib \
-        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib/libintl/lib
-
-
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
+TARGET_LDFLAGS+= \
+        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/openbox
   TITLE:=The Openbox Window Manager
@@ -29,8 +27,8 @@ define Package/openbox
   CATEGORY:=Xorg
   SUBMENU:=window manager
   DEPENDS:=+glib2 +libxml2 +fontconfig +libXft +libXrandr +libXt \
-+libXcursor +pango +xextproto +xf86vidmodeproto +dejavu-fonts-ttf \
-+freedesktop-compliant
+       +libXcursor +pango +xextproto +xf86vidmodeproto +dejavu-fonts-ttf \
+       +freedesktop-compliant
   URL:=http://icculus.org/openbox/
 endef
 
OpenWrt legacy package feeds, manually converted from SVN.