From: Mike Baker Date: Fri, 18 Aug 2006 21:21:06 +0000 (+0000) Subject: Fix/clean several hundred package makefiles X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=aad785e5f48e14d5cdf9280fce4e76e07db62319 Fix/clean several hundred package makefiles SVN-Revision: 4603 --- diff --git a/admin/osiris/Makefile b/admin/osiris/Makefile index 24520d838b..917134a7a3 100644 --- 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 839afb1e4b..05cf81522b 100755 --- 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 63fe4c96e6..aab01e41e7 100644 --- 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 f88238deff..20e7f1cffe 100644 --- 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 0a46e4bb8f..3e4bf537f4 100644 --- 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 38102f9d68..7717d1c4f9 100644 --- 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 a7f910ad43..1e84b88d26 100644 --- 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 7f944f2fa5..1f2c69ccf6 100755 --- 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 49eade9f39..8476149dc4 100644 --- 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 e136e4220e..c9f5345ea9 100644 --- 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 0afa39d4ae..aec2c0944f 100644 --- 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 37449495b0..f2c8dfb14c 100644 --- 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 baa36207d5..4247d94f4f 100644 --- 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 bc4f4fad0f..3042711f6d 100644 --- 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 391eca7c81..12fb9a481c 100644 --- 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 b0f0d35dcc..808949e98f 100644 --- 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 d64ddea3fa..a355e70ef5 100644 --- 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 b795c45778..e5631f5ad8 100755 --- 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 dd20436bad..b1e4970409 100644 --- 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 25a56a1a02..3ee4debf15 100644 --- 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 8f4902b2b2..729dbd909e 100644 --- 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 f92015b2e6..a77f2e33a0 100644 --- 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 44501c700e..93318ce096 100644 --- 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 dfb243c50c..eaa6b2f405 100644 --- 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 3f815fe0e7..5900d20b5f 100644 --- 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 f478e722b1..1f4838056c 100644 --- 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 e363df8ae5..323a6dce10 100644 --- 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 b14efc17c8..3afa9de2ea 100644 --- 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 47ad90e5dc..200dd04a97 100644 --- 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 8c0c8a749b..1640fa755c 100644 --- 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 f2411ed482..ac31596fa3 100644 --- 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 2f623f1b76..134d3d5486 100644 --- 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 8128e1af63..0164084991 100644 --- 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 e9faddbf20..3132f12dc0 100644 --- 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 1984afe634..b9ad6dbcee 100644 --- 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 3a0d0b258b..9520375bc7 100755 --- 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 57b903aa97..84375afcf9 100644 --- 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 455802a2b0..9fd309a8e3 100644 --- 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 91a3f502c7..7315cfc6ec 100755 --- 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 1766509978..37895b8f04 100755 --- 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 76b0bc846c..4a617a4ecb 100644 --- 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 119eaa4770..a6dbdf9fc1 100644 --- 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 87e8700f70..bdf4bc5d05 100644 --- 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 d482cae66d..37ea89eb6c 100644 --- 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 ca255a2b26..6cd8944705 100644 --- 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 ce55ff9a15..ec7bdf4df8 100644 --- 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 3009355430..ad0447009e 100644 --- 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 db1b2e2879..595f37817d 100644 --- 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 c653cf1a7b..6fb5017e62 100644 --- 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 a6e591a017..8215a548d7 100644 --- 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 7e4f3b1972..a5105a0d24 100644 --- 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 34381a06c3..43cdfa70dc 100755 --- 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 e2601de6e3..ead836f381 100644 --- 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 7350b168a9..86e5414164 100644 --- 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 17344c026d..854776bfb9 100644 --- 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 4fa243d0e3..92cc5aed8a 100644 --- 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 8613c68f6e..0d7bbf62df 100644 --- 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 147e09b500..9cc4c3a95e 100644 --- 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 28874be906..0df02f4377 100644 --- 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 78a92dbb31..abd9a31e5f 100644 --- 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 4ea1dc2f48..43b6035c5a 100644 --- 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 36ced21208..9328b07e22 100644 --- 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 37d528d8b0..b451d7950e 100644 --- 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 5eb9e15d8e..2af009b48b 100644 --- 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 27eddda25e..4548f2961b 100644 --- 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 24b5a86300..8522248018 100755 --- 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 ab2186535e..646c9e5cd7 100644 --- 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 11494de520..f54b7393f1 100644 --- 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 7b12360c0b..724f2b0a2e 100644 --- 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 efe9ec67cf..ac232a99ee 100644 --- 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 f5e0d4d2a4..aa6f526f61 100644 --- 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