From 5459f36c9e98294b99d1d23b045d35da84e14d24 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 3 Sep 2007 16:08:44 +0000
Subject: [PATCH] Makefile cleanup

SVN-Revision: 8602
---
 net/gpsd/Makefile         | 19 +++++++------------
 net/peerguardian/Makefile | 15 ++++-----------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/net/gpsd/Makefile b/net/gpsd/Makefile
index 2ca51b2551..3f773c85da 100644
--- a/net/gpsd/Makefile
+++ b/net/gpsd/Makefile
@@ -15,10 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://download.berlios.de/gpsd/
 PKG_MD5SUM:=3ff80db0e7d906457e5a7a1b04fcb4ec
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 PKG_BUILD_DEPENDS=libncurses libnotimpl
 
@@ -32,14 +28,13 @@ define Package/gpsd
   URL:=http://gpsd.berlios.de/
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--without-x \
-		, \
-		CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
-		LIBS="-nodefaultlibs -luClibc++ -lnotimpl -lm -lc" \
-        )
-endef
+CONFIGURE_ARGS += \
+	--without-x \
+
+CONFIGURE_VARS += \
+	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClic++" \
+	CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
+	LIBS="-nodefaultlibs -luClibc++ -lnotimpl" \
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
diff --git a/net/peerguardian/Makefile b/net/peerguardian/Makefile
index af80316d22..9020052a85 100644
--- a/net/peerguardian/Makefile
+++ b/net/peerguardian/Makefile
@@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/peerguardian
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:= +libpthread +libncurses
+  DEPENDS:= +libncurses +libpthread +uclibcxx
   TITLE:=PeerGuardian for Linux
   DESCRIPTION:=\
 	PeerGuardian helps protect your privacy by blocking many ranges \\\
@@ -39,16 +39,9 @@ define Package/peerguardian/conffiles
 /etc/p2p.p2b.p2p
 endef
 
-# commas are interpreted by the $(call ...) macro, so define an intermediate variable holding our settings
-PKG_CONFIGURE_LIBS:=-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic,-lm,-lc
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		, \
-		CXXFLAGS="$$$$CXXFLAGS $$$$CPPFLAGS -fno-builtin -fno-rtti" \
-		LIBS="$(PKG_CONFIGURE_LIBS)" \
-	)
-endef
+CONFIGURE_VARS+= \
+	CXXFLAGS="$$$$CXXFLAGS $$$$CPPFLAGS -fno-builtin -fno-rtti" \
+	LIBS="-nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm" \
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-- 
2.30.2