Makefile cleanup

git-svn-id: svn://svn.openwrt.org/openwrt/packages@8602 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2007-09-03 16:08:44 +00:00
parent 6dce3393a8
commit a462f853ff
2 changed files with 11 additions and 23 deletions

View File

@ -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) \

View File

@ -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) \