Moved pmacros.h to include not support/include.

18 files changed, 28 insertions, 19 deletions

diff --git a/testsuites/psxtests/Makefile.am b/testsuites/psxtests/Makefile.am
index 95d7b19f0d..e25e2b2b1a 100644
--- a/testsuites/psxtests/Makefile.am
+++ b/testsuites/psxtests/Makefile.am
@@ -5,10 +5,10 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-SHARED_DIRS = support
+SHARED_DIRS = 
 
-POSIX_DIRS = psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 psx09 \
-    psx10 psx11 psx12 psxtime psxtimer psxcancel psxmsgq01 psxsem01
+POSIX_DIRS = include psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 \
+    psx09 psx10 psx11 psx12 psxtime psxtimer psxcancel psxmsgq01 psxsem01
 
 POSIX_FILES_DIRS = psxfile01 psxreaddir psxstat psxmount psx13
 
diff --git a/testsuites/psxtests/include/Makefile.am b/testsuites/psxtests/include/Makefile.am
new file mode 100644
index 0000000000..057f4043c1
--- /dev/null
+++ b/testsuites/psxtests/include/Makefile.am
@@ -0,0 +1,9 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+noinst_HEADERS = pmacros.h
+
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/testsuites/psxtests/psx01/Makefile.am b/testsuites/psxtests/psx01/Makefile.am
index dcd2e93656..e561c2431d 100644
--- a/testsuites/psxtests/psx01/Makefile.am
+++ b/testsuites/psxtests/psx01/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
diff --git a/testsuites/psxtests/psx02/Makefile.am b/testsuites/psxtests/psx02/Makefile.am
index 69cc7f60f1..da671e944e 100644
--- a/testsuites/psxtests/psx02/Makefile.am
+++ b/testsuites/psxtests/psx02/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
diff --git a/testsuites/psxtests/psx03/Makefile.am b/testsuites/psxtests/psx03/Makefile.am
index 84f1a269c1..96b258b129 100644
--- a/testsuites/psxtests/psx03/Makefile.am
+++ b/testsuites/psxtests/psx03/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
diff --git a/testsuites/psxtests/psx04/Makefile.am b/testsuites/psxtests/psx04/Makefile.am
index dd081855ae..99e74f6fec 100644
--- a/testsuites/psxtests/psx04/Makefile.am
+++ b/testsuites/psxtests/psx04/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
diff --git a/testsuites/psxtests/psx05/Makefile.am b/testsuites/psxtests/psx05/Makefile.am
index 1bfc3f3b76..3029fb5e88 100644
--- a/testsuites/psxtests/psx05/Makefile.am
+++ b/testsuites/psxtests/psx05/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
diff --git a/testsuites/psxtests/psx06/Makefile.am b/testsuites/psxtests/psx06/Makefile.am
index de942d089c..72ffe01607 100644
--- a/testsuites/psxtests/psx06/Makefile.am
+++ b/testsuites/psxtests/psx06/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
diff --git a/testsuites/psxtests/psx07/Makefile.am b/testsuites/psxtests/psx07/Makefile.am
index a048a2b237..58acad3a86 100644
--- a/testsuites/psxtests/psx07/Makefile.am
+++ b/testsuites/psxtests/psx07/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
diff --git a/testsuites/psxtests/psx08/Makefile.am b/testsuites/psxtests/psx08/Makefile.am
index d3675e3358..e7349c2ced 100644
--- a/testsuites/psxtests/psx08/Makefile.am
+++ b/testsuites/psxtests/psx08/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
diff --git a/testsuites/psxtests/psx09/Makefile.am b/testsuites/psxtests/psx09/Makefile.am
index ccbe9df6d4..60985a5d25 100644
--- a/testsuites/psxtests/psx09/Makefile.am
+++ b/testsuites/psxtests/psx09/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
diff --git a/testsuites/psxtests/psx10/Makefile.am b/testsuites/psxtests/psx10/Makefile.am
index a47afe80f1..e7d6429399 100644
--- a/testsuites/psxtests/psx10/Makefile.am
+++ b/testsuites/psxtests/psx10/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
diff --git a/testsuites/psxtests/psx11/Makefile.am b/testsuites/psxtests/psx11/Makefile.am
index 2b3cb4580a..4f78bd44be 100644
--- a/testsuites/psxtests/psx11/Makefile.am
+++ b/testsuites/psxtests/psx11/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
diff --git a/testsuites/psxtests/psx12/Makefile.am b/testsuites/psxtests/psx12/Makefile.am
index 20c7beea6c..c110b5ab58 100644
--- a/testsuites/psxtests/psx12/Makefile.am
+++ b/testsuites/psxtests/psx12/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
diff --git a/testsuites/psxtests/psxcancel/Makefile.am b/testsuites/psxtests/psxcancel/Makefile.am
index e37013b6c4..8f6c75872f 100644
--- a/testsuites/psxtests/psxcancel/Makefile.am
+++ b/testsuites/psxtests/psxcancel/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
diff --git a/testsuites/psxtests/psxmsgq01/Makefile.am b/testsuites/psxtests/psxmsgq01/Makefile.am
index 73079c46f1..43d86ae3b5 100644
--- a/testsuites/psxtests/psxmsgq01/Makefile.am
+++ b/testsuites/psxtests/psxmsgq01/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
diff --git a/testsuites/psxtests/psxsem01/Makefile.am b/testsuites/psxtests/psxsem01/Makefile.am
index 135514aa14..e0dfae412c 100644
--- a/testsuites/psxtests/psxsem01/Makefile.am
+++ b/testsuites/psxtests/psxsem01/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
diff --git a/testsuites/psxtests/psxtimer/Makefile.am b/testsuites/psxtests/psxtimer/Makefile.am
index 8aa00f1d30..66c76cf180 100644
--- a/testsuites/psxtests/psxtimer/Makefile.am
+++ b/testsuites/psxtests/psxtimer/Makefile.am
@@ -32,7 +32,7 @@ include $(top_srcdir)/psxtests.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/support/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)