diff options
88 files changed, 320 insertions, 228 deletions
diff --git a/c/src/tests/mptests/ChangeLog b/c/src/tests/mptests/ChangeLog index 3fa60684e2..d9c744a709 100644 --- a/c/src/tests/mptests/ChangeLog +++ b/c/src/tests/mptests/ChangeLog @@ -1,3 +1,49 @@ +2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + Makefile.am: Reflect having moved automake. + mp01/Makefile.am: Reflect having moved automake. + mp01/node1/Makefile.am: Reflect having moved automake. + mp01/node2/Makefile.am: Reflect having moved automake. + mp02/Makefile.am: Reflect having moved automake. + mp02/node1/Makefile.am: Reflect having moved automake. + mp02/node2/Makefile.am: Reflect having moved automake. + mp03/Makefile.am: Reflect having moved automake. + mp03/node1/Makefile.am: Reflect having moved automake. + mp03/node2/Makefile.am: Reflect having moved automake. + mp04/Makefile.am: Reflect having moved automake. + mp04/node1/Makefile.am: Reflect having moved automake. + mp04/node2/Makefile.am: Reflect having moved automake. + mp05/Makefile.am: Reflect having moved automake. + mp05/node1/Makefile.am: Reflect having moved automake. + mp05/node2/Makefile.am: Reflect having moved automake. + mp06/Makefile.am: Reflect having moved automake. + mp06/node1/Makefile.am: Reflect having moved automake. + mp06/node2/Makefile.am: Reflect having moved automake. + mp07/Makefile.am: Reflect having moved automake. + mp07/node1/Makefile.am: Reflect having moved automake. + mp07/node2/Makefile.am: Reflect having moved automake. + mp08/Makefile.am: Reflect having moved automake. + mp08/node1/Makefile.am: Reflect having moved automake. + mp08/node2/Makefile.am: Reflect having moved automake. + mp09/Makefile.am: Reflect having moved automake. + mp09/node1/Makefile.am: Reflect having moved automake. + mp09/node2/Makefile.am: Reflect having moved automake. + mp10/Makefile.am: Reflect having moved automake. + mp10/node1/Makefile.am: Reflect having moved automake. + mp10/node2/Makefile.am: Reflect having moved automake. + mp11/Makefile.am: Reflect having moved automake. + mp11/node1/Makefile.am: Reflect having moved automake. + mp11/node2/Makefile.am: Reflect having moved automake. + mp12/Makefile.am: Reflect having moved automake. + mp12/node1/Makefile.am: Reflect having moved automake. + mp12/node2/Makefile.am: Reflect having moved automake. + mp13/Makefile.am: Reflect having moved automake. + mp13/node1/Makefile.am: Reflect having moved automake. + mp13/node2/Makefile.am: Reflect having moved automake. + mp14/Makefile.am: Reflect having moved automake. + mp14/node1/Makefile.am: Reflect having moved automake. + mp14/node2/Makefile.am: Reflect having moved automake. + 2003-08-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * configure.ac: Use rtems-bugs@rtems.com as bug report email address. diff --git a/c/src/tests/mptests/Makefile.am b/c/src/tests/mptests/Makefile.am index a3aeb6930e..6c4f5829fc 100644 --- a/c/src/tests/mptests/Makefile.am +++ b/c/src/tests/mptests/Makefile.am @@ -9,5 +9,5 @@ SUBDIRS = mp01 mp02 mp03 mp04 mp05 mp06 mp07 mp08 mp09 mp10 mp11 mp12 mp13 \ EXTRA_DIST = mptests.am -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp01/Makefile.am b/c/src/tests/mptests/mp01/Makefile.am index 258666c691..ec7997091b 100644 --- a/c/src/tests/mptests/mp01/Makefile.am +++ b/c/src/tests/mptests/mp01/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h init.c task1.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp01/node1/Makefile.am b/c/src/tests/mptests/mp01/node1/Makefile.am index 10fd3b09e2..c819ae36f1 100644 --- a/c/src/tests/mptests/mp01/node1/Makefile.am +++ b/c/src/tests/mptests/mp01/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp01/node2/Makefile.am b/c/src/tests/mptests/mp01/node2/Makefile.am index 6c3259a8df..71ecee9ea5 100644 --- a/c/src/tests/mptests/mp01/node2/Makefile.am +++ b/c/src/tests/mptests/mp01/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp02/Makefile.am b/c/src/tests/mptests/mp02/Makefile.am index 258666c691..ec7997091b 100644 --- a/c/src/tests/mptests/mp02/Makefile.am +++ b/c/src/tests/mptests/mp02/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h init.c task1.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp02/node1/Makefile.am b/c/src/tests/mptests/mp02/node1/Makefile.am index 04081b910c..fb283232de 100644 --- a/c/src/tests/mptests/mp02/node1/Makefile.am +++ b/c/src/tests/mptests/mp02/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp02/node2/Makefile.am b/c/src/tests/mptests/mp02/node2/Makefile.am index 5815c167b1..1dedd5aca2 100644 --- a/c/src/tests/mptests/mp02/node2/Makefile.am +++ b/c/src/tests/mptests/mp02/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp03/Makefile.am b/c/src/tests/mptests/mp03/Makefile.am index 96df97c368..4f8aa89340 100644 --- a/c/src/tests/mptests/mp03/Makefile.am +++ b/c/src/tests/mptests/mp03/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h delay.c init.c task1.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp03/node1/Makefile.am b/c/src/tests/mptests/mp03/node1/Makefile.am index 704f4062cd..1c4f4c7218 100644 --- a/c/src/tests/mptests/mp03/node1/Makefile.am +++ b/c/src/tests/mptests/mp03/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp03/node2/Makefile.am b/c/src/tests/mptests/mp03/node2/Makefile.am index b6e28cf5f5..e2be8970fc 100644 --- a/c/src/tests/mptests/mp03/node2/Makefile.am +++ b/c/src/tests/mptests/mp03/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp04/Makefile.am b/c/src/tests/mptests/mp04/Makefile.am index 258666c691..ec7997091b 100644 --- a/c/src/tests/mptests/mp04/Makefile.am +++ b/c/src/tests/mptests/mp04/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h init.c task1.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp04/node1/Makefile.am b/c/src/tests/mptests/mp04/node1/Makefile.am index 91a97ca4cd..4f474b1089 100644 --- a/c/src/tests/mptests/mp04/node1/Makefile.am +++ b/c/src/tests/mptests/mp04/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp04/node2/Makefile.am b/c/src/tests/mptests/mp04/node2/Makefile.am index fc6dc1bec9..994a50b04f 100644 --- a/c/src/tests/mptests/mp04/node2/Makefile.am +++ b/c/src/tests/mptests/mp04/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp05/Makefile.am b/c/src/tests/mptests/mp05/Makefile.am index 3aef092e1a..e314964bb4 100644 --- a/c/src/tests/mptests/mp05/Makefile.am +++ b/c/src/tests/mptests/mp05/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h asr.c init.c task1.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp05/node1/Makefile.am b/c/src/tests/mptests/mp05/node1/Makefile.am index 7562caa7b9..5172c6f812 100644 --- a/c/src/tests/mptests/mp05/node1/Makefile.am +++ b/c/src/tests/mptests/mp05/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp05/node2/Makefile.am b/c/src/tests/mptests/mp05/node2/Makefile.am index e2b2e2e0ea..c3aeadae9c 100644 --- a/c/src/tests/mptests/mp05/node2/Makefile.am +++ b/c/src/tests/mptests/mp05/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp06/Makefile.am b/c/src/tests/mptests/mp06/Makefile.am index 258666c691..ec7997091b 100644 --- a/c/src/tests/mptests/mp06/Makefile.am +++ b/c/src/tests/mptests/mp06/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h init.c task1.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp06/node1/Makefile.am b/c/src/tests/mptests/mp06/node1/Makefile.am index aada10be37..0168d98794 100644 --- a/c/src/tests/mptests/mp06/node1/Makefile.am +++ b/c/src/tests/mptests/mp06/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp06/node2/Makefile.am b/c/src/tests/mptests/mp06/node2/Makefile.am index 227953c6bb..19e69e1aff 100644 --- a/c/src/tests/mptests/mp06/node2/Makefile.am +++ b/c/src/tests/mptests/mp06/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp07/Makefile.am b/c/src/tests/mptests/mp07/Makefile.am index 258666c691..ec7997091b 100644 --- a/c/src/tests/mptests/mp07/Makefile.am +++ b/c/src/tests/mptests/mp07/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h init.c task1.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp07/node1/Makefile.am b/c/src/tests/mptests/mp07/node1/Makefile.am index 35834ac52c..0dfba5f09e 100644 --- a/c/src/tests/mptests/mp07/node1/Makefile.am +++ b/c/src/tests/mptests/mp07/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp07/node2/Makefile.am b/c/src/tests/mptests/mp07/node2/Makefile.am index 901a7abca6..72fe866787 100644 --- a/c/src/tests/mptests/mp07/node2/Makefile.am +++ b/c/src/tests/mptests/mp07/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp08/Makefile.am b/c/src/tests/mptests/mp08/Makefile.am index 258666c691..ec7997091b 100644 --- a/c/src/tests/mptests/mp08/Makefile.am +++ b/c/src/tests/mptests/mp08/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h init.c task1.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp08/node1/Makefile.am b/c/src/tests/mptests/mp08/node1/Makefile.am index 0fb608a7b0..edafc68b7c 100644 --- a/c/src/tests/mptests/mp08/node1/Makefile.am +++ b/c/src/tests/mptests/mp08/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp08/node2/Makefile.am b/c/src/tests/mptests/mp08/node2/Makefile.am index 09509e76b6..7ebbfdb03f 100644 --- a/c/src/tests/mptests/mp08/node2/Makefile.am +++ b/c/src/tests/mptests/mp08/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp09/Makefile.am b/c/src/tests/mptests/mp09/Makefile.am index c1aa92d6e4..5a1a71223c 100644 --- a/c/src/tests/mptests/mp09/Makefile.am +++ b/c/src/tests/mptests/mp09/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h init.c recvmsg.c sendmsg.c task1.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp09/node1/Makefile.am b/c/src/tests/mptests/mp09/node1/Makefile.am index edc57eef0d..6feb6b28fb 100644 --- a/c/src/tests/mptests/mp09/node1/Makefile.am +++ b/c/src/tests/mptests/mp09/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp09/node2/Makefile.am b/c/src/tests/mptests/mp09/node2/Makefile.am index 10642b9623..754ce65f95 100644 --- a/c/src/tests/mptests/mp09/node2/Makefile.am +++ b/c/src/tests/mptests/mp09/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp10/Makefile.am b/c/src/tests/mptests/mp10/Makefile.am index 582e16526b..d9a122c73e 100644 --- a/c/src/tests/mptests/mp10/Makefile.am +++ b/c/src/tests/mptests/mp10/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h init.c task1.c task2.c task3.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp10/node1/Makefile.am b/c/src/tests/mptests/mp10/node1/Makefile.am index 5a1c94014d..38aa348207 100644 --- a/c/src/tests/mptests/mp10/node1/Makefile.am +++ b/c/src/tests/mptests/mp10/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp10/node2/Makefile.am b/c/src/tests/mptests/mp10/node2/Makefile.am index 6c18ff3dc6..8a6aabb4f8 100644 --- a/c/src/tests/mptests/mp10/node2/Makefile.am +++ b/c/src/tests/mptests/mp10/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp11/Makefile.am b/c/src/tests/mptests/mp11/Makefile.am index 0c8115305b..6563a24d0d 100644 --- a/c/src/tests/mptests/mp11/Makefile.am +++ b/c/src/tests/mptests/mp11/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h init.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp11/node1/Makefile.am b/c/src/tests/mptests/mp11/node1/Makefile.am index af1ca83605..250cfa9e80 100644 --- a/c/src/tests/mptests/mp11/node1/Makefile.am +++ b/c/src/tests/mptests/mp11/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp11/node2/Makefile.am b/c/src/tests/mptests/mp11/node2/Makefile.am index be01c89b14..017d2f14b5 100644 --- a/c/src/tests/mptests/mp11/node2/Makefile.am +++ b/c/src/tests/mptests/mp11/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp12/Makefile.am b/c/src/tests/mptests/mp12/Makefile.am index 0c8115305b..6563a24d0d 100644 --- a/c/src/tests/mptests/mp12/Makefile.am +++ b/c/src/tests/mptests/mp12/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h init.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp12/node1/Makefile.am b/c/src/tests/mptests/mp12/node1/Makefile.am index 7989522b79..eba88694fa 100644 --- a/c/src/tests/mptests/mp12/node1/Makefile.am +++ b/c/src/tests/mptests/mp12/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp12/node2/Makefile.am b/c/src/tests/mptests/mp12/node2/Makefile.am index f84bdf7372..53425fc2b3 100644 --- a/c/src/tests/mptests/mp12/node2/Makefile.am +++ b/c/src/tests/mptests/mp12/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp13/Makefile.am b/c/src/tests/mptests/mp13/Makefile.am index d235c7e518..ca4b50e339 100644 --- a/c/src/tests/mptests/mp13/Makefile.am +++ b/c/src/tests/mptests/mp13/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h init.c task1.c task2.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp13/node1/Makefile.am b/c/src/tests/mptests/mp13/node1/Makefile.am index 63a5259ac0..6da33c12a4 100644 --- a/c/src/tests/mptests/mp13/node1/Makefile.am +++ b/c/src/tests/mptests/mp13/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp13/node2/Makefile.am b/c/src/tests/mptests/mp13/node2/Makefile.am index 362ca1173f..6351bf4ab0 100644 --- a/c/src/tests/mptests/mp13/node2/Makefile.am +++ b/c/src/tests/mptests/mp13/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp14/Makefile.am b/c/src/tests/mptests/mp14/Makefile.am index 2b98c578e8..ca22e20693 100644 --- a/c/src/tests/mptests/mp14/Makefile.am +++ b/c/src/tests/mptests/mp14/Makefile.am @@ -8,5 +8,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h delay.c evtask1.c evtmtask.c exit.c init.c msgtask1.c \ pttask1.c smtask1.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp14/node1/Makefile.am b/c/src/tests/mptests/mp14/node1/Makefile.am index ee76355882..52e999c6c6 100644 --- a/c/src/tests/mptests/mp14/node1/Makefile.am +++ b/c/src/tests/mptests/mp14/node1/Makefile.am @@ -26,8 +26,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -48,4 +48,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/c/src/tests/mptests/mp14/node2/Makefile.am b/c/src/tests/mptests/mp14/node2/Makefile.am index 4ce2a84899..2a23432739 100644 --- a/c/src/tests/mptests/mp14/node2/Makefile.am +++ b/c/src/tests/mptests/mp14/node2/Makefile.am @@ -26,8 +26,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -48,4 +48,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/ChangeLog b/testsuites/mptests/ChangeLog index 3fa60684e2..d9c744a709 100644 --- a/testsuites/mptests/ChangeLog +++ b/testsuites/mptests/ChangeLog @@ -1,3 +1,49 @@ +2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + Makefile.am: Reflect having moved automake. + mp01/Makefile.am: Reflect having moved automake. + mp01/node1/Makefile.am: Reflect having moved automake. + mp01/node2/Makefile.am: Reflect having moved automake. + mp02/Makefile.am: Reflect having moved automake. + mp02/node1/Makefile.am: Reflect having moved automake. + mp02/node2/Makefile.am: Reflect having moved automake. + mp03/Makefile.am: Reflect having moved automake. + mp03/node1/Makefile.am: Reflect having moved automake. + mp03/node2/Makefile.am: Reflect having moved automake. + mp04/Makefile.am: Reflect having moved automake. + mp04/node1/Makefile.am: Reflect having moved automake. + mp04/node2/Makefile.am: Reflect having moved automake. + mp05/Makefile.am: Reflect having moved automake. + mp05/node1/Makefile.am: Reflect having moved automake. + mp05/node2/Makefile.am: Reflect having moved automake. + mp06/Makefile.am: Reflect having moved automake. + mp06/node1/Makefile.am: Reflect having moved automake. + mp06/node2/Makefile.am: Reflect having moved automake. + mp07/Makefile.am: Reflect having moved automake. + mp07/node1/Makefile.am: Reflect having moved automake. + mp07/node2/Makefile.am: Reflect having moved automake. + mp08/Makefile.am: Reflect having moved automake. + mp08/node1/Makefile.am: Reflect having moved automake. + mp08/node2/Makefile.am: Reflect having moved automake. + mp09/Makefile.am: Reflect having moved automake. + mp09/node1/Makefile.am: Reflect having moved automake. + mp09/node2/Makefile.am: Reflect having moved automake. + mp10/Makefile.am: Reflect having moved automake. + mp10/node1/Makefile.am: Reflect having moved automake. + mp10/node2/Makefile.am: Reflect having moved automake. + mp11/Makefile.am: Reflect having moved automake. + mp11/node1/Makefile.am: Reflect having moved automake. + mp11/node2/Makefile.am: Reflect having moved automake. + mp12/Makefile.am: Reflect having moved automake. + mp12/node1/Makefile.am: Reflect having moved automake. + mp12/node2/Makefile.am: Reflect having moved automake. + mp13/Makefile.am: Reflect having moved automake. + mp13/node1/Makefile.am: Reflect having moved automake. + mp13/node2/Makefile.am: Reflect having moved automake. + mp14/Makefile.am: Reflect having moved automake. + mp14/node1/Makefile.am: Reflect having moved automake. + mp14/node2/Makefile.am: Reflect having moved automake. + 2003-08-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * configure.ac: Use rtems-bugs@rtems.com as bug report email address. diff --git a/testsuites/mptests/Makefile.am b/testsuites/mptests/Makefile.am index a3aeb6930e..6c4f5829fc 100644 --- a/testsuites/mptests/Makefile.am +++ b/testsuites/mptests/Makefile.am @@ -9,5 +9,5 @@ SUBDIRS = mp01 mp02 mp03 mp04 mp05 mp06 mp07 mp08 mp09 mp10 mp11 mp12 mp13 \ EXTRA_DIST = mptests.am -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp01/Makefile.am b/testsuites/mptests/mp01/Makefile.am index 258666c691..ec7997091b 100644 --- a/testsuites/mptests/mp01/Makefile.am +++ b/testsuites/mptests/mp01/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h init.c task1.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp01/node1/Makefile.am b/testsuites/mptests/mp01/node1/Makefile.am index 10fd3b09e2..c819ae36f1 100644 --- a/testsuites/mptests/mp01/node1/Makefile.am +++ b/testsuites/mptests/mp01/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp01/node2/Makefile.am b/testsuites/mptests/mp01/node2/Makefile.am index 6c3259a8df..71ecee9ea5 100644 --- a/testsuites/mptests/mp01/node2/Makefile.am +++ b/testsuites/mptests/mp01/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp02/Makefile.am b/testsuites/mptests/mp02/Makefile.am index 258666c691..ec7997091b 100644 --- a/testsuites/mptests/mp02/Makefile.am +++ b/testsuites/mptests/mp02/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h init.c task1.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp02/node1/Makefile.am b/testsuites/mptests/mp02/node1/Makefile.am index 04081b910c..fb283232de 100644 --- a/testsuites/mptests/mp02/node1/Makefile.am +++ b/testsuites/mptests/mp02/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp02/node2/Makefile.am b/testsuites/mptests/mp02/node2/Makefile.am index 5815c167b1..1dedd5aca2 100644 --- a/testsuites/mptests/mp02/node2/Makefile.am +++ b/testsuites/mptests/mp02/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp03/Makefile.am b/testsuites/mptests/mp03/Makefile.am index 96df97c368..4f8aa89340 100644 --- a/testsuites/mptests/mp03/Makefile.am +++ b/testsuites/mptests/mp03/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h delay.c init.c task1.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp03/node1/Makefile.am b/testsuites/mptests/mp03/node1/Makefile.am index 704f4062cd..1c4f4c7218 100644 --- a/testsuites/mptests/mp03/node1/Makefile.am +++ b/testsuites/mptests/mp03/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp03/node2/Makefile.am b/testsuites/mptests/mp03/node2/Makefile.am index b6e28cf5f5..e2be8970fc 100644 --- a/testsuites/mptests/mp03/node2/Makefile.am +++ b/testsuites/mptests/mp03/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp04/Makefile.am b/testsuites/mptests/mp04/Makefile.am index 258666c691..ec7997091b 100644 --- a/testsuites/mptests/mp04/Makefile.am +++ b/testsuites/mptests/mp04/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h init.c task1.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp04/node1/Makefile.am b/testsuites/mptests/mp04/node1/Makefile.am index 91a97ca4cd..4f474b1089 100644 --- a/testsuites/mptests/mp04/node1/Makefile.am +++ b/testsuites/mptests/mp04/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp04/node2/Makefile.am b/testsuites/mptests/mp04/node2/Makefile.am index fc6dc1bec9..994a50b04f 100644 --- a/testsuites/mptests/mp04/node2/Makefile.am +++ b/testsuites/mptests/mp04/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp05/Makefile.am b/testsuites/mptests/mp05/Makefile.am index 3aef092e1a..e314964bb4 100644 --- a/testsuites/mptests/mp05/Makefile.am +++ b/testsuites/mptests/mp05/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h asr.c init.c task1.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp05/node1/Makefile.am b/testsuites/mptests/mp05/node1/Makefile.am index 7562caa7b9..5172c6f812 100644 --- a/testsuites/mptests/mp05/node1/Makefile.am +++ b/testsuites/mptests/mp05/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp05/node2/Makefile.am b/testsuites/mptests/mp05/node2/Makefile.am index e2b2e2e0ea..c3aeadae9c 100644 --- a/testsuites/mptests/mp05/node2/Makefile.am +++ b/testsuites/mptests/mp05/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp06/Makefile.am b/testsuites/mptests/mp06/Makefile.am index 258666c691..ec7997091b 100644 --- a/testsuites/mptests/mp06/Makefile.am +++ b/testsuites/mptests/mp06/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h init.c task1.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp06/node1/Makefile.am b/testsuites/mptests/mp06/node1/Makefile.am index aada10be37..0168d98794 100644 --- a/testsuites/mptests/mp06/node1/Makefile.am +++ b/testsuites/mptests/mp06/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp06/node2/Makefile.am b/testsuites/mptests/mp06/node2/Makefile.am index 227953c6bb..19e69e1aff 100644 --- a/testsuites/mptests/mp06/node2/Makefile.am +++ b/testsuites/mptests/mp06/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp07/Makefile.am b/testsuites/mptests/mp07/Makefile.am index 258666c691..ec7997091b 100644 --- a/testsuites/mptests/mp07/Makefile.am +++ b/testsuites/mptests/mp07/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h init.c task1.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp07/node1/Makefile.am b/testsuites/mptests/mp07/node1/Makefile.am index 35834ac52c..0dfba5f09e 100644 --- a/testsuites/mptests/mp07/node1/Makefile.am +++ b/testsuites/mptests/mp07/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp07/node2/Makefile.am b/testsuites/mptests/mp07/node2/Makefile.am index 901a7abca6..72fe866787 100644 --- a/testsuites/mptests/mp07/node2/Makefile.am +++ b/testsuites/mptests/mp07/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp08/Makefile.am b/testsuites/mptests/mp08/Makefile.am index 258666c691..ec7997091b 100644 --- a/testsuites/mptests/mp08/Makefile.am +++ b/testsuites/mptests/mp08/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h init.c task1.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp08/node1/Makefile.am b/testsuites/mptests/mp08/node1/Makefile.am index 0fb608a7b0..edafc68b7c 100644 --- a/testsuites/mptests/mp08/node1/Makefile.am +++ b/testsuites/mptests/mp08/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp08/node2/Makefile.am b/testsuites/mptests/mp08/node2/Makefile.am index 09509e76b6..7ebbfdb03f 100644 --- a/testsuites/mptests/mp08/node2/Makefile.am +++ b/testsuites/mptests/mp08/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp09/Makefile.am b/testsuites/mptests/mp09/Makefile.am index c1aa92d6e4..5a1a71223c 100644 --- a/testsuites/mptests/mp09/Makefile.am +++ b/testsuites/mptests/mp09/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h init.c recvmsg.c sendmsg.c task1.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp09/node1/Makefile.am b/testsuites/mptests/mp09/node1/Makefile.am index edc57eef0d..6feb6b28fb 100644 --- a/testsuites/mptests/mp09/node1/Makefile.am +++ b/testsuites/mptests/mp09/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp09/node2/Makefile.am b/testsuites/mptests/mp09/node2/Makefile.am index 10642b9623..754ce65f95 100644 --- a/testsuites/mptests/mp09/node2/Makefile.am +++ b/testsuites/mptests/mp09/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp10/Makefile.am b/testsuites/mptests/mp10/Makefile.am index 582e16526b..d9a122c73e 100644 --- a/testsuites/mptests/mp10/Makefile.am +++ b/testsuites/mptests/mp10/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h init.c task1.c task2.c task3.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp10/node1/Makefile.am b/testsuites/mptests/mp10/node1/Makefile.am index 5a1c94014d..38aa348207 100644 --- a/testsuites/mptests/mp10/node1/Makefile.am +++ b/testsuites/mptests/mp10/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp10/node2/Makefile.am b/testsuites/mptests/mp10/node2/Makefile.am index 6c18ff3dc6..8a6aabb4f8 100644 --- a/testsuites/mptests/mp10/node2/Makefile.am +++ b/testsuites/mptests/mp10/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp11/Makefile.am b/testsuites/mptests/mp11/Makefile.am index 0c8115305b..6563a24d0d 100644 --- a/testsuites/mptests/mp11/Makefile.am +++ b/testsuites/mptests/mp11/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h init.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp11/node1/Makefile.am b/testsuites/mptests/mp11/node1/Makefile.am index af1ca83605..250cfa9e80 100644 --- a/testsuites/mptests/mp11/node1/Makefile.am +++ b/testsuites/mptests/mp11/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp11/node2/Makefile.am b/testsuites/mptests/mp11/node2/Makefile.am index be01c89b14..017d2f14b5 100644 --- a/testsuites/mptests/mp11/node2/Makefile.am +++ b/testsuites/mptests/mp11/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp12/Makefile.am b/testsuites/mptests/mp12/Makefile.am index 0c8115305b..6563a24d0d 100644 --- a/testsuites/mptests/mp12/Makefile.am +++ b/testsuites/mptests/mp12/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h init.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp12/node1/Makefile.am b/testsuites/mptests/mp12/node1/Makefile.am index 7989522b79..eba88694fa 100644 --- a/testsuites/mptests/mp12/node1/Makefile.am +++ b/testsuites/mptests/mp12/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp12/node2/Makefile.am b/testsuites/mptests/mp12/node2/Makefile.am index f84bdf7372..53425fc2b3 100644 --- a/testsuites/mptests/mp12/node2/Makefile.am +++ b/testsuites/mptests/mp12/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp13/Makefile.am b/testsuites/mptests/mp13/Makefile.am index d235c7e518..ca4b50e339 100644 --- a/testsuites/mptests/mp13/Makefile.am +++ b/testsuites/mptests/mp13/Makefile.am @@ -7,5 +7,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h init.c task1.c task2.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp13/node1/Makefile.am b/testsuites/mptests/mp13/node1/Makefile.am index 63a5259ac0..6da33c12a4 100644 --- a/testsuites/mptests/mp13/node1/Makefile.am +++ b/testsuites/mptests/mp13/node1/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp13/node2/Makefile.am b/testsuites/mptests/mp13/node2/Makefile.am index 362ca1173f..6351bf4ab0 100644 --- a/testsuites/mptests/mp13/node2/Makefile.am +++ b/testsuites/mptests/mp13/node2/Makefile.am @@ -25,8 +25,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -47,4 +47,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp14/Makefile.am b/testsuites/mptests/mp14/Makefile.am index 2b98c578e8..ca22e20693 100644 --- a/testsuites/mptests/mp14/Makefile.am +++ b/testsuites/mptests/mp14/Makefile.am @@ -8,5 +8,5 @@ SUBDIRS = node1 node2 EXTRA_DIST = system.h delay.c evtask1.c evtmtask.c exit.c init.c msgtask1.c \ pttask1.c smtask1.c -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/subdirs.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp14/node1/Makefile.am b/testsuites/mptests/mp14/node1/Makefile.am index ee76355882..52e999c6c6 100644 --- a/testsuites/mptests/mp14/node1/Makefile.am +++ b/testsuites/mptests/mp14/node1/Makefile.am @@ -26,8 +26,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -48,4 +48,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp14/node2/Makefile.am b/testsuites/mptests/mp14/node2/Makefile.am index 4ce2a84899..2a23432739 100644 --- a/testsuites/mptests/mp14/node2/Makefile.am +++ b/testsuites/mptests/mp14/node2/Makefile.am @@ -26,8 +26,8 @@ OBJS = $(C_O_FILES) PRINT_SRCS = $(DOCS) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/leaf.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/mptests.am AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. @@ -48,4 +48,4 @@ endif EXTRA_DIST = $(DOCS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../automake/local.am |