Makefile cleanup

[openwrt/svn-archive/archive.git] / net / peerguardian / Makefile

diff --git a/net/peerguardian/Makefile b/net/peerguardian/Makefile
index af80316d22c7da97f82a7bcca8882375cf203795..9020052a852114d9dbd0ad23d29c7eca0a71c653 100644 (file)
--- 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) \