From 8397a4ca1b0ff32f6517e012e3e7553c5dfe3d26 Mon Sep 17 00:00:00 2001 From: cmchao Date: Wed, 16 Jun 2010 19:47:03 +0800 Subject: distcc : convert to autotools infrastructure & bump to 1.1-20100428 Changes by Thomas Petazzoni * Target installation is the default behaviour * No installation to staging is the default behaviour * Remove DISTCC_BINARY/DISTCC_TARGET_BINARY variables Signed-off-by: cmchao --- package/distcc/distcc.mk | 70 ++++++++---------------------------------------- 1 file changed, 11 insertions(+), 59 deletions(-) diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk index 75cfacc5b..f3d13bda6 100644 --- a/package/distcc/distcc.mk +++ b/package/distcc/distcc.mk @@ -5,67 +5,19 @@ ############################################################# DISTCC_VERSION:=2.18.3 DISTCC_SOURCE:=distcc-$(DISTCC_VERSION).tar.bz2 -DISTCC_CAT:=$(BZCAT) DISTCC_SITE:=http://distcc.samba.org/ftp/distcc/ -DISTCC_BUILDDIR:=$(BUILD_DIR)/distcc-$(DISTCC_VERSION) -DISTCC_BINARY:=distcc -DISTCC_TARGET_BINARY:=usr/bin/distcc -$(DL_DIR)/$(DISTCC_SOURCE): - $(call DOWNLOAD,$(DISTCC_SITE),$(DISTCC_SOURCE)) +DISTCC_CONF_OPT = --with-included-popt --without-gtk --without-gnome -distcc-source: $(DL_DIR)/$(CVS_SOURCE) +define DISTCC_INSTALL_TARGET_CMDS + install -D $(@D)/distccd $(TARGET_DIR)/usr/bin/distccd + install -D $(@D)/distcc $(TARGET_DIR)/usr/bin/distcc +endef -$(DISTCC_BUILDDIR)/.unpacked: $(DL_DIR)/$(DISTCC_SOURCE) - $(DISTCC_CAT) $(DL_DIR)/$(DISTCC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - $(CONFIG_UPDATE) $(DISTCC_BUILDDIR) - touch $(DISTCC_BUILDDIR)/.unpacked +define DISTCC_CLEAN_CMDS + rm -f $(TARGET_DIR)/usr/bin/distcc + rm -f $(TARGET_DIR)/usr/bin/distccd + -$(MAKE) -C $(@D) clean +endef -$(DISTCC_BUILDDIR)/.configured: $(DISTCC_BUILDDIR)/.unpacked - (cd $(DISTCC_BUILDDIR); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure $(QUIET) \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --libdir=/lib \ - --libexecdir=/usr/lib \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --localstatedir=/var \ - --mandir=/usr/man \ - --infodir=/usr/info \ - --with-included-popt \ - --without-gtk \ - --without-gnome \ - ) - touch $(DISTCC_BUILDDIR)/.configured - -$(DISTCC_BUILDDIR)/$(DISTCC_BINARY): $(DISTCC_BUILDDIR)/.configured - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(DISTCC_BUILDDIR) - -$(TARGET_DIR)/$(DISTCC_TARGET_BINARY): $(DISTCC_BUILDDIR)/$(DISTCC_BINARY) - install -D $(DISTCC_BUILDDIR)/$(DISTCC_BINARY)d $(TARGET_DIR)/$(DISTCC_TARGET_BINARY)d - install -D $(DISTCC_BUILDDIR)/$(DISTCC_BINARY) $(TARGET_DIR)/$(DISTCC_TARGET_BINARY) - -distcc: $(TARGET_DIR)/$(DISTCC_TARGET_BINARY) - -distcc-clean: - rm -f $(TARGET_DIR)/$(DISTCC_TARGET_BINARY) - rm -f $(TARGET_DIR)/$(DISTCC_TARGET_BINARY)d - -$(MAKE) -C $(DISTCC_BUILDDIR) clean - -distcc-dirclean: - rm -rf $(DISTCC_BUILDDIR) -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_DISTCC),y) -TARGETS+=distcc -endif +$(eval $(call AUTOTARGETS,package,distcc)) -- cgit v1.2.3