diff options
| -rw-r--r-- | rules/host-libxml2.make | 41 | ||||
| -rw-r--r-- | rules/host-pkg-config.make | 53 |
2 files changed, 6 insertions, 88 deletions
diff --git a/rules/host-libxml2.make b/rules/host-libxml2.make index 67ba70e5b..3138cae75 100644 --- a/rules/host-libxml2.make +++ b/rules/host-libxml2.make @@ -2,6 +2,7 @@ # $Id$ # # Copyright (C) 2007 by Robert Schwebel +# 2008 by Marc Kleine-Budde <mkl@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -23,19 +24,15 @@ HOST_LIBXML2_DIR = $(HOST_BUILDDIR)/$(LIBXML2) # Get # ---------------------------------------------------------------------------- -host-libxml2_get: $(STATEDIR)/host-libxml2.get - $(STATEDIR)/host-libxml2.get: $(STATEDIR)/libxml2.get - @$(call targetinfo, $@) - @$(call touch, $@) + @$(call targetinfo) + @$(call touch) # ---------------------------------------------------------------------------- # Extract # ---------------------------------------------------------------------------- -host-libxml2_extract: $(STATEDIR)/host-libxml2.extract - -$(STATEDIR)/host-libxml2.extract: $(host-libxml2_extract_deps_default) +$(STATEDIR)/host-libxml2.extract: @$(call targetinfo, $@) @$(call clean, $(HOST_LIBXML2_DIR)) @$(call extract, LIBXML2, $(HOST_BUILDDIR)) @@ -56,36 +53,6 @@ HOST_LIBXML2_ENV := $(HOST_ENV) # HOST_LIBXML2_AUTOCONF := $(HOST_AUTOCONF) -$(STATEDIR)/host-libxml2.prepare: $(host-libxml2_prepare_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(HOST_LIBXML2_DIR)/config.cache) - cd $(HOST_LIBXML2_DIR) && \ - $(HOST_LIBXML2_PATH) $(HOST_LIBXML2_ENV) \ - ./configure $(HOST_LIBXML2_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -host-libxml2_compile: $(STATEDIR)/host-libxml2.compile - -$(STATEDIR)/host-libxml2.compile: $(host-libxml2_compile_deps_default) - @$(call targetinfo, $@) - cd $(HOST_LIBXML2_DIR) && $(HOST_LIBXML2_PATH) $(MAKE) $(PARALLELMFLAGS) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -host-libxml2_install: $(STATEDIR)/host-libxml2.install - -$(STATEDIR)/host-libxml2.install: $(host-libxml2_install_deps_default) - @$(call targetinfo, $@) - @$(call install, HOST_LIBXML2,,h) - @$(call touch, $@) - # ---------------------------------------------------------------------------- # Clean # ---------------------------------------------------------------------------- diff --git a/rules/host-pkg-config.make b/rules/host-pkg-config.make index da03fe155..49908a68e 100644 --- a/rules/host-pkg-config.make +++ b/rules/host-pkg-config.make @@ -1,7 +1,7 @@ # -*-makefile-*- # $Id$ # -# Copyright (C) 2006 by Marc Kleine-Budde <mkl@pengutronix.de> +# Copyright (C) 2006-2008 by Marc Kleine-Budde <mkl@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -28,30 +28,11 @@ HOST_PKG_CONFIG_DIR := $(HOST_BUILDDIR)/$(HOST_PKG_CONFIG) # Get # ---------------------------------------------------------------------------- -host-pkg-config_get: $(STATEDIR)/host-pkg-config.get - -$(STATEDIR)/host-pkg-config.get: - @$(call targetinfo, $@) - @$(call touch, $@) - $(HOST_PKG_CONFIG_SOURCE): - @$(call targetinfo, $@) + @$(call targetinfo) @$(call get, HOST_PKG_CONFIG) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -host-pkg-config_extract: $(STATEDIR)/host-pkg-config.extract - -$(STATEDIR)/host-pkg-config.extract: - @$(call targetinfo, $@) - @$(call clean, $(HOST_PKG_CONFIG_DIR)) - @$(call extract, HOST_PKG_CONFIG, $(HOST_BUILDDIR)) - @$(call patchin, HOST_PKG_CONFIG, $(HOST_PKG_CONFIG_DIR)) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- @@ -65,36 +46,6 @@ HOST_PKG_CONFIG_ENV := $(HOST_ENV) # HOST_PKG_CONFIG_AUTOCONF := $(HOST_AUTOCONF) -$(STATEDIR)/host-pkg-config.prepare: - @$(call targetinfo, $@) - @$(call clean, $(HOST_PKG_CONFIG_DIR)/config.cache) - cd $(HOST_PKG_CONFIG_DIR) && \ - $(HOST_PKG_CONFIG_PATH) $(HOST_PKG_CONFIG_ENV) \ - ./configure $(HOST_PKG_CONFIG_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -host-pkg-config_compile: $(STATEDIR)/host-pkg-config.compile - -$(STATEDIR)/host-pkg-config.compile: - @$(call targetinfo, $@) - cd $(HOST_PKG_CONFIG_DIR) && $(HOST_PKG_CONFIG_PATH) $(MAKE) $(PARALLELMFLAGS) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -host-pkg-config_install: $(STATEDIR)/host-pkg-config.install - -$(STATEDIR)/host-pkg-config.install: - @$(call targetinfo, $@) - @$(call install, HOST_PKG_CONFIG,,h) - @$(call touch, $@) - # ---------------------------------------------------------------------------- # Clean # ---------------------------------------------------------------------------- |