summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rules/memtest.make75
-rw-r--r--rules/memtester.make69
2 files changed, 42 insertions, 102 deletions
diff --git a/rules/memtest.make b/rules/memtest.make
index 6df821301..da9d1fc04 100644
--- a/rules/memtest.make
+++ b/rules/memtest.make
@@ -17,89 +17,56 @@ PACKAGES-$(PTXCONF_MEMTEST) += memtest
#
# Paths and names
#
-MEMTEST_VERSION = 0.0.4
-MEMTEST = memtest-$(MEMTEST_VERSION)
-MEMTEST_SUFFIX = tar.bz2
-MEMTEST_URL = http://carpanta.dc.fi.udc.es/~quintela/memtest/$(MEMTEST).$(MEMTEST_SUFFIX)
-MEMTEST_SOURCE = $(SRCDIR)/$(MEMTEST).$(MEMTEST_SUFFIX)
-MEMTEST_DIR = $(BUILDDIR)/$(MEMTEST)
+MEMTEST_VERSION := 0.0.4
+MEMTEST := memtest-$(MEMTEST_VERSION)
+MEMTEST_SUFFIX := tar.bz2
+MEMTEST_URL := http://carpanta.dc.fi.udc.es/~quintela/memtest/$(MEMTEST).$(MEMTEST_SUFFIX)
+MEMTEST_SOURCE := $(SRCDIR)/$(MEMTEST).$(MEMTEST_SUFFIX)
+MEMTEST_DIR := $(BUILDDIR)/$(MEMTEST)
# ----------------------------------------------------------------------------
# Get
# ----------------------------------------------------------------------------
-memtest_get: $(STATEDIR)/memtest.get
-
-$(STATEDIR)/memtest.get: $(memtest_get_deps_default)
- @$(call targetinfo, $@)
- @$(call touch, $@)
-
$(MEMTEST_SOURCE):
- @$(call targetinfo, $@)
+ @$(call targetinfo)
@$(call get, MEMTEST)
# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-memtest_extract: $(STATEDIR)/memtest.extract
-
-$(STATEDIR)/memtest.extract: $(memtest_extract_deps_default)
- @$(call targetinfo, $@)
- @$(call clean, $(MEMTEST_DIR))
- @$(call extract, MEMTEST)
- @$(call patchin, MEMTEST)
- @$(call touch, $@)
-
-# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
-memtest_prepare: $(STATEDIR)/memtest.prepare
+MEMTEST_PATH := PATH=$(CROSS_PATH)
+MEMTEST_ENV := $(CROSS_ENV)
-MEMTEST_PATH = PATH=$(CROSS_PATH)
-MEMTEST_ENV = $(CROSS_ENV)
-
-#
-# autoconf
-#
-MEMTEST_AUTOCONF = $(CROSS_AUTOCONF_USR)
-
-$(STATEDIR)/memtest.prepare: $(memtest_prepare_deps_default)
- @$(call targetinfo, $@)
- @$(call clean, $(MEMTEST_DIR)/config.cache)
- @$(call touch, $@)
+$(STATEDIR)/memtest.prepare:
+ @$(call targetinfo)
+ @$(call touch)
# ----------------------------------------------------------------------------
# Compile
# ----------------------------------------------------------------------------
-memtest_compile: $(STATEDIR)/memtest.compile
-
-$(STATEDIR)/memtest.compile: $(memtest_compile_deps_default)
- @$(call targetinfo, $@)
+$(STATEDIR)/memtest.compile:
+ @$(call targetinfo)
cd $(MEMTEST_DIR) && $(MEMTEST_ENV) $(MEMTEST_PATH) make mtest
- @$(call touch, $@)
+ @$(call touch)
# ----------------------------------------------------------------------------
# Install
# ----------------------------------------------------------------------------
-memtest_install: $(STATEDIR)/memtest.install
-
-$(STATEDIR)/memtest.install: $(memtest_install_deps_default)
- @$(call targetinfo, $@)
- @$(call touch, $@)
+$(STATEDIR)/memtest.install:
+ @$(call targetinfo)
+ @$(call touch)
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
-memtest_targetinstall: $(STATEDIR)/memtest.targetinstall
-
-$(STATEDIR)/memtest.targetinstall: $(memtest_targetinstall_deps_default)
- @$(call targetinfo, $@)
+$(STATEDIR)/memtest.targetinstall:
+ @$(call targetinfo)
@$(call install_init, memtest)
@$(call install_fixup, memtest,PACKAGE,memtest)
@@ -114,7 +81,7 @@ $(STATEDIR)/memtest.targetinstall: $(memtest_targetinstall_deps_default)
@$(call install_finish, memtest)
- @$(call touch, $@)
+ @$(call touch)
# ----------------------------------------------------------------------------
# Clean
diff --git a/rules/memtester.make b/rules/memtester.make
index bb9ef7e8b..d4dd587f5 100644
--- a/rules/memtester.make
+++ b/rules/memtester.make
@@ -17,85 +17,58 @@ PACKAGES-$(PTXCONF_MEMTESTER) += memtester
#
# Paths and names
#
-MEMTESTER_VERSION = 4.0.6
-MEMTESTER = memtester-$(MEMTESTER_VERSION)
-MEMTESTER_SUFFIX = tar.gz
-MEMTESTER_URL = http://pyropus.ca/software/memtester/old-versions/$(MEMTESTER).$(MEMTESTER_SUFFIX)
-MEMTESTER_SOURCE = $(SRCDIR)/$(MEMTESTER).$(MEMTESTER_SUFFIX)
-MEMTESTER_DIR = $(BUILDDIR)/$(MEMTESTER)
+MEMTESTER_VERSION := 4.0.6
+MEMTESTER := memtester-$(MEMTESTER_VERSION)
+MEMTESTER_SUFFIX := tar.gz
+MEMTESTER_URL := http://pyropus.ca/software/memtester/old-versions/$(MEMTESTER).$(MEMTESTER_SUFFIX)
+MEMTESTER_SOURCE := $(SRCDIR)/$(MEMTESTER).$(MEMTESTER_SUFFIX)
+MEMTESTER_DIR := $(BUILDDIR)/$(MEMTESTER)
# ----------------------------------------------------------------------------
# Get
# ----------------------------------------------------------------------------
-memtester_get: $(STATEDIR)/memtester.get
-
-$(STATEDIR)/memtester.get: $(memtester_get_deps_default)
- @$(call targetinfo, $@)
- @$(call touch, $@)
-
$(MEMTESTER_SOURCE):
- @$(call targetinfo, $@)
+ @$(call targetinfo)
@$(call get, MEMTESTER)
# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-memtester_extract: $(STATEDIR)/memtester.extract
-
-$(STATEDIR)/memtester.extract: $(memtester_extract_deps_default)
- @$(call targetinfo, $@)
- @$(call clean, $(MEMTESTER_DIR))
- @$(call extract, MEMTESTER)
- @$(call patchin, MEMTESTER)
- @$(call touch, $@)
-
-# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
-memtester_prepare: $(STATEDIR)/memtester.prepare
-
-MEMTESTER_PATH = PATH=$(CROSS_PATH)
-MEMTESTER_ENV = $(CROSS_ENV)
+MEMTESTER_PATH := PATH=$(CROSS_PATH)
+MEMTESTER_ENV := $(CROSS_ENV)
-$(STATEDIR)/memtester.prepare: $(memtester_prepare_deps_default)
- @$(call targetinfo, $@)
+$(STATEDIR)/memtester.prepare:
+ @$(call targetinfo)
echo "all: memtester" > $(MEMTESTER_DIR)/Makefile.ptxdist
echo "memtester: tests.o memtester.o" >> $(MEMTESTER_DIR)/Makefile.ptxdist
- @$(call touch, $@)
+ @$(call touch)
# ----------------------------------------------------------------------------
# Compile
# ----------------------------------------------------------------------------
-memtester_compile: $(STATEDIR)/memtester.compile
-
-$(STATEDIR)/memtester.compile: $(memtester_compile_deps_default)
- @$(call targetinfo, $@)
+$(STATEDIR)/memtester.compile:
+ @$(call targetinfo)
cd $(MEMTESTER_DIR) && $(MEMTESTER_ENV) $(MEMTESTER_PATH) make -f Makefile.ptxdist
- @$(call touch, $@)
+ @$(call touch)
# ----------------------------------------------------------------------------
# Install
# ----------------------------------------------------------------------------
-memtester_install: $(STATEDIR)/memtester.install
-
-$(STATEDIR)/memtester.install: $(memtester_install_deps_default)
- @$(call targetinfo, $@)
- @$(call touch, $@)
+$(STATEDIR)/memtester.install:
+ @$(call targetinfo)
+ @$(call touch)
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
-memtester_targetinstall: $(STATEDIR)/memtester.targetinstall
-
-$(STATEDIR)/memtester.targetinstall: $(memtester_targetinstall_deps_default)
- @$(call targetinfo, $@)
+$(STATEDIR)/memtester.targetinstall:
+ @$(call targetinfo)
@$(call install_init, memtester)
@$(call install_fixup, memtester,PACKAGE,memtester)
@@ -110,7 +83,7 @@ $(STATEDIR)/memtester.targetinstall: $(memtester_targetinstall_deps_default)
@$(call install_finish, memtester)
- @$(call touch, $@)
+ @$(call touch)
# ----------------------------------------------------------------------------
# Clean