Fix/clean several hundred package makefiles

SVN-Revision: 4603

diff --git a/admin/osiris/Makefile b/admin/osiris/Makefile
index 24520d838bffdebda780ad907f19988fee7e9bc9..917134a7a39474cdc99605f0fd7fe5785ca42776 100644 (file)
--- 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

diff --git a/ipv6/dhcp6/Makefile b/ipv6/dhcp6/Makefile
index 839afb1e4bf0e65491d76dca83e6276c7ebe0085..05cf81522b02c090833630872cd6e5f47a599dfd 100755 (executable)
--- 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)

diff --git a/ipv6/mrd6/Makefile b/ipv6/mrd6/Makefile
index 63fe4c96e678e549af73a4cc69950816c638346d..aab01e41e71165e8bd24ab2879dc9e9635f0f0e5 100644 (file)
--- 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/ \

diff --git a/libs/axtls/Makefile b/libs/axtls/Makefile
index f88238deff54843d9c198e062badc2e5b00bd67d..20e7f1cffe89a5a0a9c8a5defc607b05b8400b83 100644 (file)
--- 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

diff --git a/libs/bzip2/Makefile b/libs/bzip2/Makefile
index 0a46e4bb8f0181b9aad362b40728c2ea1d5b4f26..3e4bf537f49fe3913e114ad0a5195bbb90c2cca4 100644 (file)
--- 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

diff --git a/libs/clinkc/Makefile b/libs/clinkc/Makefile
index 38102f9d688559abbbb72b2f087d11d537fdc97e..7717d1c4f9f84e994792c53388fac44890cf01c6 100644 (file)
--- 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)

diff --git a/libs/gmp/Makefile b/libs/gmp/Makefile
index a7f910ad43f40a24810d5311dbc75225ca208e4c..1e84b88d26805e1f1b5d82eb8a4113229fc6a4f9 100644 (file)
--- 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

diff --git a/libs/libcli/Makefile b/libs/libcli/Makefile
index 7f944f2fa50a411f13f17ba756405c197d4d90bf..1f2c69ccf627d2f40f5ea2687a4d22f35717b2ff 100755 (executable)
--- 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

diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile
index 49eade9f39d79578285387aa464015a973ed8eef..8476149dc46b72114d942dd37c9e19fdb7cdbd54 100644 (file)
--- 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)"

diff --git a/libs/libjpeg/Makefile b/libs/libjpeg/Makefile
index e136e4220ef15f8bf1478f48497d58c43e49299d..c9f5345ea919716d10a2455561dfeaa2656be4f1 100644 (file)
--- 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))

diff --git a/multimedia/peercast/Makefile b/multimedia/peercast/Makefile
index 0afa39d4ae5cb880ad05427114180ae0b7c859dd..aec2c0944feee3841b70864a6a829b71d44a664a 100644 (file)
--- 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        

diff --git a/net/aircrack-ng/Makefile b/net/aircrack-ng/Makefile
index 37449495b0537575a34b57d1d7ae34b671e9eeba..f2c8dfb14c37832feadac85f2e450c0ed9e63f29 100644 (file)
--- 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)" \

diff --git a/net/aodv-uu/Makefile b/net/aodv-uu/Makefile
index baa36207d5c8c9b380e04e342b174c8710623ca7..4247d94f4fd4a62efc7c224b6568b10a6cc94fa7 100644 (file)
--- 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
 

diff --git a/net/atftp/Makefile b/net/atftp/Makefile
index bc4f4fad0fc88e064914cadc750d3054316ce8e4..3042711f6df40d42f5109035bb5d2d715911aec9 100644 (file)
--- 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)

diff --git a/net/autossh/Makefile b/net/autossh/Makefile
index 391eca7c81b76ff94615f979139adc10c65a7839..12fb9a481c8217b670ca5a916bef10198eb3c068 100644 (file)
--- 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

diff --git a/net/bind/Makefile b/net/bind/Makefile
index b0f0d35dcc986982a3f1f320f52f2defaac3fdf4..808949e98f4c54c528ce46bc2713d07b671cc9f0 100644 (file)
--- 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
 

diff --git a/net/bitchx/Makefile b/net/bitchx/Makefile
index d64ddea3faa24a74aaac524b1b066a2c9454e993..a355e70ef5448781993d1786060e2195436ce879 100644 (file)
--- 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)

diff --git a/net/ctorrent/Makefile b/net/ctorrent/Makefile
index b795c45778f6ef6063b54c414933496b45a70677..e5631f5ad863d8360a32e17cd6eb6a3631c864b7 100755 (executable)
--- 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        

diff --git a/net/elinks/Makefile b/net/elinks/Makefile
index dd20436bad59484aa6ac8f0a25a445755de6648d..b1e4970409e62cbb9a988e29d4084f8c69bba351 100644 (file)
--- 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/

diff --git a/net/ethtool/Makefile b/net/ethtool/Makefile
index 25a56a1a02ee5de9652c2d72951b7775643bf778..3ee4debf15351e4af0c09f4c69699285be17af25 100644 (file)
--- 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)

diff --git a/net/fping/Makefile b/net/fping/Makefile
index 8f4902b2b21f5bf5fead93e3f4a0b6b82b3dea00..729dbd909eaa8875cc592cacaab17327a4c76fa5 100644 (file)
--- 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

diff --git a/net/httping/Makefile b/net/httping/Makefile
index f92015b2e6034a552d2520fb7aafd29d32d8711c..a77f2e33a0ab4f0dee55cd932c6b05295932fe7f 100644 (file)
--- a/net/httping/Makefile
+++ b/net/httping/Makefile
@@ -32,9 +32,8 @@ transmission across the network also takes time!\\\
   URL:=http://www.vanheusden.com/httping/
 endef
 
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) -f $(PKG_BUILD_DIR)/Makefile$(SSL_ENABLE) \
-               CC="$(TARGET_CC)" STAGING_DIR=$(STAGING_DIR)
+define Build/Compile
+  $(call Build/Compile/Default,-f $(PKG_BUILD_DIR)/Makefile$(SSL_ENABLE) STAGING_DIR=$(STAGING_DIR))
 endef
 
 define Package/httping/install 

diff --git a/net/iftop/Makefile b/net/iftop/Makefile
index 44501c700e9472205782b99dc6428571cc4aba46..93318ce096472378b401d97e328f8d4aa9d883d2 100644 (file)
--- 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   

diff --git a/net/iptables-snmp/Makefile b/net/iptables-snmp/Makefile
index dfb243c50c46aa645790b84fb3379d36610a1d9c..eaa6b2f405fd9dfda3dce9995264a0d62c6d4e99 100644 (file)
--- 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   

diff --git a/net/irssi/Makefile b/net/irssi/Makefile
index 3f815fe0e7ec62339b9e1a141f0e5e7ba2d6a9fc..5900d20b5f1d2ada75086778919c1dce4e86a507 100644 (file)
--- 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/

diff --git a/net/l2tpd/Makefile b/net/l2tpd/Makefile
index f478e722b164e78a25c7533a81ddcfe5fcbebf70..1f4838056c7445a7ee0736835dff83305accd865 100644 (file)
--- 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   

diff --git a/net/l2tpns/Makefile b/net/l2tpns/Makefile
index e363df8ae5b9dbedb5e698756a120187eaddc341..323a6dce1053efcb697c204157d2259201669288 100644 (file)
--- 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  

diff --git a/net/miau/Makefile b/net/miau/Makefile
index b14efc17c81859a0dc764016e3fda4c17c04f7c9..3afa9de2eaaea76ed5b4113e18f41255b49c6744 100644 (file)
--- 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    

diff --git a/net/miax/Makefile b/net/miax/Makefile
index 47ad90e5dcd7748e3c5df32644b296325ef0f2df..200dd04a970e7ca99dcf4e47382342f59be91b6e 100644 (file)
--- a/net/miax/Makefile
+++ b/net/miax/Makefile
@@ -32,7 +32,7 @@ keyboard, analog/gsm/isdn modem or bluetooth phones.\\\
  URL:=http://www.eja.it/?l=gpl&testo=miax
 endef
 
-define Build/Compile   
+define Build/Compile
        $(MAKE) -C "$(PKG_BUILD_DIR)" \
                CC="$(TARGET_CC)" \
                OFLAGS="$(TARGET_CFLAGS)" \

diff --git a/net/mini_httpd/Makefile b/net/mini_httpd/Makefile
index 8c0c8a749b3ac9141069cf400357c34318ed36b8..1640fa755c935ff5d9893e86f98ff0b9c0eb87b0 100644 (file)
--- 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

diff --git a/net/mini_sendmail/Makefile b/net/mini_sendmail/Makefile
index f2411ed4823f3f8743675269d1461bf102532423..ac31596fa3eaf5f886c7d8b644cc82b4d037a85f 100644 (file)
--- 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

diff --git a/net/netperf/Makefile b/net/netperf/Makefile
index 2f623f1b76ec1b873e8770b807756d1a9ca7a8e2..134d3d54860fba270f2fd5a22c8f3de86673970b 100644 (file)
--- 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

diff --git a/net/netstat-nat/Makefile b/net/netstat-nat/Makefile
index 8128e1af635282a6f9e62cbeb6b7c59bfef89814..01640849911af2d586e1ec4d36dea1d45115340e 100644 (file)
--- 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)

diff --git a/net/nfs-server/Makefile b/net/nfs-server/Makefile
index e9faddbf20d41ba7f0b2e8e39d0332a83276a1b9..3132f12dc0640c75bf363a8192a46e2f9ddf8d02 100644 (file)
--- 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

diff --git a/net/ntpclient/Makefile b/net/ntpclient/Makefile
index 1984afe6349407136e1356d0e290177c3d268d4a..b9ad6dbcee7d2697f4710414e7411f377cf01f08 100644 (file)
--- a/net/ntpclient/Makefile
+++ b/net/ntpclient/Makefile
@@ -29,9 +29,8 @@ define Package/ntpclient
   URL:=http://doolittle.faludi.com/ntpclient
 endef
 
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" all adjtimex
+define Build/Compile
+  $(call Build/Compile/Default,all adjtimex)
 endef
 
 define Package/ntpclient/install       

diff --git a/net/oidentd/Makefile b/net/oidentd/Makefile
index 3a0d0b258b79784cdd9b80e09b8e8e5fb38ab705..9520375bc700cafe41e2bcb841b42d86f1d0da5e 100755 (executable)
--- 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
 

diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
index 57b903aa973d0e4458cdacae22406110302556c5..84375afcf99b3e47d27c7f4becdb56ff2aa07770 100644 (file)
--- 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        

diff --git a/net/parprouted/Makefile b/net/parprouted/Makefile
index 455802a2b02aa69718da0b9d180ce79f9b4c9add..9fd309a8e396f3f3c740a8ea97bff5df41f5b1b7 100644 (file)
--- 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      

diff --git a/net/peerguardian/Makefile b/net/peerguardian/Makefile
index 91a3f502c735ba1e99c49b80bdd97dcb6162d96c..7315cfc6ec934ef61dbd8ac01c19fa21d0eff800 100755 (executable)
--- 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/

diff --git a/net/pptpd/Makefile b/net/pptpd/Makefile
index 176650997875d53385c5481be9f82947d396a712..37895b8f04c302172549b050192de564857e9742 100755 (executable)
--- 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

diff --git a/net/psybnc/Makefile b/net/psybnc/Makefile
index 76b0bc846c0b41873a5d8625cf935b9f8641fcdf..4a617a4ecb3d40ce710fd8a9b71abd89af67fbbd 100644 (file)
--- 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  

diff --git a/net/ptunnel/Makefile b/net/ptunnel/Makefile
index 119eaa47705e3c3850a0d21186c4d736ce566143..a6dbdf9fc15a7b46abda4caf09e0c829c049bc3f 100644 (file)
--- 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 

diff --git a/net/reaim/Makefile b/net/reaim/Makefile
index 87e8700f7011ef54d494fb725fc45fb7622cee38..bdf4bc5d059f7754849d4699f76a655ecaf0aac6 100644 (file)
--- 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   

diff --git a/net/rp-l2tp/Makefile b/net/rp-l2tp/Makefile
index d482cae66d426c2d8b634e8d0872e37413c2b62d..37ea89eb6c4335114dcafd4ef804a481090c2449 100644 (file)
--- 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        

diff --git a/net/scanlogd/Makefile b/net/scanlogd/Makefile
index ca255a2b26099878924ed882fa89559078cded8b..6cd8944705de7c5f6cb8906e21efd6967cfab33a 100644 (file)
--- 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" \

diff --git a/net/shat/Makefile b/net/shat/Makefile
index ce55ff9a1565c4009a1b281c960bc1b19d5eea09..ec7bdf4df8ad18da635b7b70790540da5e75a8ad 100644 (file)
--- 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
 

diff --git a/net/sipp/Makefile b/net/sipp/Makefile
index 3009355430bd35a7260ab259830e6c8a904f429b..ad0447009e28248e3d1a8d7a5c4ee81027e5ba0d 100644 (file)
--- 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
 

diff --git a/net/srelay/Makefile b/net/srelay/Makefile
index db1b2e2879a9e437acf82facfd25c151aac688c5..595f37817d953faeac9204c8f7d094b9caf6faac 100644 (file)
--- 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

diff --git a/net/ssltunnel/Makefile b/net/ssltunnel/Makefile
index c653cf1a7be340b898e3a5460fa117c2aee5a89f..6fb5017e62a8ff0e8bcdf54f5e057fff9d7c5bcb 100644 (file)
--- 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

diff --git a/net/ssmtp/Makefile b/net/ssmtp/Makefile
index a6e591a017a53104f3365183281cda408d01c357..8215a548d71d8c08d34eedd20c60532011dc6f4d 100644 (file)
--- a/net/ssmtp/Makefile
+++ b/net/ssmtp/Makefile
@@ -34,10 +34,7 @@ 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)
 endef

diff --git a/net/tinc/Makefile b/net/tinc/Makefile
index 7e4f3b1972b6144d5c6e631309c0b9c645f44bc3..a5105a0d24e9f6d4f2cb44b4fe64bd1c39979e4e 100644 (file)
--- 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)

diff --git a/net/vgp/Makefile b/net/vgp/Makefile
index 34381a06c3a983ee0e7da56fc85ea2b9424a8103..43cdfa70dcc8f6591df9643bd4f9676be1ddbba6 100755 (executable)
--- 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

diff --git a/net/vncrepeater/Makefile b/net/vncrepeater/Makefile
index e2601de6e326bb35cae0c7f331c5f491cc8c06cf..ead836f3813b5a601fdb3cdb236ca06b23ac8018 100644 (file)
--- 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)

diff --git a/net/vnstat/Makefile b/net/vnstat/Makefile
index 7350b168a9b2569b4aad1c6697bedf68f2712d99..86e5414164f2408ce332fa032af2635de3804016 100644 (file)
--- 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/

diff --git a/net/vrrpd/Makefile b/net/vrrpd/Makefile
index 17344c026dd624630fd5f53d8a4d760c47f55c60..854776bfb901473e4793bd10900c0c04c6f1b5c1 100644 (file)
--- 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)

diff --git a/net/yafc/Makefile b/net/yafc/Makefile
index 4fa243d0e39276a6c307fd8d16e6dcf92dfac808..92cc5aed8a8fdf46b9c4479d83e1b5795a5a655a 100644 (file)
--- 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/

diff --git a/utils/bc/Makefile b/utils/bc/Makefile
index 8613c68f6e7790acf1401aa4af9fc1110b947e01..0d7bbf62df522a28673e65206ffb8175910bf62e 100644 (file)
--- 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)

diff --git a/utils/cifsmount/Makefile b/utils/cifsmount/Makefile
index 147e09b500675e0065ef5e658b5e7df91b3c99b0..9cc4c3a95e508883696b7806d5de32b06c6fbfd6 100644 (file)
--- 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

diff --git a/utils/comgt/Makefile b/utils/comgt/Makefile
index 28874be906c666733262bfd2c586759a2d3c136b..0df02f4377154692fb8f627c0508da79d710e7a0 100644 (file)
--- 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

diff --git a/utils/deco/Makefile b/utils/deco/Makefile
index 78a92dbb3111548a27d59dea2be1935c07e71fad..abd9a31e5f794bbf60f091d52c24e4f1a49a9cb5 100644 (file)
--- 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

diff --git a/utils/gnupg/Makefile b/utils/gnupg/Makefile
index 4ea1dc2f4851be4b25e2e8197546235a818fa205..43b6035c5a55e1cacc2cccf4cb16a42d447435cc 100644 (file)
--- 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/

diff --git a/utils/hdparm/Makefile b/utils/hdparm/Makefile
index 36ced21208337a2782476ffd5c1613216d32cbb8..9328b07e22e9b32de216e8592d8371c1dd53e235 100644 (file)
--- 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

diff --git a/utils/heyu/Makefile b/utils/heyu/Makefile
index 37d528d8b071783ce99c77ee4cffb981fcad4810..b451d7950e668f918e4df349d10b99cb25ee1276 100644 (file)
--- a/utils/heyu/Makefile
+++ b/utils/heyu/Makefile
@@ -31,10 +31,8 @@ define Package/heyu/conffiles
 /etc/heyu/x10.conf
 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"
+define Build/Compile
+  $(call Build/Compile/Default, CFLAGS="$(TARGET_CFLAGS) -I$(PKG_BUILD_DIR) -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX -DHASSELECT -DHASTZ")
 endef
 
 define Package/heyu/install    

diff --git a/utils/lcd4linux/Makefile b/utils/lcd4linux/Makefile
index 5eb9e15d8ec294a94801c394231e98b31603d695..2af009b48bf4f2419c18503ffd1b85aaf27f79c4 100644 (file)
--- 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

diff --git a/utils/logrotate/Makefile b/utils/logrotate/Makefile
index 27eddda25e0e4825c847b77d1039b82a24327840..4548f2961ba53b1a8bcda14108499dce77665bdd 100644 (file)
--- 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       

diff --git a/utils/macchanger/Makefile b/utils/macchanger/Makefile
index 24b5a863005694f4c7d7087a0fc24718859c638c..8522248018c49a002b0d41888bd22587a351a6d6 100755 (executable)
--- 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

diff --git a/utils/microcom/Makefile b/utils/microcom/Makefile
index ab2186535e5c975270735f4282389f3927be966d..646c9e5cd7df15a19ff95bfb4f2c1a02a718541e 100644 (file)
--- 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

diff --git a/utils/mutt/Makefile b/utils/mutt/Makefile
index 11494de52017105a6553fa3992163928538f2582..f54b7393f182e6cf85058d033aaff61333d0e65c 100644 (file)
--- 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/

diff --git a/utils/pciutils/Makefile b/utils/pciutils/Makefile
index 7b12360c0baceab331196f6574544558b1195c10..724f2b0a2e307b431508728d72788e0e3e8aa95d 100644 (file)
--- 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

diff --git a/utils/procmail/Makefile b/utils/procmail/Makefile
index efe9ec67cf84f7c8a60df911ef1f7472f5f66d71..ac232a99ee9fd494d3d082595c1f952bd4a8a5d5 100644 (file)
--- 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

diff --git a/utils/vim/Makefile b/utils/vim/Makefile
index f5e0d4d2a42a4c5ca117a6084406db61bc3cdf6a..aa6f526f61b4329e4abf77a6810bd46d77a0e266 100644 (file)
--- 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