diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-18 09:49:43 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-18 09:49:43 +0000 |
| commit | 0784c0a18b9ed4d296f0598faea19969727fcdaf (patch) | |
| tree | 585bf02cad0f5a57706f0d4c4d15380d57d28206 /testsuites | |
| parent | 2003-12-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-0784c0a18b9ed4d296f0598faea19969727fcdaf.tar.bz2 | |
2003-12-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* mptests.am: Add dirstamp support.
* mptests/mp01/node1/Makefile.am: Eliminate VPATH.
* mptests/mp01/node2/Makefile.am: Eliminate VPATH.
* mptests/mp02/node1/Makefile.am: Eliminate VPATH.
* mptests/mp02/node2/Makefile.am: Eliminate VPATH.
* mptests/mp03/node1/Makefile.am: Eliminate VPATH.
* mptests/mp03/node2/Makefile.am: Eliminate VPATH.
* mptests/mp04/node1/Makefile.am: Eliminate VPATH.
* mptests/mp04/node2/Makefile.am: Eliminate VPATH.
* mptests/mp05/node1/Makefile.am: Eliminate VPATH.
* mptests/mp05/node2/Makefile.am: Eliminate VPATH.
* mptests/mp06/node1/Makefile.am: Eliminate VPATH.
* mptests/mp06/node2/Makefile.am: Eliminate VPATH.
* mptests/mp07/node1/Makefile.am: Eliminate VPATH.
* mptests/mp07/node2/Makefile.am: Eliminate VPATH.
* mptests/mp08/node1/Makefile.am: Eliminate VPATH.
* mptests/mp08/node2/Makefile.am: Eliminate VPATH.
* mptests/mp09/node1/Makefile.am: Eliminate VPATH.
* mptests/mp09/node2/Makefile.am: Eliminate VPATH.
* mptests/mp10/node1/Makefile.am: Eliminate VPATH.
* mptests/mp10/node2/Makefile.am: Eliminate VPATH.
* mptests/mp11/node1/Makefile.am: Eliminate VPATH.
* mptests/mp11/node2/Makefile.am: Eliminate VPATH.
* mptests/mp12/node1/Makefile.am: Eliminate VPATH.
* mptests/mp12/node2/Makefile.am: Eliminate VPATH.
* mptests/mp13/node1/Makefile.am: Eliminate VPATH.
* mptests/mp13/node2/Makefile.am: Eliminate VPATH.
* mptests/mp14/node1/Makefile.am: Eliminate VPATH.
* mptests/mp14/node2/Makefile.am: Eliminate VPATH.
Diffstat (limited to 'testsuites')
30 files changed, 183 insertions, 130 deletions
diff --git a/testsuites/mptests/ChangeLog b/testsuites/mptests/ChangeLog index 0331dea79c..7bd76ebd5d 100644 --- a/testsuites/mptests/ChangeLog +++ b/testsuites/mptests/ChangeLog @@ -1,3 +1,35 @@ +2003-12-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * mptests.am: Add dirstamp support. + * mptests/mp01/node1/Makefile.am: Eliminate VPATH. + * mptests/mp01/node2/Makefile.am: Eliminate VPATH. + * mptests/mp02/node1/Makefile.am: Eliminate VPATH. + * mptests/mp02/node2/Makefile.am: Eliminate VPATH. + * mptests/mp03/node1/Makefile.am: Eliminate VPATH. + * mptests/mp03/node2/Makefile.am: Eliminate VPATH. + * mptests/mp04/node1/Makefile.am: Eliminate VPATH. + * mptests/mp04/node2/Makefile.am: Eliminate VPATH. + * mptests/mp05/node1/Makefile.am: Eliminate VPATH. + * mptests/mp05/node2/Makefile.am: Eliminate VPATH. + * mptests/mp06/node1/Makefile.am: Eliminate VPATH. + * mptests/mp06/node2/Makefile.am: Eliminate VPATH. + * mptests/mp07/node1/Makefile.am: Eliminate VPATH. + * mptests/mp07/node2/Makefile.am: Eliminate VPATH. + * mptests/mp08/node1/Makefile.am: Eliminate VPATH. + * mptests/mp08/node2/Makefile.am: Eliminate VPATH. + * mptests/mp09/node1/Makefile.am: Eliminate VPATH. + * mptests/mp09/node2/Makefile.am: Eliminate VPATH. + * mptests/mp10/node1/Makefile.am: Eliminate VPATH. + * mptests/mp10/node2/Makefile.am: Eliminate VPATH. + * mptests/mp11/node1/Makefile.am: Eliminate VPATH. + * mptests/mp11/node2/Makefile.am: Eliminate VPATH. + * mptests/mp12/node1/Makefile.am: Eliminate VPATH. + * mptests/mp12/node2/Makefile.am: Eliminate VPATH. + * mptests/mp13/node1/Makefile.am: Eliminate VPATH. + * mptests/mp13/node2/Makefile.am: Eliminate VPATH. + * mptests/mp14/node1/Makefile.am: Eliminate VPATH. + * mptests/mp14/node2/Makefile.am: Eliminate VPATH. + 2003-12-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * mptests.am: Use $(mkdir_p) instead of $(mkinstalldirs). diff --git a/testsuites/mptests/mp01/node1/Makefile.am b/testsuites/mptests/mp01/node1/Makefile.am index cb45fa4aa2..c4af09fb66 100644 --- a/testsuites/mptests/mp01/node1/Makefile.am +++ b/testsuites/mptests/mp01/node1/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 1 TEST = mp01 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp -C_FILES = init.c task1.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c ../task1.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp01/node2/Makefile.am b/testsuites/mptests/mp01/node2/Makefile.am index 2a5490ac5f..4d0d6536dd 100644 --- a/testsuites/mptests/mp01/node2/Makefile.am +++ b/testsuites/mptests/mp01/node2/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 2 TEST = mp01 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp -C_FILES = init.c task1.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c ../task1.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp02/node1/Makefile.am b/testsuites/mptests/mp02/node1/Makefile.am index ffe686c3cd..6b25b2485b 100644 --- a/testsuites/mptests/mp02/node1/Makefile.am +++ b/testsuites/mptests/mp02/node1/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 1 TEST = mp02 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp -C_FILES = init.c task1.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c ../task1.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp02/node2/Makefile.am b/testsuites/mptests/mp02/node2/Makefile.am index 8fd5ef7544..1d212f18ac 100644 --- a/testsuites/mptests/mp02/node2/Makefile.am +++ b/testsuites/mptests/mp02/node2/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 2 TEST = mp02 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp -C_FILES = init.c task1.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c ../task1.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp03/node1/Makefile.am b/testsuites/mptests/mp03/node1/Makefile.am index b2174ba52b..1f9ae9537d 100644 --- a/testsuites/mptests/mp03/node1/Makefile.am +++ b/testsuites/mptests/mp03/node1/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 1 TEST = mp03 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp timer event -C_FILES = init.c task1.c delay.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c ../task1.c ../delay.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp03/node2/Makefile.am b/testsuites/mptests/mp03/node2/Makefile.am index 5d7278420e..0a19273139 100644 --- a/testsuites/mptests/mp03/node2/Makefile.am +++ b/testsuites/mptests/mp03/node2/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 2 TEST = mp03 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp timer event -C_FILES = init.c delay.c task1.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c ../delay.c ../task1.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp04/node1/Makefile.am b/testsuites/mptests/mp04/node1/Makefile.am index 0fedbbe4ea..1a603ae3ef 100644 --- a/testsuites/mptests/mp04/node1/Makefile.am +++ b/testsuites/mptests/mp04/node1/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 1 TEST = mp04 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp -C_FILES = init.c task1.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c ../task1.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp04/node2/Makefile.am b/testsuites/mptests/mp04/node2/Makefile.am index 875d2830d7..23837c6ed1 100644 --- a/testsuites/mptests/mp04/node2/Makefile.am +++ b/testsuites/mptests/mp04/node2/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 2 TEST = mp04 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp -C_FILES = init.c task1.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c ../task1.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp05/node1/Makefile.am b/testsuites/mptests/mp05/node1/Makefile.am index e34a9a7d42..44a1e4287e 100644 --- a/testsuites/mptests/mp05/node1/Makefile.am +++ b/testsuites/mptests/mp05/node1/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 1 TEST = mp05 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp signal timer -C_FILES = init.c asr.c task1.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c ../asr.c ../task1.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp05/node2/Makefile.am b/testsuites/mptests/mp05/node2/Makefile.am index 778147c6e0..8708d7b7a2 100644 --- a/testsuites/mptests/mp05/node2/Makefile.am +++ b/testsuites/mptests/mp05/node2/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 2 TEST = mp05 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp signal timer -C_FILES = init.c asr.c task1.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c ../asr.c ../task1.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp06/node1/Makefile.am b/testsuites/mptests/mp06/node1/Makefile.am index 8e72bd0d2c..ec0b9b210e 100644 --- a/testsuites/mptests/mp06/node1/Makefile.am +++ b/testsuites/mptests/mp06/node1/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 1 TEST = mp06 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp event timer -C_FILES = init.c task1.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c ../task1.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp06/node2/Makefile.am b/testsuites/mptests/mp06/node2/Makefile.am index f8e0d0391d..91179037c1 100644 --- a/testsuites/mptests/mp06/node2/Makefile.am +++ b/testsuites/mptests/mp06/node2/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 2 TEST = mp06 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp event timer -C_FILES = init.c task1.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c ../task1.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp07/node1/Makefile.am b/testsuites/mptests/mp07/node1/Makefile.am index 4e118fcddd..4a6773e141 100644 --- a/testsuites/mptests/mp07/node1/Makefile.am +++ b/testsuites/mptests/mp07/node1/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 1 TEST = mp07 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp event timer -C_FILES = init.c task1.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c ../task1.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp07/node2/Makefile.am b/testsuites/mptests/mp07/node2/Makefile.am index 0f5b8409cd..a2061ac677 100644 --- a/testsuites/mptests/mp07/node2/Makefile.am +++ b/testsuites/mptests/mp07/node2/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 2 TEST = mp07 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp event timer -C_FILES = init.c task1.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c ../task1.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp08/node1/Makefile.am b/testsuites/mptests/mp08/node1/Makefile.am index f604654aed..05ca4a7fba 100644 --- a/testsuites/mptests/mp08/node1/Makefile.am +++ b/testsuites/mptests/mp08/node1/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 1 TEST = mp08 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp semaphore -C_FILES = init.c task1.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c ../task1.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp08/node2/Makefile.am b/testsuites/mptests/mp08/node2/Makefile.am index 996e46adc0..0c8d15c236 100644 --- a/testsuites/mptests/mp08/node2/Makefile.am +++ b/testsuites/mptests/mp08/node2/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 2 TEST = mp08 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp semaphore -C_FILES = init.c task1.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c ../task1.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp09/node1/Makefile.am b/testsuites/mptests/mp09/node1/Makefile.am index b1c5a02757..86fe8f7692 100644 --- a/testsuites/mptests/mp09/node1/Makefile.am +++ b/testsuites/mptests/mp09/node1/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 1 TEST = mp09 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp message -C_FILES = init.c task1.c recvmsg.c sendmsg.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp09/node2/Makefile.am b/testsuites/mptests/mp09/node2/Makefile.am index 93917d813c..fa757fee40 100644 --- a/testsuites/mptests/mp09/node2/Makefile.am +++ b/testsuites/mptests/mp09/node2/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 2 TEST = mp09 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp message -C_FILES = init.c task1.c recvmsg.c sendmsg.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp10/node1/Makefile.am b/testsuites/mptests/mp10/node1/Makefile.am index ff7bc3a24f..cc6a585a25 100644 --- a/testsuites/mptests/mp10/node1/Makefile.am +++ b/testsuites/mptests/mp10/node1/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 1 TEST = mp10 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp message semaphore -C_FILES = init.c task1.c task2.c task3.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c ../task1.c ../task2.c ../task3.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp10/node2/Makefile.am b/testsuites/mptests/mp10/node2/Makefile.am index 6b596c9eb1..31ecd34786 100644 --- a/testsuites/mptests/mp10/node2/Makefile.am +++ b/testsuites/mptests/mp10/node2/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 2 TEST = mp10 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp message semaphore -C_FILES = init.c task1.c task2.c task3.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c ../task1.c ../task2.c ../task3.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp11/node1/Makefile.am b/testsuites/mptests/mp11/node1/Makefile.am index be7cf978ce..eab07e3f88 100644 --- a/testsuites/mptests/mp11/node1/Makefile.am +++ b/testsuites/mptests/mp11/node1/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 1 TEST = mp11 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp message partition semaphore -C_FILES = init.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp11/node2/Makefile.am b/testsuites/mptests/mp11/node2/Makefile.am index 459f0e7aa5..ea43243f2a 100644 --- a/testsuites/mptests/mp11/node2/Makefile.am +++ b/testsuites/mptests/mp11/node2/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 2 TEST = mp11 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp message partition semaphore -C_FILES = init.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp12/node1/Makefile.am b/testsuites/mptests/mp12/node1/Makefile.am index 7acd058c37..c7bb47d834 100644 --- a/testsuites/mptests/mp12/node1/Makefile.am +++ b/testsuites/mptests/mp12/node1/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 1 TEST = mp12 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp partition -C_FILES = init.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp12/node2/Makefile.am b/testsuites/mptests/mp12/node2/Makefile.am index 2da49042a1..6063295c9e 100644 --- a/testsuites/mptests/mp12/node2/Makefile.am +++ b/testsuites/mptests/mp12/node2/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 2 TEST = mp12 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp partition -C_FILES = init.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp13/node1/Makefile.am b/testsuites/mptests/mp13/node1/Makefile.am index f2ce935548..fed3853098 100644 --- a/testsuites/mptests/mp13/node1/Makefile.am +++ b/testsuites/mptests/mp13/node1/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 1 TEST = mp13 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp message semaphore -C_FILES = init.c task1.c task2.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c ../task1.c ../task2.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp13/node2/Makefile.am b/testsuites/mptests/mp13/node2/Makefile.am index ed40bc3a40..7392cc0a35 100644 --- a/testsuites/mptests/mp13/node2/Makefile.am +++ b/testsuites/mptests/mp13/node2/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 2 TEST = mp13 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp message semaphore -C_FILES = init.c task1.c task2.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../init.c ../task1.c ../task2.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp14/node1/Makefile.am b/testsuites/mptests/mp14/node1/Makefile.am index 146e9c1742..b59caf1da7 100644 --- a/testsuites/mptests/mp14/node1/Makefile.am +++ b/testsuites/mptests/mp14/node1/Makefile.am @@ -2,17 +2,18 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 1 TEST = mp14 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp event partition semaphore timer message -C_FILES = exit.c init.c delay.c evtask1.c evtmtask.c pttask1.c smtask1.c \ - msgtask1.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \ + ../pttask1.c ../smtask1.c ../msgtask1.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mp14/node2/Makefile.am b/testsuites/mptests/mp14/node2/Makefile.am index d4ba42f57b..39d68327ba 100644 --- a/testsuites/mptests/mp14/node2/Makefile.am +++ b/testsuites/mptests/mp14/node2/Makefile.am @@ -2,17 +2,18 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/.. - NODE = 2 TEST = mp14 PGM = ${ARCH}/$(TEST)-node$(NODE).exe MANAGERS = io mp event partition semaphore timer message -C_FILES = exit.c init.c delay.c evtask1.c evtmtask.c pttask1.c smtask1.c \ - msgtask1.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +C_FILES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \ + ../pttask1.c ../smtask1.c ../msgtask1.c +C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) + +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< H_FILES = system.h diff --git a/testsuites/mptests/mptests.am b/testsuites/mptests/mptests.am index 64b2c3d987..8448399601 100644 --- a/testsuites/mptests/mptests.am +++ b/testsuites/mptests/mptests.am @@ -2,28 +2,21 @@ project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@ -$(project_bspdir)/tests: - @$(mkdir_p) $@ +$(project_bspdir)/tests/$(dirstamp): + @$(mkdir_p) $(project_bspdir)/tests + @: > $(project_bspdir)/tests/$(dirstamp) -$(project_bspdir)/tests/$(TEST)-node$(NODE)$(LIB_VARIANT).exe: $(PGM) +$(project_bspdir)/tests/$(TEST)-node$(NODE)$(LIB_VARIANT).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp) $(INSTALL_PROGRAM) $< $@ -$(project_bspdir)/tests/screens: - @$(mkdir_p) $@ +$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp): + @$(mkdir_p) $(project_bspdir)/tests/screens/itrontests + @: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp) -$(project_bspdir)/tests/screens/mptests: - @$(mkdir_p) $@ - -$(project_bspdir)/tests/screens/mptests/node$(NODE): - @$(mkdir_p) $@ - -$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn +$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp) $(INSTALL_DATA) $< $@ + TMPINSTALL_FILES = \ -$(project_bspdir)/tests \ $(project_bspdir)/tests/$(TEST)-node$(NODE)$(LIB_VARIANT).exe \ -$(project_bspdir)/tests/screens \ -$(project_bspdir)/tests/screens/mptests \ -$(project_bspdir)/tests/screens/mptests/node$(NODE) \ $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn |