From 543cbcfd192f3742e388ed8a13c885f3c97702f0 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 3 Sep 2008 13:21:20 +0000
Subject: [PATCH] clean up some packages

SVN-Revision: 12513
---
 lang/gst-python/Makefile            | 29 +++++++++++------------------
 lang/python-dbus/Makefile           |  9 +++++++--
 lang/python-gnome-desktop2/Makefile |  9 +++++++--
 libs/check/Makefile                 | 19 ++++++++++++-------
 mail/ssmtp/Makefile                 |  5 +----
 5 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/lang/gst-python/Makefile b/lang/gst-python/Makefile
index fc47dc7ff..5a840ae03 100644
--- a/lang/gst-python/Makefile
+++ b/lang/gst-python/Makefile
@@ -17,8 +17,17 @@ PKG_MD5SUM:=2c633a06c140024dd0d59db1e87e6945
 
 include $(INCLUDE_DIR)/package.mk
 
-EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/lib/libintl/include/ -I$(STAGING_DIR)/usr/lib/libiconv/include/
-EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libintl/lib/ -L$(STAGING_DIR)/usr/lib/libiconv/lib/
+PKG_INSTALL=1
+
+TARGET_CFLAGS += $(FPIC) \
+	-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
+
+CONFIGURE_VARS += PYTHON=/usr/bin/python
 
 define Package/gst-python
   SUBMENU:=Python
@@ -33,22 +42,6 @@ define Package/gst-python/description
   python bindings for dbus 
 endef
 
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); \
-		if [ -x $(CONFIGURE_CMD) ]; then \
-			$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-			$(CONFIGURE_VARS) \
-			PYTHON=/usr/bin/python \
-			$(CONFIGURE_CMD) \
-			$(CONFIGURE_ARGS) ;\
-		fi \
-	)
-endef
-
-define Build/Compile
-	cd $(PKG_BUILD_DIR) ; DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) all install
-endef
-
 define Build/InstallDev
 	mkdir -p $(1)
 	cp -r $(PKG_INSTALL_DIR)/* $(1)
diff --git a/lang/python-dbus/Makefile b/lang/python-dbus/Makefile
index 733180cc6..d93f147ba 100644
--- a/lang/python-dbus/Makefile
+++ b/lang/python-dbus/Makefile
@@ -16,8 +16,13 @@ PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
-EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/lib/libintl/include/ -I$(STAGING_DIR)/usr/lib/libiconv/include/
-EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libintl/lib/ -L$(STAGING_DIR)/usr/lib/libiconv/lib/
+EXTRA_CFLAGS += \
+	-I$(STAGING_DIR)/usr/lib/libintl/include \
+	-I$(STAGING_DIR)/usr/lib/libiconv/include
+
+EXTRA_LDFLAGS += \
+	-L$(STAGING_DIR)/usr/lib/libintl/lib \
+	-L$(STAGING_DIR)/usr/lib/libiconv/lib
 
 define Package/dbus-python
   SUBMENU:=Python
diff --git a/lang/python-gnome-desktop2/Makefile b/lang/python-gnome-desktop2/Makefile
index 6ee2da166..3b7c73cce 100644
--- a/lang/python-gnome-desktop2/Makefile
+++ b/lang/python-gnome-desktop2/Makefile
@@ -16,8 +16,13 @@ PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
-EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/lib/libintl/include/ -I$(STAGING_DIR)/usr/lib/libiconv/include/
-EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+EXTRA_CFLAGS += \
+	-I$(STAGING_DIR)/usr/lib/libintl/include \
+	-I$(STAGING_DIR)/usr/lib/libiconv/include
+
+EXTRA_LDFLAGS += \
+	-L$(STAGING_DIR)/usr/lib/libintl/lib \
+	-L$(STAGING_DIR)/usr/lib/libiconv/lib
 
 define Package/gnome-python-desktop
   SUBMENU:=Python
diff --git a/libs/check/Makefile b/libs/check/Makefile
index 22ac2966c..1dc0b5c30 100644
--- a/libs/check/Makefile
+++ b/libs/check/Makefile
@@ -16,8 +16,15 @@ PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/ -I$(STAGING_DIR)/usr/lib/libiconv/include/ -fPIC
-EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libintl/lib/ -L$(STAGING_DIR)/usr/lib/libiconv/lib/
+PKG_INSTALL = 1
+
+TARGET_CFLAGS += $(FPIC) \
+	-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
 
 define Package/check
   SECTION:=lib
@@ -28,7 +35,7 @@ define Package/check
 endef
 
 define Package/check/description
-  unit testinglibrary
+  unit testing library
 endef
 
 define Build/Configure
@@ -36,10 +43,8 @@ define Build/Configure
 	$(call Build/Configure/Default)
 endef
 
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Compile
-	cd $(PKG_BUILD_DIR) ; DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) all install
+define Build/Install
+	$(call Build/Install/Default)
 	cd $(PKG_INSTALL_DIR)/usr/lib/ ; ln -s libcheck.so libcheck_pic.so
 endef
 
diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile
index b481e6d11..6e6ef67f0 100644
--- a/mail/ssmtp/Makefile
+++ b/mail/ssmtp/Makefile
@@ -34,10 +34,7 @@ define Package/ssmtp/description
  configuration.
 endef
 
-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
-EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
-
-TARGET_CONFIGURE_OPTS+=\
+TARGET_CONFIGURE_OPTS += \
 	CC="$(TARGET_CC) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)"
 
 CONFIGURE_ARGS += \
-- 
2.30.2