Switch back to include compile.am instead of amcompile.am

15 files changed, 16 insertions, 15 deletions

diff --git a/testsuites/samples/base_mp/node1/Makefile.am b/testsuites/samples/base_mp/node1/Makefile.am
index a0e69a82b4..ce85956e65 100644
--- a/testsuites/samples/base_mp/node1/Makefile.am
+++ b/testsuites/samples/base_mp/node1/Makefile.am
@@ -20,7 +20,7 @@ OBJS = $(lib_a_OBJECTS)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/amcompile.am
+include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sample.am
 
diff --git a/testsuites/samples/base_mp/node2/Makefile.am b/testsuites/samples/base_mp/node2/Makefile.am
index c0601550d1..95f0041e5c 100644
--- a/testsuites/samples/base_mp/node2/Makefile.am
+++ b/testsuites/samples/base_mp/node2/Makefile.am
@@ -20,7 +20,7 @@ OBJS = $(lib_a_OBJECTS)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/amcompile.am
+include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sample.am
 
diff --git a/testsuites/samples/base_sp/Makefile.am b/testsuites/samples/base_sp/Makefile.am
index 81fc8e35bb..f2993ee9fb 100644
--- a/testsuites/samples/base_sp/Makefile.am
+++ b/testsuites/samples/base_sp/Makefile.am
@@ -19,7 +19,7 @@ OBJS = $(lib_a_OBJECTS)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/amcompile.am
+include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sample.am
 
diff --git a/testsuites/samples/cdtest/Makefile.am b/testsuites/samples/cdtest/Makefile.am
index 6aff2dc713..e5311901e5 100644
--- a/testsuites/samples/cdtest/Makefile.am
+++ b/testsuites/samples/cdtest/Makefile.am
@@ -19,7 +19,7 @@ OBJS = $(lib_a_OBJECTS)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/amcompile.am
+include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sample.am
 
diff --git a/testsuites/samples/fileio/Makefile.am b/testsuites/samples/fileio/Makefile.am
index 7935c9fcd6..d755703a5c 100644
--- a/testsuites/samples/fileio/Makefile.am
+++ b/testsuites/samples/fileio/Makefile.am
@@ -19,7 +19,7 @@ OBJS = $(lib_a_OBJECTS)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/amcompile.am
+include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sample.am
 
diff --git a/testsuites/samples/fileio/init.c b/testsuites/samples/fileio/init.c
index debb457f5f..88f63b113b 100644
--- a/testsuites/samples/fileio/init.c
+++ b/testsuites/samples/fileio/init.c
@@ -163,7 +163,7 @@ void fileio_list_file(void)
 {
   char fname[1024];
   char *buf_ptr = NULL;
-  uint32_t   flen = 0;
+  ssize_t   flen = 0;
   int fd = -1;
   ssize_t n;
   size_t buf_size = 100;
diff --git a/testsuites/samples/hello/Makefile.am b/testsuites/samples/hello/Makefile.am
index 81231ee08e..2fce56101f 100644
--- a/testsuites/samples/hello/Makefile.am
+++ b/testsuites/samples/hello/Makefile.am
@@ -19,7 +19,7 @@ OBJS = $(lib_a_OBJECTS)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/amcompile.am
+include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sample.am
 
diff --git a/testsuites/samples/iostream/Makefile.am b/testsuites/samples/iostream/Makefile.am
index 2052ab4ea2..c4b5dbad5b 100644
--- a/testsuites/samples/iostream/Makefile.am
+++ b/testsuites/samples/iostream/Makefile.am
@@ -19,7 +19,7 @@ OBJS = $(lib_a_OBJECTS)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/amcompile.am
+include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sample.am
 
diff --git a/testsuites/samples/loopback/Makefile.am b/testsuites/samples/loopback/Makefile.am
index 392e476f74..91830042ea 100644
--- a/testsuites/samples/loopback/Makefile.am
+++ b/testsuites/samples/loopback/Makefile.am
@@ -19,7 +19,7 @@ OBJS = $(lib_a_OBJECTS)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/amcompile.am
+include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sample.am
 
diff --git a/testsuites/samples/minimum/Makefile.am b/testsuites/samples/minimum/Makefile.am
index 956c6c23a7..f99c57b7a3 100644
--- a/testsuites/samples/minimum/Makefile.am
+++ b/testsuites/samples/minimum/Makefile.am
@@ -19,7 +19,7 @@ OBJS = $(lib_a_OBJECTS)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/amcompile.am
+include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sample.am
 
diff --git a/testsuites/samples/paranoia/Makefile.am b/testsuites/samples/paranoia/Makefile.am
index 901843cddc..503078b6fc 100644
--- a/testsuites/samples/paranoia/Makefile.am
+++ b/testsuites/samples/paranoia/Makefile.am
@@ -19,7 +19,7 @@ OBJS = $(lib_a_OBJECTS)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/amcompile.am
+include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sample.am
 
diff --git a/testsuites/samples/pppd/Makefile.am b/testsuites/samples/pppd/Makefile.am
index 862ef229ac..c6e89252aa 100644
--- a/testsuites/samples/pppd/Makefile.am
+++ b/testsuites/samples/pppd/Makefile.am
@@ -15,7 +15,7 @@ OBJS = $(lib_a_OBJECTS)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/amcompile.am
+include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sample.am
 
diff --git a/testsuites/samples/ticker/Makefile.am b/testsuites/samples/ticker/Makefile.am
index 177e9cc6ec..e4a8a17136 100644
--- a/testsuites/samples/ticker/Makefile.am
+++ b/testsuites/samples/ticker/Makefile.am
@@ -19,7 +19,7 @@ OBJS = $(lib_a_OBJECTS)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/amcompile.am
+include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sample.am
 
diff --git a/testsuites/samples/ticker/system.h b/testsuites/samples/ticker/system.h
index f17d52f279..b08e22b11a 100644
--- a/testsuites/samples/ticker/system.h
+++ b/testsuites/samples/ticker/system.h
@@ -14,6 +14,7 @@
  */
 
 #include <rtems.h>
+#include <inttypes.h>
 
 /* functions */
 
@@ -60,7 +61,7 @@ extern rtems_name Task_name[ 4 ];       /* array of task names */
 
 #define print_time(_s1, _tb, _s2) \
   do { \
-    printf( "%s%02d:%02d:%02d   %02d/%02d/%04d%s", \
+    printf( "%s%02" PRId32 ":%02" PRId32 ":%02" PRId32 "   %02" PRId32 "/%02" PRId32 "/%04" PRId32 "%s", \
        _s1, (_tb)->hour, (_tb)->minute, (_tb)->second, \
        (_tb)->month, (_tb)->day, (_tb)->year, _s2 ); \
     fflush(stdout); \
diff --git a/testsuites/samples/unlimited/Makefile.am b/testsuites/samples/unlimited/Makefile.am
index b3f764132f..0a742049b3 100644
--- a/testsuites/samples/unlimited/Makefile.am
+++ b/testsuites/samples/unlimited/Makefile.am
@@ -19,7 +19,7 @@ OBJS = $(lib_a_OBJECTS)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/amcompile.am
+include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sample.am