tests: TPI fixes
diff --git a/tests/TPI/TPI_10_001/Makefile b/tests/TPI/TPI_10_001/Makefile
index 669d1c3..88a7258 100644
--- a/tests/TPI/TPI_10_001/Makefile
+++ b/tests/TPI/TPI_10_001/Makefile
@@ -25,9 +25,6 @@
top_srcdir = ../..
test_objs = host.o
-timeout = 120
-include $(top_srcdir)/scripts/config.mk
+include $(top_srcdir)/scripts/config_internal.mk
include $(top_srcdir)/scripts/rules_item.mk
-
-host.o:
diff --git a/tests/TPI/TPI_10_002/Makefile b/tests/TPI/TPI_10_002/Makefile
index f8f4351..2e2fb2c 100644
--- a/tests/TPI/TPI_10_002/Makefile
+++ b/tests/TPI/TPI_10_002/Makefile
@@ -21,12 +21,13 @@
# THE SOFTWARE.
#
-EXTRA_LDFLAGS=-lm
-EXTRA_MPU_LDFLAGS+=$(MARS_BUILD)/base/src/mpu/kernel/mutex.o
-MPU_INCLUDE_CFLAGS+= -I$(MARS_BUILD)/base/include/host/
-MPU_INCLUDE_CFLAGS+= -I$(MARS_BUILD)/base/src/common/
-top_srcdir = ../..
-test_objs = host.o mpu1.task_eo
+EXTRA_LDFLAGS=-lm
-include $(top_srcdir)/scripts/config.mk
+top_srcdir = ../..
+test_objs = host.o mpu1.task_eo
+
+include $(top_srcdir)/scripts/config_internal.mk
include $(top_srcdir)/scripts/rules_item.mk
+
+mpu1.task: $(MARS_BUILD)/base/src/mpu/kernel/mutex.mpu_o
+EXTRA_MPU_LDFLAGS+=$(MARS_BUILD)/base/src/mpu/kernel/mutex.mpu_o
diff --git a/tests/TPI/TPI_10_002/mpu1.c b/tests/TPI/TPI_10_002/mpu1.c
index b39f766..ee8ba68 100644
--- a/tests/TPI/TPI_10_002/mpu1.c
+++ b/tests/TPI/TPI_10_002/mpu1.c
@@ -23,7 +23,6 @@
#include <mars_test.h>
#include <mars/task.h>
-#include <mars/mutex.h>
#include <kernel_internal_types.h>
#include "common.h"
diff --git a/tests/TPI/TPI_10_003/Makefile b/tests/TPI/TPI_10_003/Makefile
index 669d1c3..88a7258 100644
--- a/tests/TPI/TPI_10_003/Makefile
+++ b/tests/TPI/TPI_10_003/Makefile
@@ -25,9 +25,6 @@
top_srcdir = ../..
test_objs = host.o
-timeout = 120
-include $(top_srcdir)/scripts/config.mk
+include $(top_srcdir)/scripts/config_internal.mk
include $(top_srcdir)/scripts/rules_item.mk
-
-host.o:
diff --git a/tests/TPI/TPI_10_004/Makefile b/tests/TPI/TPI_10_004/Makefile
index f4ae4d7..d7304f8 100644
--- a/tests/TPI/TPI_10_004/Makefile
+++ b/tests/TPI/TPI_10_004/Makefile
@@ -20,14 +20,14 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
#
-EXTRA_LDFLAGS=-lm
-EXTRA_MPU_LDFLAGS+=$(MARS_BUILD)/base/src/mpu/kernel/mutex.o
-MPU_INCLUDE_CFLAGS+= -I$(MARS_BUILD)/base/src/common/
-MPU_INCLUDE_CFLAGS+= -I$(MARS_BUILD)/base/include/host/
+
+EXTRA_LDFLAGS=-lm
+
top_srcdir = ../..
test_objs = host.o mpu1.task_eo mpu2.task_eo
-
-
-include $(top_srcdir)/scripts/config.mk
+include $(top_srcdir)/scripts/config_internal.mk
include $(top_srcdir)/scripts/rules_item.mk
+
+mpu1.task: $(MARS_BUILD)/base/src/mpu/kernel/mutex.mpu_o
+EXTRA_MPU_LDFLAGS+=$(MARS_BUILD)/base/src/mpu/kernel/mutex.mpu_o
diff --git a/tests/TPI/TPI_10_004/mpu1.c b/tests/TPI/TPI_10_004/mpu1.c
index 01e6ec4..5979590 100644
--- a/tests/TPI/TPI_10_004/mpu1.c
+++ b/tests/TPI/TPI_10_004/mpu1.c
@@ -23,7 +23,6 @@
#include <mars_test.h>
#include <mars/task.h>
-#include <mars/mutex.h>
#include <kernel_internal_types.h>
#include "common.h"
#include <unistd.h>
diff --git a/tests/TPI/TPI_10_004/mpu2.c b/tests/TPI/TPI_10_004/mpu2.c
index 994942f..5ef40fe 100644
--- a/tests/TPI/TPI_10_004/mpu2.c
+++ b/tests/TPI/TPI_10_004/mpu2.c
@@ -23,7 +23,6 @@
#include <mars_test.h>
#include <mars/task.h>
-#include <mars/mutex.h>
#include <kernel_internal_types.h>
#include "common.h"
diff --git a/tests/TPI/TPI_10_005/Makefile b/tests/TPI/TPI_10_005/Makefile
index 1eb0be8..2e2fb2c 100644
--- a/tests/TPI/TPI_10_005/Makefile
+++ b/tests/TPI/TPI_10_005/Makefile
@@ -22,15 +22,12 @@
#
EXTRA_LDFLAGS=-lm
-EXTRA_MPU_LDFLAGS+=$(MARS_BUILD)/base/src/mpu/kernel/mutex.o
-MPU_INCLUDE_CFLAGS+= -I$(MARS_BUILD)/base/src/common/
top_srcdir = ../..
test_objs = host.o mpu1.task_eo
-timeout = 120
-include $(top_srcdir)/scripts/config.mk
+include $(top_srcdir)/scripts/config_internal.mk
include $(top_srcdir)/scripts/rules_item.mk
-host.o: common.h
-mpu1.task_o: common.h
+mpu1.task: $(MARS_BUILD)/base/src/mpu/kernel/mutex.mpu_o
+EXTRA_MPU_LDFLAGS+=$(MARS_BUILD)/base/src/mpu/kernel/mutex.mpu_o
