4 files changed, 6 insertions, 9 deletions
diff --git a/c/src/tests/samples/base_mp/node1/Makefile.am b/c/src/tests/samples/base_mp/node1/Makefile.am
index fdf0db6e15..3a5a45e9e2 100644
--- a/c/src/tests/samples/base_mp/node1/Makefile.am
+++ b/c/src/tests/samples/base_mp/node1/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/sample.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I.
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I.
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/samples/base_mp/node2/Makefile.am b/c/src/tests/samples/base_mp/node2/Makefile.am
index acfe772653..0810138fb8 100644
--- a/c/src/tests/samples/base_mp/node2/Makefile.am
+++ b/c/src/tests/samples/base_mp/node2/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/sample.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I.
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I.
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/samples/configure.in b/c/src/tests/samples/configure.in
index ddb2c519c5..7f275e8d68 100644
--- a/c/src/tests/samples/configure.in
+++ b/c/src/tests/samples/configure.in
@@ -12,11 +12,7 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-tests-samples,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_MULTIPROCESSING
-RTEMS_ENABLE_POSIX
-RTEMS_ENABLE_ITRON
 RTEMS_ENABLE_NETWORKING
-RTEMS_ENABLE_INLINES
 RTEMS_ENABLE_CXX
 RTEMS_ENABLE_GCC28
 RTEMS_ENABLE_BARE
@@ -37,7 +33,6 @@ RTEMS_CANONICALIZE_TOOLS
 
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
-RTEMS_CHECK_POSIX_API(RTEMS_BSP)
 RTEMS_CHECK_CXX(RTEMS_BSP)
 
 AM_CONDITIONAL(HAS_CXX,test "$HAS_CPLUSPLUS" = "yes")
diff --git a/c/src/tests/samples/sample.am b/c/src/tests/samples/sample.am
index a294dcc949..dbd1482b9d 100644
--- a/c/src/tests/samples/sample.am
+++ b/c/src/tests/samples/sample.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS += @DEFS@
+
 project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@
 
 $(project_bspdir)/samples: