diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-01-06 08:52:28 +0000 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-01-06 08:52:28 +0000 |
commit | 4eb5c35cd430d1924a269867012245656faca98f (patch) | |
tree | 740cd532df7e09d7792c123d1241b699f0eda6f7 | |
parent | fa88129dd286f0b5503a2a6e5969a73c8f7bf91e (diff) | |
download | ptxdist-4eb5c35cd430d1924a269867012245656faca98f.tar.gz ptxdist-4eb5c35cd430d1924a269867012245656faca98f.tar.xz |
* mtd-utils.make, liblzo.make, host-mtd-utils.in, host-mtd-utils.make, host-liblzo.make:
cleanups
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9426 33e552b5-05e3-0310-8538-816dae2090ed
-rw-r--r-- | rules/host-liblzo.make | 44 | ||||
-rw-r--r-- | rules/host-mtd-utils.in | 3 | ||||
-rw-r--r-- | rules/host-mtd-utils.make | 8 | ||||
-rw-r--r-- | rules/liblzo.make | 11 | ||||
-rw-r--r-- | rules/mtd-utils.make | 13 |
5 files changed, 11 insertions, 68 deletions
diff --git a/rules/host-liblzo.make b/rules/host-liblzo.make index 885eb3839..f27ca8976 100644 --- a/rules/host-liblzo.make +++ b/rules/host-liblzo.make @@ -23,31 +23,25 @@ HOST_LIBLZO_DIR = $(HOST_BUILDDIR)/$(LIBLZO) # Get # ---------------------------------------------------------------------------- -host-liblzo_get: $(STATEDIR)/host-liblzo.get - $(STATEDIR)/host-liblzo.get: $(STATEDIR)/liblzo.get - @$(call targetinfo, $@) - @$(call touch, $@) + @$(call targetinfo) + @$(call touch) # ---------------------------------------------------------------------------- # Extract # ---------------------------------------------------------------------------- -host-liblzo_extract: $(STATEDIR)/host-liblzo.extract - $(STATEDIR)/host-liblzo.extract: - @$(call targetinfo, $@) + @$(call targetinfo) @$(call clean, $(HOST_LIBLZO_DIR)) @$(call extract, LIBLZO, $(HOST_BUILDDIR)) @$(call patchin, LIBLZO, $(HOST_LIBLZO_DIR)) - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -host-liblzo_prepare: $(STATEDIR)/host-liblzo.prepare - HOST_LIBLZO_PATH := PATH=$(HOST_PATH) HOST_LIBLZO_ENV := $(HOST_ENV) @@ -56,36 +50,6 @@ HOST_LIBLZO_ENV := $(HOST_ENV) # HOST_LIBLZO_AUTOCONF := $(HOST_AUTOCONF) -$(STATEDIR)/host-liblzo.prepare: - @$(call targetinfo, $@) - @$(call clean, $(HOST_LIBLZO_DIR)/config.cache) - cd $(HOST_LIBLZO_DIR) && \ - $(HOST_LIBLZO_PATH) $(HOST_LIBLZO_ENV) \ - ./configure $(HOST_LIBLZO_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -host-liblzo_compile: $(STATEDIR)/host-liblzo.compile - -$(STATEDIR)/host-liblzo.compile: - @$(call targetinfo, $@) - cd $(HOST_LIBLZO_DIR) && $(HOST_LIBLZO_PATH) $(MAKE) $(PARALLELMFLAGS) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -host-liblzo_install: $(STATEDIR)/host-liblzo.install - -$(STATEDIR)/host-liblzo.install: - @$(call targetinfo, $@) - @$(call install, HOST_LIBLZO,,h) - @$(call touch, $@) - # ---------------------------------------------------------------------------- # Clean # ---------------------------------------------------------------------------- diff --git a/rules/host-mtd-utils.in b/rules/host-mtd-utils.in index d1eb19424..5da007a0c 100644 --- a/rules/host-mtd-utils.in +++ b/rules/host-mtd-utils.in @@ -4,6 +4,5 @@ config HOST_MTD_UTILS tristate select HOST_LIBLZO select HOST_ZLIB - + # Newer version need select HOST_E2FSPROGS -> libuuid.a - diff --git a/rules/host-mtd-utils.make b/rules/host-mtd-utils.make index 92d28aee9..936e3486a 100644 --- a/rules/host-mtd-utils.make +++ b/rules/host-mtd-utils.make @@ -44,13 +44,13 @@ $(STATEDIR)/host-mtd-utils.extract: HOST_MTD_UTILS_COMPILE_ENV := \ $(HOST_ENV) \ - WITHOUT_XATTR=1 \ - WITHOUT_LZO=1 + WITHOUT_XATTR=1 #\ +# WITHOUT_LZO=1 HOST_MTD_UTILS_MAKEVARS := \ PREFIX="$(PTXCONF_SYSROOT_HOST)" \ - WITHOUT_XATTR=1 \ - WITHOUT_LZO=1 + WITHOUT_XATTR=1 #\ +# WITHOUT_LZO=1 $(STATEDIR)/host-mtd-utils.prepare: @$(call targetinfo) diff --git a/rules/liblzo.make b/rules/liblzo.make index b1849311f..3a90500b5 100644 --- a/rules/liblzo.make +++ b/rules/liblzo.make @@ -33,17 +33,6 @@ $(LIBLZO_SOURCE): @$(call get, LIBLZO) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -$(STATEDIR)/liblzo.extract: $(liblzo_extract_deps_default) - @$(call targetinfo) - @$(call clean, $(LIBLZO_DIR)) - @$(call extract, LIBLZO) - @$(call patchin, LIBLZO) - @$(call touch) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make index affb9afac..f6a8a6f70 100644 --- a/rules/mtd-utils.make +++ b/rules/mtd-utils.make @@ -46,7 +46,7 @@ MTD_UTILS_ENV := \ WITHOUT_XATTR=1 ifndef PTXCONF_MTD_UTILS_USE_LIBLZO - MTD_UTILS_ENV += WITHOUT_LZO=1 +MTD_UTILS_ENV += WITHOUT_LZO=1 endif MTD_UTILS_MAKEVARS := BUILDDIR=. WITHOUT_XATTR=1 @@ -62,19 +62,10 @@ $(STATEDIR)/mtd-utils.prepare: $(STATEDIR)/mtd-utils.compile: @$(call targetinfo) cd $(MTD_UTILS_DIR) && $(MTD_UTILS_PATH) $(MTD_UTILS_ENV) \ - $(MAKE) $(MTD_UTILS_MAKEVARS) $(PARALLELMFLAGS) + $(MAKE) $(MTD_UTILS_MAKEVARS) $(PARALLELMFLAGS_BROKEN) @$(call touch) # ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -#$(STATEDIR)/mtd-utils.install: -# @$(call targetinfo) -# @$(call install, MTD_UTILS) -# @$(call touch) - -# ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- |