Fix/clean several hundred package makefiles

git-svn-id: svn://svn.openwrt.org/openwrt/packages@4603 3c298f89-4303-0410-b956-a3cf2f4a3e73
2006-08-18 21:21:06 +00:00 · 2006-08-18 21:21:06 +00:00 · 8b6c86b471
commit 8b6c86b471
parent c98fd25033
71 changed files with 77 additions and 272 deletions
--- a/admin/osiris/Makefile
+++ b/admin/osiris/Makefile
@ -48,7 +48,6 @@ define Build/Compile
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		ar=$(TARGET_CROSS)ar \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		INTERACTIVE=0 \
 		all install
--- a/ipv6/dhcp6/Makefile
+++ b/ipv6/dhcp6/Makefile
@ -55,7 +55,6 @@ define Package/dhcp6-client/conffiles
 /etc/dhcp6/solicit.conf
 endef

-
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)/server \
 		CC="$(TARGET_CC)" STAGING_DIR=$(STAGING_DIR)
--- a/ipv6/mrd6/Makefile
+++ b/ipv6/mrd6/Makefile
@ -47,8 +47,8 @@ define Build/Compile
 		SPACE_OPTIMIZE=yes \
 		FULL_STATIC=yes \
 		CFLAGS="$(TARGET_CFLAGS) -DNO_INET6_OPTION" \
-		CXX=$(TARGET_CROSS)g++ \
-		CC=$(TARGET_CC) \
+		CXX="$(TARGET_CROSS)g++" \
+		CC="$(TARGET_CC)" \
 		STAGING_DIR=$(STAGING_DIR) \
 		DESTDIR=$(PKG_INSTALL_DIR) \
 		PREFIX=/usr/ \
--- a/libs/axtls/Makefile
+++ b/libs/axtls/Makefile
@ -24,6 +24,7 @@ define Package/libaxtls
  SECTION:=libs
  CATEGORY:=Libraries
  TITLE:=Embedded client/server TLSv1 SSL library
+  DEPENDS:=libgdbm
  DESCRIPTION:=Embedded client/server TLSv1 SSL library.
  URL:=http://sourceforge.net/projects/axtls
 endef
--- a/libs/bzip2/Makefile
+++ b/libs/bzip2/Makefile
@ -35,7 +35,6 @@ define Build/Compile
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		CC="$(TARGET_CC)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		libbz2.a
 endef
--- a/libs/clinkc/Makefile
+++ b/libs/clinkc/Makefile
@ -32,10 +32,6 @@ define Package/clinkc
  URL:=http://sourceforge.net/projects/clinkc
 endef

-define Package/Configure
-$(call Build/Configure/Default)
-endef
-
 define Build/Compile
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
--- a/libs/gmp/Makefile
+++ b/libs/gmp/Makefile
@ -63,12 +63,7 @@ define Build/Configure
 endef

 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
+  $(call Build/Compile/Default, DESTDIR="$(PKG_INSTALL_DIR)" all install)
 endef

 define Package/libgmp/install
--- a/libs/libcli/Makefile
+++ b/libs/libcli/Makefile
@ -34,17 +34,8 @@ define Package/libcli
  URL:=http://libcli.sourceforge.net/
 endef

-define Build/Configure
-endef
-
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
-		LD="$(TARGET_CC)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
+  $(call Build/Compile/Default, DESTDIR="$(PKG_INSTALL_DIR)" all install)
 endef

 define Package/libcli/install
--- a/libs/libiconv/Makefile
+++ b/libs/libiconv/Makefile
@ -29,10 +29,6 @@ define Package/libiconv
  URL:=http://www.gnu.org/software/libiconv/
 endef

-define Build/Configure
-$(call Build/Configure/Default)
-endef
-
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CC="$(TARGET_CC)"
--- a/libs/libjpeg/Makefile
+++ b/libs/libjpeg/Makefile
@ -59,4 +59,4 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libjpeg.{a,so*}
 endef

-$(eval $(call Build/DefaultTargets))
+$(eval $(call BuildPackage,libjpeg))
--- a/multimedia/peercast/Makefile
+++ b/multimedia/peercast/Makefile
@ -42,8 +42,9 @@ define Build/Configure
 $(call Build/Configure/Default,--enable-shared \
 			--disable-static \
 			--with-gnu-ld \
-			--enable-staticbin, BUILD_CC=$(TARGET_CC) HOSTCC=$(HOSTCC) \
+			--enable-staticbin, \
 		$(TARGET_CONFIGURE_OPTS) \
+		BUILD_CC="$(TARGET_CC)" HOSTCC="$(HOSTCC)" \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -nostdinc++ -nodefaultlibs" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
@ -52,11 +53,7 @@ $(call Build/Configure/Default,--enable-shared \
 endef

 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
+  $(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" all install)
 endef

 define Package/peercast/install	
--- a/net/aircrack-ng/Makefile
+++ b/net/aircrack-ng/Makefile
@ -37,7 +37,7 @@ define Build/Compile
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
+		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS) -Wall" \
 		prefix="/usr" \
 		destdir="$(PKG_INSTALL_DIR)" \
--- a/net/aodv-uu/Makefile
+++ b/net/aodv-uu/Makefile
@ -31,8 +31,8 @@ URL:=http://core.it.uu.se/adhoc/AodvUUImpl
 endef

 define Build/Compile
-	$(call Build/Compile/Default,CC="$(TARGET_CC)" \
-KERNEL_DIR="$(LINUX_DIR)/" KCC="$(TARGET_CC)" LD="$(TARGET_CROSS)ld" \
+	$(call Build/Compile/Default, \
+KERNEL_DIR="$(LINUX_DIR)/" KCC="$(TARGET_CC)" \
 CFLAGS="$(TARGET_CFLAGS)" aodvd)
 endef

--- a/net/atftp/Makefile
+++ b/net/atftp/Makefile
@ -51,10 +51,6 @@ if [ $? -ne 0 ]; then
 fi
 endef

-define Build/Configure
-$(call Build/Configure/Default)
-endef
-
 define Build/Compile
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
--- a/net/autossh/Makefile
+++ b/net/autossh/Makefile
@ -35,11 +35,10 @@ $(CP) $(PKG_BUILD_DIR)/Makefile.linux $(PKG_BUILD_DIR)/Makefile
 endef

 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -Wall -D\"SSH_PATH=\\\"$(SSH)\\\"\" -D\"VER=\\\"$(PKG_VERSION)\\\"\"" \
-		BINDIR=/usr/bin MANDIR=/usr/man
+$(call Build/Compile/Default, \
+	CFLAGS="$(TARGET_CFLAGS) -Wall -D\"SSH_PATH=\\\"$(SSH)\\\"\" -D\"VER=\\\"$(PKG_VERSION)\\\"\"" \
+	BINDIR=/usr/bin MANDIR=/usr/man \
+)
 endef

 define Package/autossh/install
--- a/net/bind/Makefile
+++ b/net/bind/Makefile
@ -110,7 +110,6 @@ define Build/Compile
 		gen
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 	DESTDIR="$(PKG_INSTALL_DIR)" \
-		STAGING_DIR=$(STAGING_DIR) \
 		all install
 endef

--- a/net/bitchx/Makefile
+++ b/net/bitchx/Makefile
@ -33,10 +33,6 @@ define Package/bitchx
  URL:=http://www.bitchx.org
 endef

-define Build/Configure
-$(call Build/Configure/Default)
-endef
-
 define Build/Compile
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
--- a/net/ctorrent/Makefile
+++ b/net/ctorrent/Makefile
@ -56,7 +56,7 @@ define Build/Configure
 endef

 define Build/Compile	
-	$(MAKE) STAGING_DIR=$(STAGING_DIR) DESTDIR=$(PKG_INSTALL_DIR) -C $(PKG_BUILD_DIR) install
+  $(call Build/Compile/Default, DESTDIR=$(PKG_INSTALL_DIR)  install)
 endef
 	
 define Package/ctorrent/install	
--- a/net/elinks/Makefile
+++ b/net/elinks/Makefile
@ -83,11 +83,6 @@ define Build/Configure
 	);
 endef

-define Build/Compile	
-	$(MAKE) -C $(PKG_BUILD_DIR)\
-		CC="$(TARGET_CC)" LD="$(TARGET_CROSS)ld"
-endef
-
 define Package/elinks/install
 	mkdir -p $(1)/usr/bin
 	$(CP) $(PKG_BUILD_DIR)/src/elinks $(1)/usr/bin/
--- a/net/ethtool/Makefile
+++ b/net/ethtool/Makefile
@ -30,10 +30,6 @@ define Package/ethtool
  URL:=http://sourceforge.net/projects/gkernel/
 endef

-define Build/Configure
-$(call Build/Configure/Default)
-endef
-
 define Build/Compile
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
--- a/net/fping/Makefile
+++ b/net/fping/Makefile
@ -35,10 +35,6 @@ limit it will be considered unreachable.\\\
  URL:=http://www.fping.com
 endef
  
-define Build/Configure
-$(call Build/Configure/Default)
-endef
-
 define Build/Compile	
 	$(MAKE) -j1 CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) clean $(PKG_NAME)
 	mv $(PKG_BUILD_DIR)/$(PKG_NAME) $(PKG_BUILD_DIR)/$(PKG_NAME)4
--- a/net/httping/Makefile
+++ b/net/httping/Makefile
@ -33,8 +33,7 @@ transmission across the network also takes time!\\\
 endef

 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) -f $(PKG_BUILD_DIR)/Makefile$(SSL_ENABLE) \
-		CC="$(TARGET_CC)" STAGING_DIR=$(STAGING_DIR)
+  $(call Build/Compile/Default,-f $(PKG_BUILD_DIR)/Makefile$(SSL_ENABLE) STAGING_DIR=$(STAGING_DIR))
 endef

 define Package/httping/install	
--- a/net/iftop/Makefile
+++ b/net/iftop/Makefile
@ -33,17 +33,8 @@ answering the question "why is our ADSL link so slow?".\\\
  URL:=http://www.ex-parrot.com/~pdw/iftop/
 endef

-define Build/Configure
-$(call Build/Configure/Default)
-endef
-
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
+  $(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" install)
 endef

 define Package/iftop/install	
--- a/net/iptables-snmp/Makefile
+++ b/net/iptables-snmp/Makefile
@ -30,16 +30,11 @@ define Package/iptables-snmp
  URL:=http://www.nobiscuit.com/iptables-snmp/
 endef

-define Build/Configure
-$(call Build/Configure/Default)
-endef
-
 define Build/Compile	
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+  $(call Build/Compile/Default, \
 		INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
-		all install
+		all install \
+  )
 endef
 
 define Package/iptables-snmp/install	
--- a/net/irssi/Makefile
+++ b/net/irssi/Makefile
@ -45,11 +45,6 @@ $(call Build/Configure/Default,--with-perl=no \
 ac_cv_sizeof_off_t=8)
 endef

-define Build/Compile	
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)"
-endef
-
 define Package/irssi/install	
 	mkdir -p $(1)/usr/bin
 	$(CP) $(PKG_BUILD_DIR)/src/fe-text/$(PKG_NAME) $(1)/usr/bin/
--- a/net/l2tpd/Makefile
+++ b/net/l2tpd/Makefile
@ -40,10 +40,7 @@ define Package/l2tpd/conffiles
 endef

 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS) -I. -DLINUX -DSANITY -DIP_ALLOCATION"
+  $(call Build/Compile/Default,CFLAGS="$(TARGET_CFLAGS) -I. -DLINUX -DSANITY -DIP_ALLOCATION")
 endef

 define Package/l2tpd/install	
--- a/net/l2tpns/Makefile
+++ b/net/l2tpns/Makefile
@ -40,13 +40,7 @@ define Package/l2tpns/conffiles
 endef
 	
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
-		LD="$(TARGET_CC)" \
-		OPTIM="$(TARGET_CFLAGS)" \
-		DESTDIR=$(PKG_INSTALL_DIR) \
-		STAGING_DIR=$(STAGING_DIR) \
-		all install
+  $(call Build/Compile/Default, LD="$(TARGET_CC)" OPTIM="$(TARGET_CFLAGS)" STAGING_DIR=$(STAGING_DIR) DESTDIR=$(PKG_INSTALL_DIR) all install)
 endef

 define Package/l2tpns/install	
--- a/net/miau/Makefile
+++ b/net/miau/Makefile
@ -44,12 +44,7 @@ endef


 define Build/Compile	
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC=$(TARGET_CC) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
+  $(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" install)
 endef

 define Package/miau/install	
--- a/net/mini_httpd/Makefile
+++ b/net/mini_httpd/Makefile
@ -93,7 +93,7 @@ define Build/Compile
 	# with MatrixSSL
  ifneq ($(CONFIG_PACKAGE_mini-httpd-matrixssl),)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC=$(TARGET_CC) \
+		$(TARGET_CONFIGURE_OPTS) \
 		OFLAGS="$(TARGET_CFLAGS)" \
 		SSL_DEFS="-DUSE_SSL -DHAVE_MATRIXSSL" \
 		SSL_INC="-I$(STAGING_DIR)/usr/include" \
@ -106,7 +106,7 @@ define Build/Compile
 	# with OpenSSL
  ifneq ($(CONFIG_PACKAGE_mini-httpd-openssl),)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC=$(TARGET_CC) \
+		$(TARGET_CONFIGURE_OPTS) \
 		OFLAGS="$(TARGET_CFLAGS)" \
 		SSL_DEFS="-DUSE_SSL -DHAVE_OPENSSL" \
 		SSL_INC="-I$(STAGING_DIR)/usr/include" \
@ -118,7 +118,7 @@ define Build/Compile
 	# without SSL
  ifneq ($(CONFIG_PACKAGE_mini-httpd),)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC=$(TARGET_CC) \
+		$(TARGET_CONFIGURE_OPTS) \
 		OFLAGS="$(TARGET_CFLAGS)" \
 		all
  endif
--- a/net/mini_sendmail/Makefile
+++ b/net/mini_sendmail/Makefile
@ -34,7 +34,7 @@ endef

 define Build/Compile	
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC=$(TARGET_CC) \
+		$(TARGET_CONFIGURE_OPTS) \
 		OFLAGS="$(TARGET_CFLAGS)" \
 		all
 endef
--- a/net/netperf/Makefile
+++ b/net/netperf/Makefile
@ -33,7 +33,7 @@ endef
 define Build/Compile	
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 	    TARGET_NETPERF_HOME="/etc/netperf.conf" \
-	    TARGET_CC=$(TARGET_CROSS)gcc \
+	    TARGET_CC="$(TARGET_CROSS)gcc" \
 	    TARGET_CFLAGS="$(TARGET_CFLAGS)" \
 		TARGET_LIBS="" \
 		all
--- a/net/netstat-nat/Makefile
+++ b/net/netstat-nat/Makefile
@ -34,10 +34,6 @@ define Package/netstat-nat
  URL:=http://tweegy.demon.nl/projects/netstat-nat/
 endef

-define Build/Configure
-$(call Build/Configure/Default)
-endef
-
 define Build/Compile	
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
--- a/net/nfs-server/Makefile
+++ b/net/nfs-server/Makefile
@ -30,10 +30,6 @@ define Package/nfs-server
  DESCRIPTION:=User Space NFS server
 endef

-define Build/Configure
-$(call Build/Configure/Default)
-endef  
-
 define Build/Compile	
 	$(MAKE) -C $(PKG_BUILD_DIR)
 endef
--- a/net/ntpclient/Makefile
+++ b/net/ntpclient/Makefile
@ -30,8 +30,7 @@ define Package/ntpclient
 endef

 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" all adjtimex
+  $(call Build/Compile/Default,all adjtimex)
 endef

 define Package/ntpclient/install	
--- a/net/oidentd/Makefile
+++ b/net/oidentd/Makefile
@ -33,14 +33,11 @@ endef


 define Build/Configure
-$(call Build/Configure/Default,--includedir=$(PKG_BUILD_DIR)/)
+  $(call Build/Configure/Default,--includedir=$(PKG_BUILD_DIR)/)
 endef

 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)"
+  $(call Build/Compile/Default)
 	$(STRIP) $(PKG_BUILD_DIR)/src/$(PKG_NAME)
 endef

--- a/net/openntpd/Makefile
+++ b/net/openntpd/Makefile
@ -84,7 +84,6 @@ define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS) -DUSE_ADJTIMEX"
-	touch $@
 endef

 define Package/openntpd/install	
--- a/net/parprouted/Makefile
+++ b/net/parprouted/Makefile
@ -34,9 +34,7 @@ define Package/parprouted
 endef

 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="" \
-		all
+  $(call Build/Compile/Default,CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="" all)
 endef

 define Package/parprouted/install	
--- a/net/peerguardian/Makefile
+++ b/net/peerguardian/Makefile
@ -35,15 +35,6 @@ define Package/peerguardian/conffiles
 /etc/p2p.p2b.p2p
 endef

-define Build/Configure
-$(call Build/Configure/Default)
-endef	
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		STAGING_DIR=$(STAGING_DIR)
-endef
-
 define Package/peerguardian/install
 	install -d -m0755 $(1)/usr/sbin $(1)/etc/init.d
 	install -m0755 $(PKG_BUILD_DIR)/peerguardnf $(1)/usr/sbin/
--- a/net/pptpd/Makefile
+++ b/net/pptpd/Makefile
@ -61,14 +61,12 @@ define Build/Configure
 endef

 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
+  $(call Build/Compile/Default, \
 		CFLAGS="$(TARGET_CFLAGS) -DSBINDIR=\\\"/usr/sbin\\\"" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		INSTALL="install" \
-		all install
+		all install \
+  )
 endef

 define Package/pptpd/install
--- a/net/psybnc/Makefile
+++ b/net/psybnc/Makefile
@ -35,11 +35,11 @@ define Package/psybnc
 endef

 define Build/Compile	
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		HOSTCC="$(HOSTCC)" \
-		all
+  $(call Build/Compile/Default, \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	HOSTCC="$(HOSTCC)" \
+	all \
+  )
 endef

 define Package/psybnc/install	
--- a/net/ptunnel/Makefile
+++ b/net/ptunnel/Makefile
@ -37,9 +37,10 @@ endef
 define Build/Configure
 $(call Build/Configure/Default,--enable-shared \
 		--disable-static \
-		--with-gnu-ld, BUILD_CC=$(TARGET_CC) \
-		HOSTCC=$(HOSTCC) \
+		--with-gnu-ld, \
 		$(TARGET_CONFIGURE_OPTS) \
+		BUILD_CC="$(TARGET_CC)" \
+		HOSTCC="$(HOSTCC)" \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
 		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
@ -48,11 +49,10 @@ $(call Build/Configure/Default,--enable-shared \
 endef

 define Build/Compile	
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+  $(call Build/Compile/Default, \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
+		all install \
+  )
 endef

 define Package/ptunnel/install	
--- a/net/reaim/Makefile
+++ b/net/reaim/Makefile
@ -32,13 +32,11 @@ define Package/reaim
 endef

 define Build/Compile	
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC=$(TARGET_CC) \
+  $(call Build/Compile/Default, \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
+		all install \
+  )
 endef

 define Package/reaim/install	
--- a/net/rp-l2tp/Makefile
+++ b/net/rp-l2tp/Makefile
@ -45,15 +45,8 @@ define Package/rp-l2tpd-mod-ppp
  TITLE:=a PPP handler for the L2TP daeomon
 endef

-define Build/Configure
-$(call Build/Configure/Default)
-endef
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
+  $(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" all install)
 endef

 define Package/rp-l2tpd/install	
--- a/net/scanlogd/Makefile
+++ b/net/scanlogd/Makefile
@ -44,7 +44,7 @@ endef
 define Build/Compile	
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		CC=$(TARGET_CC) LD=$(TARGET_CC) CFLAGS="-c $(TARGET_CFLAGS)" \
+		CC="$(TARGET_CC)" LD="$(TARGET_CC)" CFLAGS="-c $(TARGET_CFLAGS)" \
 		LDFLAGS= \
 		PCAP_H="-I$(STAGING_DIR)/usr/include" \
 		NIDS_H="-I$(STAGING_DIR)/usr/include" \
--- a/net/shat/Makefile
+++ b/net/shat/Makefile
@ -33,7 +33,7 @@ endef

 define Build/Compile	
 	$(MAKE) -C $(PKG_BUILD_DIR)/src \
-		CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \
+		CC="$(TARGET_CC)" \
 		CFLAGS="$(TARGET_CFLAGS) -Wall -I$(PKG_BUILD_DIR)/include/linux/include -I$(PKG_BUILD_DIR)/include -DVERSION=\\\"$(PKG_VERSION)\\\" -DDROP_NETBIOS"
 endef

--- a/net/sipp/Makefile
+++ b/net/sipp/Makefile
@ -34,15 +34,14 @@ endef

 define Build/Compile	
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC=$(TARGET_CC) \
-		CC_linux=$(TARGET_CC) \
-		CPP_linux=$(TARGET_CC) \
-		CCLINK_linux=$(TARGET_CC) \
+		$(TARGET_CONFIGURE_OPTS) \
+		CC_linux="$(TARGET_CC)" \
+		CPP_linux="$(TARGET_CC)" \
+		CCLINK_linux="$(TARGET_CC)" \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS_linux="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -fno-builtin -nostdinc++" \
 		LFLAGS_linux="-nodefaultlibs -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
 		LIBS="-luClibc++ -lc -lm -lgcc -lpthread -ldl -lncurses" \
-		STAGING_DIR=$(STAGING_DIR) \
 		all
 endef

--- a/net/srelay/Makefile
+++ b/net/srelay/Makefile
@ -39,11 +39,6 @@ define Build/Configure
 $(call Build/Configure/Default,--disable-thread)
 endef

-define Build/Compile
-$(call Build/Compile/Default, CC=$(TARGET_CC) \
-		all)
-endef
-
 define Package/srelay/install	
 	install -m0755 -d $(1)/usr/bin
 	install -m0755 -d $(1)/etc/init.d
--- a/net/ssltunnel/Makefile
+++ b/net/ssltunnel/Makefile
@ -32,7 +32,7 @@ define Package/ssltunnel
 endef

 define Build/Configure
-$(call Build/Configure/Default,,BUILD_CC=$(TARGET_CC) HOSTCC=$(HOSTCC))
+  $(call Build/Configure/Default,,BUILD_CC="$(TARGET_CC)" HOSTCC="$(HOSTCC)")
 endef

 define Build/Compile
--- a/net/ssmtp/Makefile
+++ b/net/ssmtp/Makefile
@ -34,9 +34,6 @@ define Package/ssmtp
  URL:=http://packages.debian.org/stable/mail/ssmtp
 endef

-define Build/Configure
-$(call Build/Configure/Default)
-endef

 define Build/Compile
 $(call Build/Compile/Default,all)
--- a/net/tinc/Makefile
+++ b/net/tinc/Makefile
@ -39,7 +39,7 @@ $(call Build/Configure/Default,--with-kernel=$(LINUX_DIR) \
 endef

 define Build/Compile
-$(call Build/Compile/Default,CC=$(TARGET_CC) \
+$(call Build/Compile/Default,CC="$(TARGET_CC)" \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install)
--- a/net/vgp/Makefile
+++ b/net/vgp/Makefile
@ -33,10 +33,6 @@ define Package/vgp
  URL:=http://vgpd.freaknet.org/
 endef

-define Build/Configure
-$(call Build/Configure/Default)
-endef
-
 define Build/Compile
 $(call Build/Compile/Default,DESTDIR=$(PKG_INSTALL_DIR) install)
 endef
--- a/net/vncrepeater/Makefile
+++ b/net/vncrepeater/Makefile
@ -41,7 +41,7 @@ define Package/vncrepeater/
 endef

 define Build/Compile
-$(call Build/Compile/Default,CC="$(TARGET_CC)" \
+$(call Build/Compile/Default, \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		repeater)
--- a/net/vnstat/Makefile
+++ b/net/vnstat/Makefile
@ -33,10 +33,6 @@ define Package/vnstat
  URL:=http://humdi.net/vnstat/
 endef

-define Build/Compile
-$(call Build/Compile/Default)
-endef
-
 define Package/vnstat/install	
 	install -d -m0755 $(1)/usr/bin
 	$(CP) $(PKG_BUILD_DIR)/src/vnstat $(1)/usr/bin/
--- a/net/vrrpd/Makefile
+++ b/net/vrrpd/Makefile
@ -38,7 +38,7 @@ define Package/vrrpd/conffiles
 endef

 define Build/Compile	
-$(call Build/Compile/Default,CC="$(TARGET_CC)" \
+$(call Build/Compile/Default, \
 		DBG_OPT="" \
 		MAIN_OPT="$(TARGET_CFLAGS)" \
 		vrrpd)
--- a/net/yafc/Makefile
+++ b/net/yafc/Makefile
@ -35,13 +35,6 @@ define Build/Configure
 $(call Build/Configure/Default,--includedir=$(PKG_BUILD_DIR)/)
 endef

-define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)"
-endef
-
 define Package/yafc/install
 	install -m0755 -d $(1)/usr/sbin
 	$(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/sbin/
--- a/utils/bc/Makefile
+++ b/utils/bc/Makefile
@ -39,17 +39,6 @@ define Package/dc
  URL:=http://www.gnu.org/software/bc/
 endef

-define Build/Configure
-$(call Build/Configure/Default)
-endef
-
-define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)"
-endef
-
 define Package/bc/install
 	install -m0755 -d $(1)/usr/bin
 	$(CP) $(PKG_BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME) $(1)/usr/bin/$(PKG_NAME)
--- a/utils/cifsmount/Makefile
+++ b/utils/cifsmount/Makefile
@ -28,9 +28,6 @@ define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
 endef

-define Build/Configure
-endef
-
 define Build/Compile
 	$(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/mount.cifs mount.cifs.c
 endef
--- a/utils/comgt/Makefile
+++ b/utils/comgt/Makefile
@ -41,10 +41,7 @@ define Build/Prepare
 endef

 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		gcom
+  $(call Build/Compile/Default,gcom)
 endef
 	
 define Package/comgt/install
--- a/utils/deco/Makefile
+++ b/utils/deco/Makefile
@ -30,10 +30,6 @@ define Package/deco
  URL:=http://deco.sourceforge.net/
 endef
  
-define Build/Configure
-$(call Build/Configure/Default)
-endef
-
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)
 endef
--- a/utils/gnupg/Makefile
+++ b/utils/gnupg/Makefile
@ -76,11 +76,6 @@ define Build/Configure
 	);
 endef

-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)"
-endef
-
 define Package/gnupg/install
 	install -d -m0755 $(1)/usr/bin
 	install -m0755 $(PKG_BUILD_DIR)/g10/gpg $(1)/usr/bin/
--- a/utils/hdparm/Makefile
+++ b/utils/hdparm/Makefile
@ -36,11 +36,6 @@ endef
 define Build/Configure
 endef

-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)"
-endef
-
 define Package/hdparm/install
 	install -d -m0755 $(1)/usr/sbin
 	install -m0755 $(PKG_BUILD_DIR)/hdparm $(1)/usr/sbin
--- a/utils/heyu/Makefile
+++ b/utils/heyu/Makefile
@ -32,9 +32,7 @@ define Package/heyu/conffiles
 endef

 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" LD="$(TARGET_CROSS)ld" \
-		CFLAGS="$(TARGET_CFLAGS) -I$(PKG_BUILD_DIR) -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX -DHASSELECT -DHASTZ"
+  $(call Build/Compile/Default, CFLAGS="$(TARGET_CFLAGS) -I$(PKG_BUILD_DIR) -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX -DHASSELECT -DHASTZ")
 endef

 define Package/heyu/install	
--- a/utils/lcd4linux/Makefile
+++ b/utils/lcd4linux/Makefile
@ -65,9 +65,7 @@ define Build/Configure
 endef

 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" LD="$(TARGET_CROSS)ld" \
-		CFLAGS="$(TARGET_CFLAGS) -Wall"
+  $(call Build/Compile/Default, CFLAGS="$(TARGET_CFLAGS) -Wall")
 endef

 define Package/lcd4linux/install
--- a/utils/logrotate/Makefile
+++ b/utils/logrotate/Makefile
@ -41,10 +41,11 @@ define Package/logrotate/conffiles
 endef

 define Build/Compile
-	make -C ${PKG_BUILD_DIR} \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
-		CC="$(TARGET_CC)" logrotate
+  $(call Build/Compile/Default, \
+	CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
+	LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+	logrotate \
+  )
 endef

 define Package/logrotate/install	
--- a/utils/macchanger/Makefile
+++ b/utils/macchanger/Makefile
@ -29,10 +29,6 @@ of network interfaces.
  URL:=http://www.alobbs.com/macchanger
 endef

-define Build/Configure
-$(call Build/Configure/Default)
-endef
-
 define Build/Compile	
 	$(MAKE) DESTDIR=$(PKG_INSTALL_DIR) -C $(PKG_BUILD_DIR) install
 endef
--- a/utils/microcom/Makefile
+++ b/utils/microcom/Makefile
@ -42,10 +42,6 @@ define Build/Configure
 	sed 's~gcc~$$(CC)~' $(PKG_BUILD_DIR)/Makefile.tmp > $(PKG_BUILD_DIR)/Makefile
 endef

-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) CC="$(TARGET_CC)"
-endef
-
 define Package/microcom/install
 	install -d -m0755 $(1)/usr/bin
 	install -m0755 $(PKG_BUILD_DIR)/microcom $(1)/usr/bin
--- a/utils/mutt/Makefile
+++ b/utils/mutt/Makefile
@ -41,11 +41,6 @@ $(call Build/Configure/Default,--includedir=$(PKG_BUILD_DIR)/. \
 		ac_cv_sizeof_long=4)
 endef

-define Build/Compile	
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC=$(TARGET_CC)
-endef
-
 define Package/mutt/install
 	mkdir -p $(1)/usr/bin
 	$(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/
--- a/utils/pciutils/Makefile
+++ b/utils/pciutils/Makefile
@ -37,8 +37,7 @@ define Build/Configure
 endef

 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" IDSDIR="/usr/share" HOST=$(GNU_TARGET_NAME)
+  $(call Build/Compile/Default, CFLAGS="$(TARGET_CFLAGS)" IDSDIR="/usr/share" HOST=$(GNU_TARGET_NAME))
 endef

 define Package/pciutils/install
--- a/utils/procmail/Makefile
+++ b/utils/procmail/Makefile
@ -33,7 +33,7 @@ endef

 define Build/Compile	
 	$(MAKE) -C $(PKG_BUILD_DIR)/src -f ../Makefile.openwrt  \
-		CC=$(TARGET_CC)
+		$(TARGET_CONFIGURE_OPTS)
 endef

 define Package/procmail/install
--- a/utils/vim/Makefile
+++ b/utils/vim/Makefile
@ -42,10 +42,6 @@ $(call Build/Configure/Default,--enable-min-features \
 			ac_cv_sizeof_int=4)
 endef

-define Build/Compile
-$(call Build/Compile/Default,CC="$(TARGET_CC)")
-endef
-
 define Package/vim/install	
 	mkdir -p $(1)/usr/bin
 	mkdir -p $(1)//usr/share/vim