3 files changed, 15 insertions, 8 deletions
diff --git a/testsuites/samples/ChangeLog b/testsuites/samples/ChangeLog
index e785f11bee..794a0f641b 100644
--- a/testsuites/samples/ChangeLog
+++ b/testsuites/samples/ChangeLog
@@ -1,5 +1,10 @@
 2003-12-17	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
+	* base_mp/node1/Makefile.am, base_mp/node2/Makefile.am:
+	Eliminate VPATH.
+
+2003-12-17	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
 	* sample.am: Use $(mkdir_p) instead of $(mkinstalldirs).
 
 2003-12-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
diff --git a/testsuites/samples/base_mp/node1/Makefile.am b/testsuites/samples/base_mp/node1/Makefile.am
index 5d8f4e23ce..2bebcb2565 100644
--- a/testsuites/samples/base_mp/node1/Makefile.am
+++ b/testsuites/samples/base_mp/node1/Makefile.am
@@ -2,16 +2,17 @@
 ##  $Id$
 ##
 
-VPATH = @srcdir@:@srcdir@/..
-
 NODE = 1
 SAMPLE = base_mp-node$(NODE)
 PGM = ${ARCH}/$(SAMPLE).exe
 
 MANAGERS = io mp
 
-C_FILES = init.c apptask.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
+C_FILES = ../init.c ../apptask.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/samples/base_mp/node2/Makefile.am b/testsuites/samples/base_mp/node2/Makefile.am
index c62af181ea..fe42607dda 100644
--- a/testsuites/samples/base_mp/node2/Makefile.am
+++ b/testsuites/samples/base_mp/node2/Makefile.am
@@ -2,16 +2,17 @@
 ##  $Id$
 ##
 
-VPATH = @srcdir@:@srcdir@/..
-
 NODE = 2
 SAMPLE = base_mp-node$(NODE)
 PGM = ${ARCH}/$(SAMPLE).exe
 
 MANAGERS = io mp
 
-C_FILES = init.c apptask.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
+C_FILES = ../init.c ../apptask.c
+C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT))
+
+$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../%.c $(ARCH)/$(dirstamp)
+	${COMPILE} -o $@ -c $<
 
 H_FILES = system.h