2 files changed, 11 insertions, 16 deletions
diff --git a/c/src/exec/sapi/include/rtems/Makefile.am b/c/src/exec/sapi/include/rtems/Makefile.am
index deabd8b0b5..0483ede4c3 100644
--- a/c/src/exec/sapi/include/rtems/Makefile.am
+++ b/c/src/exec/sapi/include/rtems/Makefile.am
@@ -5,13 +5,12 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 H_FILES = config.h directives.h extension.h fatal.h init.h io.h mptables.h \
-   sptables.h
+    sptables.h
 
 noinst_HEADERS = $(H_FILES)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
+    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
 
 $(PROJECT_INCLUDE)/rtems:
 	@$(mkinstalldirs) $@
@@ -20,8 +19,6 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h
 
 EXTRA_DIST = README
 
-all-am: $(PREINSTALL_FILES)
-debug-am: $(PREINSTALL_FILES)
-profile-am: $(PREINSTALL_FILES)
+all-local: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/sapi/include/rtems/README b/c/src/exec/sapi/include/rtems/README
index 5fcc0d14c7..f29bdb45b7 100644
--- a/c/src/exec/sapi/include/rtems/README
+++ b/c/src/exec/sapi/include/rtems/README
@@ -24,10 +24,8 @@ the Timing Test Suite:
 
    /* configuration information */
  
-   #define CONFIGURE_TMTEST
- 
-   #define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
-   #define CONFIGURE_TEST_NEEDS_TIMER_DRIVER
+   #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+   #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
  
    #define CONFIGURE_MAXIMUM_TASKS              102
    #define CONFIGURE_MAXIMUM_TIMERS             100
@@ -60,13 +58,13 @@ template by default.
  { NULL, NULL, NULL, NULL, NULL, NULL }
  
 rtems_driver_address_table Device_drivers[] = {
-#ifdef CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
+#ifdef CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
   CONSOLE_DRIVER_TABLE_ENTRY,
 #endif
-#ifdef CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
+#ifdef CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
   CLOCK_DRIVER_TABLE_ENTRY,
 #endif
-#ifdef CONFIGURE_TEST_NEEDS_STUB_DRIVER
+#ifdef CONFIGURE_APPLICATION_NEEDS_STUB_DRIVER
   STUB_DRIVER_TABLE_ENTRY,
 #endif
   NULL_DRIVER_TABLE_ENTRY,
@@ -83,7 +81,7 @@ rtems_initialization_tasks_table Initialization_tasks[] = {
   }
 };
 
-#ifdef CONFIGURE_MPTEST
+#ifdef CONFIGURE_MP_APPLICATION
 /*
  *  NODE_NUMBER is assumed to be set on the compile line.
  */
@@ -127,7 +125,7 @@ rtems_configuration_table Configuration = {
                              /* number of device drivers */
   Device_drivers,            /* pointer to driver address table */
   NULL,                      /* pointer to initial extensions */
-#ifdef CONFIGURE_MPTEST
+#ifdef CONFIGURE_MP_APPLICATION
   &Multiprocessing_configuration
 #else
   NULL                       /* ptr to MP config table */