[Buildroot] [PATCH 11/19] make : convert to autotools infrastructure
Paulius Zaleckas
paulius.zaleckas at gmail.com
Wed Jun 16 12:58:25 UTC 2010
On Wed, Jun 16, 2010 at 2:47 PM, cmchao <cmchao at gmail.com> wrote:
>
> Signed-off-by: cmchao <cmchao at gmail.com>
> ---
> package/make/make.mk | 76 ++++++-------------------------------------------
> 1 files changed, 10 insertions(+), 66 deletions(-)
>
> diff --git a/package/make/make.mk b/package/make/make.mk
> index 0b2657d..f09ef68 100644
> --- a/package/make/make.mk
> +++ b/package/make/make.mk
> @@ -3,73 +3,17 @@
> # make
> #
> #############################################################
> -GNUMAKE_VERSION:=3.81
> -GNUMAKE_SOURCE:=make-$(GNUMAKE_VERSION).tar.bz2
> -GNUMAKE_SITE:=$(BR2_GNU_MIRROR)/make
> -GNUMAKE_DIR:=$(BUILD_DIR)/make-$(GNUMAKE_VERSION)
> -GNUMAKE_CAT:=$(BZCAT)
> -GNUMAKE_BINARY:=make
> -GNUMAKE_TARGET_BINARY:=usr/bin/make
> +MAKE_VERSION:=3.81
> +MAKE_SOURCE:=make-$(MAKE_VERSION).tar.bz2
> +MAKE_SITE:=$(BR2_GNU_MIRROR)/make
>
> -$(DL_DIR)/$(GNUMAKE_SOURCE):
> - $(call DOWNLOAD,$(GNUMAKE_SITE),$(GNUMAKE_SOURCE))
> +MaOAAKE_INSTALL_STAGING = NO
> +MBOAAKE_INSTALL_TARGET = YES
What is this?
> -make-source: $(DL_DIR)/$(GNUMAKE_SOURCE)
> +MAKE_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
>
> -$(GNUMAKE_DIR)/.unpacked: $(DL_DIR)/$(GNUMAKE_SOURCE)
> - $(GNUMAKE_CAT) $(DL_DIR)/$(GNUMAKE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
> - $(CONFIG_UPDATE) $(GNUMAKE_DIR)/config
> - touch $@
> +MAKE_CONF_ENV = make_cv_sys_gnu_glob=no \
> + GLOBINC='-I$(@D)/glob' \
> + GLOBLIB=glob/libglob.a
>
> -$(GNUMAKE_DIR)/.configured: $(GNUMAKE_DIR)/.unpacked
> - (cd $(GNUMAKE_DIR); rm -rf config.cache; \
> - $(TARGET_CONFIGURE_OPTS) \
> - $(TARGET_CONFIGURE_ARGS) \
> - make_cv_sys_gnu_glob=no \
> - GLOBINC='-I$(GNUMAKE_DIR)/glob' \
> - GLOBLIB=glob/libglob.a \
> - ./configure $(QUIET) \
> - --target=$(GNU_TARGET_NAME) \
> - --host=$(GNU_TARGET_NAME) \
> - --build=$(GNU_HOST_NAME) \
> - --prefix=/usr \
> - --exec-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 \
> - $(DISABLE_NLS) \
> - $(DISABLE_LARGEFILE) \
> - )
> - touch $@
> -
> -$(GNUMAKE_DIR)/$(GNUMAKE_BINARY): $(GNUMAKE_DIR)/.configured
> - $(MAKE) MAKE=$(HOSTMAKE) -C $(GNUMAKE_DIR)
> -
> -$(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY): $(GNUMAKE_DIR)/$(GNUMAKE_BINARY)
> - $(MAKE) DESTDIR=$(TARGET_DIR) -C $(GNUMAKE_DIR) install
> - rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
> - $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
> -
> -make: $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY)
> -
> -make-clean:
> - $(MAKE) DESTDIR=$(TARGET_DIR) -C $(GNUMAKE_DIR) uninstall
> - -$(MAKE) -C $(GNUMAKE_DIR) clean
> -
> -make-dirclean:
> - rm -rf $(GNUMAKE_DIR)
> -
> -#############################################################
> -#
> -# Toplevel Makefile options
> -#
> -#############################################################
> -ifeq ($(BR2_PACKAGE_MAKE),y)
> -TARGETS+=make
> -endif
> +$(eval $(call AUTOTARGETS,package,make))
> --
> 1.7.0.4
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
More information about the buildroot
mailing list