diff --git a/alib2algo/makefile b/alib2algo/makefile index 2c1b963e6c9a4cb777cd272da089224d59e264ae..4071745bd2294ce5f322510c9e857adaff8a8861 100644 --- a/alib2algo/makefile +++ b/alib2algo/makefile @@ -169,19 +169,23 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/ # ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- # main targets -debug: test-bin-debug/$(TESTBIN) +build-test-debug: test-bin-debug/$(TESTBIN) LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug:,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN) -release: test-bin-release/$(TESTBIN) +build-test-release: test-bin-release/$(TESTBIN) LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release:,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN) -clean: clean-debug clean-release - $(RM) -r doc - build-debug: lib-debug/$(FULL_LIBRARY) build-release: lib-release/$(FULL_LIBRARY) +debug: build-test-debug + +release: build-test-release + +clean: clean-debug clean-release + $(RM) -r doc + clean-debug: if [ -L obj-debug ]; then\ $(RM) -r `readlink obj-debug`;\ diff --git a/alib2algo_experimental/makefile b/alib2algo_experimental/makefile index 2c1b963e6c9a4cb777cd272da089224d59e264ae..4071745bd2294ce5f322510c9e857adaff8a8861 100644 --- a/alib2algo_experimental/makefile +++ b/alib2algo_experimental/makefile @@ -169,19 +169,23 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/ # ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- # main targets -debug: test-bin-debug/$(TESTBIN) +build-test-debug: test-bin-debug/$(TESTBIN) LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug:,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN) -release: test-bin-release/$(TESTBIN) +build-test-release: test-bin-release/$(TESTBIN) LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release:,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN) -clean: clean-debug clean-release - $(RM) -r doc - build-debug: lib-debug/$(FULL_LIBRARY) build-release: lib-release/$(FULL_LIBRARY) +debug: build-test-debug + +release: build-test-release + +clean: clean-debug clean-release + $(RM) -r doc + clean-debug: if [ -L obj-debug ]; then\ $(RM) -r `readlink obj-debug`;\ diff --git a/alib2common/makefile b/alib2common/makefile index 2c1b963e6c9a4cb777cd272da089224d59e264ae..4071745bd2294ce5f322510c9e857adaff8a8861 100644 --- a/alib2common/makefile +++ b/alib2common/makefile @@ -169,19 +169,23 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/ # ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- # main targets -debug: test-bin-debug/$(TESTBIN) +build-test-debug: test-bin-debug/$(TESTBIN) LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug:,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN) -release: test-bin-release/$(TESTBIN) +build-test-release: test-bin-release/$(TESTBIN) LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release:,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN) -clean: clean-debug clean-release - $(RM) -r doc - build-debug: lib-debug/$(FULL_LIBRARY) build-release: lib-release/$(FULL_LIBRARY) +debug: build-test-debug + +release: build-test-release + +clean: clean-debug clean-release + $(RM) -r doc + clean-debug: if [ -L obj-debug ]; then\ $(RM) -r `readlink obj-debug`;\ diff --git a/alib2data/makefile b/alib2data/makefile index 2c1b963e6c9a4cb777cd272da089224d59e264ae..4071745bd2294ce5f322510c9e857adaff8a8861 100644 --- a/alib2data/makefile +++ b/alib2data/makefile @@ -169,19 +169,23 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/ # ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- # main targets -debug: test-bin-debug/$(TESTBIN) +build-test-debug: test-bin-debug/$(TESTBIN) LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug:,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN) -release: test-bin-release/$(TESTBIN) +build-test-release: test-bin-release/$(TESTBIN) LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release:,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN) -clean: clean-debug clean-release - $(RM) -r doc - build-debug: lib-debug/$(FULL_LIBRARY) build-release: lib-release/$(FULL_LIBRARY) +debug: build-test-debug + +release: build-test-release + +clean: clean-debug clean-release + $(RM) -r doc + clean-debug: if [ -L obj-debug ]; then\ $(RM) -r `readlink obj-debug`;\ diff --git a/alib2data_experimental/makefile b/alib2data_experimental/makefile index 2c1b963e6c9a4cb777cd272da089224d59e264ae..4071745bd2294ce5f322510c9e857adaff8a8861 100644 --- a/alib2data_experimental/makefile +++ b/alib2data_experimental/makefile @@ -169,19 +169,23 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/ # ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- # main targets -debug: test-bin-debug/$(TESTBIN) +build-test-debug: test-bin-debug/$(TESTBIN) LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug:,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN) -release: test-bin-release/$(TESTBIN) +build-test-release: test-bin-release/$(TESTBIN) LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release:,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN) -clean: clean-debug clean-release - $(RM) -r doc - build-debug: lib-debug/$(FULL_LIBRARY) build-release: lib-release/$(FULL_LIBRARY) +debug: build-test-debug + +release: build-test-release + +clean: clean-debug clean-release + $(RM) -r doc + clean-debug: if [ -L obj-debug ]; then\ $(RM) -r `readlink obj-debug`;\ diff --git a/alib2elgo/makefile b/alib2elgo/makefile index 2c1b963e6c9a4cb777cd272da089224d59e264ae..4071745bd2294ce5f322510c9e857adaff8a8861 100644 --- a/alib2elgo/makefile +++ b/alib2elgo/makefile @@ -169,19 +169,23 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/ # ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- # main targets -debug: test-bin-debug/$(TESTBIN) +build-test-debug: test-bin-debug/$(TESTBIN) LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug:,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN) -release: test-bin-release/$(TESTBIN) +build-test-release: test-bin-release/$(TESTBIN) LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release:,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN) -clean: clean-debug clean-release - $(RM) -r doc - build-debug: lib-debug/$(FULL_LIBRARY) build-release: lib-release/$(FULL_LIBRARY) +debug: build-test-debug + +release: build-test-release + +clean: clean-debug clean-release + $(RM) -r doc + clean-debug: if [ -L obj-debug ]; then\ $(RM) -r `readlink obj-debug`;\ diff --git a/alib2measurepp/makefile b/alib2measurepp/makefile index 2c1b963e6c9a4cb777cd272da089224d59e264ae..4071745bd2294ce5f322510c9e857adaff8a8861 100644 --- a/alib2measurepp/makefile +++ b/alib2measurepp/makefile @@ -169,19 +169,23 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/ # ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- # main targets -debug: test-bin-debug/$(TESTBIN) +build-test-debug: test-bin-debug/$(TESTBIN) LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug:,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN) -release: test-bin-release/$(TESTBIN) +build-test-release: test-bin-release/$(TESTBIN) LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release:,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN) -clean: clean-debug clean-release - $(RM) -r doc - build-debug: lib-debug/$(FULL_LIBRARY) build-release: lib-release/$(FULL_LIBRARY) +debug: build-test-debug + +release: build-test-release + +clean: clean-debug clean-release + $(RM) -r doc + clean-debug: if [ -L obj-debug ]; then\ $(RM) -r `readlink obj-debug`;\ diff --git a/alib2raw/makefile b/alib2raw/makefile index 2c1b963e6c9a4cb777cd272da089224d59e264ae..4071745bd2294ce5f322510c9e857adaff8a8861 100644 --- a/alib2raw/makefile +++ b/alib2raw/makefile @@ -169,19 +169,23 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/ # ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- # main targets -debug: test-bin-debug/$(TESTBIN) +build-test-debug: test-bin-debug/$(TESTBIN) LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug:,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN) -release: test-bin-release/$(TESTBIN) +build-test-release: test-bin-release/$(TESTBIN) LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release:,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN) -clean: clean-debug clean-release - $(RM) -r doc - build-debug: lib-debug/$(FULL_LIBRARY) build-release: lib-release/$(FULL_LIBRARY) +debug: build-test-debug + +release: build-test-release + +clean: clean-debug clean-release + $(RM) -r doc + clean-debug: if [ -L obj-debug ]; then\ $(RM) -r `readlink obj-debug`;\ diff --git a/alib2std/makefile b/alib2std/makefile index 2c1b963e6c9a4cb777cd272da089224d59e264ae..4071745bd2294ce5f322510c9e857adaff8a8861 100644 --- a/alib2std/makefile +++ b/alib2std/makefile @@ -169,19 +169,23 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/ # ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- # main targets -debug: test-bin-debug/$(TESTBIN) +build-test-debug: test-bin-debug/$(TESTBIN) LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug:,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN) -release: test-bin-release/$(TESTBIN) +build-test-release: test-bin-release/$(TESTBIN) LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release:,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN) -clean: clean-debug clean-release - $(RM) -r doc - build-debug: lib-debug/$(FULL_LIBRARY) build-release: lib-release/$(FULL_LIBRARY) +debug: build-test-debug + +release: build-test-release + +clean: clean-debug clean-release + $(RM) -r doc + clean-debug: if [ -L obj-debug ]; then\ $(RM) -r `readlink obj-debug`;\ diff --git a/alib2str/makefile b/alib2str/makefile index 2c1b963e6c9a4cb777cd272da089224d59e264ae..4071745bd2294ce5f322510c9e857adaff8a8861 100644 --- a/alib2str/makefile +++ b/alib2str/makefile @@ -169,19 +169,23 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/ # ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- # main targets -debug: test-bin-debug/$(TESTBIN) +build-test-debug: test-bin-debug/$(TESTBIN) LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug:,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN) -release: test-bin-release/$(TESTBIN) +build-test-release: test-bin-release/$(TESTBIN) LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release:,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN) -clean: clean-debug clean-release - $(RM) -r doc - build-debug: lib-debug/$(FULL_LIBRARY) build-release: lib-release/$(FULL_LIBRARY) +debug: build-test-debug + +release: build-test-release + +clean: clean-debug clean-release + $(RM) -r doc + clean-debug: if [ -L obj-debug ]; then\ $(RM) -r `readlink obj-debug`;\ diff --git a/alib2str_experimental/makefile b/alib2str_experimental/makefile index 2c1b963e6c9a4cb777cd272da089224d59e264ae..4071745bd2294ce5f322510c9e857adaff8a8861 100644 --- a/alib2str_experimental/makefile +++ b/alib2str_experimental/makefile @@ -169,19 +169,23 @@ $(TEST_OBJECTS_RELEASE): test-obj-release/ # ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- # main targets -debug: test-bin-debug/$(TESTBIN) +build-test-debug: test-bin-debug/$(TESTBIN) LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-debug:,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN) -release: test-bin-release/$(TESTBIN) +build-test-release: test-bin-release/$(TESTBIN) LD_LIBRARY_PATH="$(subst $(space),,$(addsuffix lib-release:,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN) -clean: clean-debug clean-release - $(RM) -r doc - build-debug: lib-debug/$(FULL_LIBRARY) build-release: lib-release/$(FULL_LIBRARY) +debug: build-test-debug + +release: build-test-release + +clean: clean-debug clean-release + $(RM) -r doc + clean-debug: if [ -L obj-debug ]; then\ $(RM) -r `readlink obj-debug`;\ diff --git a/makefile b/makefile index 92597bdb3e56aae3ef19c0800849bfac7ab4f520..3ffc8694cde897987eaeb0130c685af58c5c5838 100644 --- a/makefile +++ b/makefile @@ -4,8 +4,6 @@ APPPATH = /usr/bin LIBPATH = /usr/lib BINFOLDER = bin -RUN_TESTS ?= 1 - # can be queued from version 4.2 via MAKEFLAGS sice there is the number of jobs as well MAKE_PID := $(shell echo $$PPID) JOB_FLAG := $(filter -j%, $(subst -j ,-j,$(shell ps T | grep "^\s*$(MAKE_PID).*$(MAKE)"))) @@ -91,15 +89,11 @@ SUBDIRS_WITH_MAKE = $(dir $(wildcard */makefile)) all: @echo "What to do master?" -ifeq ($(RUN_TESTS), 1) -debug: | build-debug test-debug -release: | build-release test-release -else -debug: build-debug -release: build-release -endif +debug: test-debug + +release: test-release -build-debug: +build-debug build-test-debug: for dir in $(SUBDIRS_LIBS); do \ $(MAKE) $@ -C $$dir || exit 1; \ done @@ -124,7 +118,7 @@ build-debug: cp translateAddresses $(addsuffix -debug, $(BINFOLDER)); \ cp xmlFormat $(addsuffix -debug, $(BINFOLDER)) -build-release: +build-release build-test-release: for dir in $(SUBDIRS_LIBS); do \ $(MAKE) $@ -C $$dir || exit 1; \ done @@ -149,12 +143,12 @@ build-release: cp translateAddresses $(addsuffix -release, $(BINFOLDER)); \ cp xmlFormat $(addsuffix -release, $(BINFOLDER)) -test-debug: +test-debug: build-test-debug for test in $(wildcard tests.*.sh); do \ ./$$test debug $(JOBS); \ done -test-release: +test-release: build-test-release for test in $(wildcard tests.*.sh); do \ ./$$test release $(JOBS); \ done