3 files changed, 25 insertions, 10 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 76aa4398db..b410b079d7 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-26	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* score/Makefile.am, score/preinstall.am: SuperCore Spinlock is only
+	used by POSIX API. Do not build it when POSIX is not enabled.
+
 2009-07-24	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* sapi/src/ioregisterdriver.c: Fix spacing.
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index 4684b990bd..dfbd0156d9 100644
--- a/cpukit/score/Makefile.am
+++ b/cpukit/score/Makefile.am
@@ -22,7 +22,7 @@ include_rtems_score_HEADERS = include/rtems/score/address.h \
     include/rtems/score/context.h include/rtems/score/copyrt.h \
     include/rtems/score/corebarrier.h include/rtems/score/coremsg.h \
     include/rtems/score/coremutex.h include/rtems/score/corerwlock.h \
-    include/rtems/score/coresem.h include/rtems/score/corespinlock.h \
+    include/rtems/score/coresem.h \
     include/rtems/score/heap.h include/rtems/score/protectedheap.h \
     include/rtems/score/interr.h include/rtems/score/isr.h \
     include/rtems/score/object.h include/rtems/score/priority.h \
@@ -35,6 +35,10 @@ include_rtems_score_HEADERS = include/rtems/score/address.h \
     include/rtems/score/watchdog.h include/rtems/score/wkspace.h \
     include/rtems/score/cpuopts.h
 
+if LIBPOSIX
+include_rtems_score_HEADERS += include/rtems/score/corespinlock.h
+endif
+
 if HAS_MP
 # We only build multiprocessing related files if HAS_MP was defined
 include_rtems_score_HEADERS += include/rtems/score/mpci.h \
@@ -46,7 +50,6 @@ endif
 include_rtems_score_HEADERS += inline/rtems/score/address.inl \
     inline/rtems/score/chain.inl inline/rtems/score/corebarrier.inl \
     inline/rtems/score/coremsg.inl inline/rtems/score/corerwlock.inl \
-    inline/rtems/score/corespinlock.inl \
     inline/rtems/score/coremutex.inl inline/rtems/score/coresem.inl \
     inline/rtems/score/heap.inl inline/rtems/score/isr.inl \
     inline/rtems/score/object.inl inline/rtems/score/priority.inl \
@@ -55,6 +58,9 @@ include_rtems_score_HEADERS += inline/rtems/score/address.inl \
     inline/rtems/score/threadq.inl inline/rtems/score/tod.inl \
     inline/rtems/score/tqdata.inl \
     inline/rtems/score/watchdog.inl inline/rtems/score/wkspace.inl
+if LIBPOSIX
+include_rtems_score_HEADERS += inline/rtems/score/corespinlock.inl
+endif
 
 if HAS_MP
 ## We only build multiprocessing related files if HAS_MP was defined
@@ -103,8 +109,10 @@ libscore_a_SOURCES += src/coresem.c src/coresemflush.c src/coresemseize.c \
     src/coresemsurrender.c
 
 ## CORE_SPINLOCK_C_FILES
+if LIBPOSIX
 libscore_a_SOURCES += src/corespinlock.c src/corespinlockrelease.c \
     src/corespinlockwait.c
+endif
 
 ## HEAP_C_FILES
 libscore_a_SOURCES += src/heap.c src/heapallocate.c src/heapextend.c \
diff --git a/cpukit/score/preinstall.am b/cpukit/score/preinstall.am
index c225515adb..95e6a30563 100644
--- a/cpukit/score/preinstall.am
+++ b/cpukit/score/preinstall.am
@@ -83,10 +83,6 @@ $(PROJECT_INCLUDE)/rtems/score/coresem.h: include/rtems/score/coresem.h $(PROJEC
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/coresem.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/coresem.h
 
-$(PROJECT_INCLUDE)/rtems/score/corespinlock.h: include/rtems/score/corespinlock.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/corespinlock.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/corespinlock.h
-
 $(PROJECT_INCLUDE)/rtems/score/heap.h: include/rtems/score/heap.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/heap.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/heap.h
@@ -171,6 +167,11 @@ $(PROJECT_INCLUDE)/rtems/score/cpuopts.h: include/rtems/score/cpuopts.h $(PROJEC
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuopts.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuopts.h
 
+if LIBPOSIX
+$(PROJECT_INCLUDE)/rtems/score/corespinlock.h: include/rtems/score/corespinlock.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/corespinlock.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/corespinlock.h
+endif
 if HAS_MP
 $(PROJECT_INCLUDE)/rtems/score/mpci.h: include/rtems/score/mpci.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/mpci.h
@@ -208,10 +209,6 @@ $(PROJECT_INCLUDE)/rtems/score/corerwlock.inl: inline/rtems/score/corerwlock.inl
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/corerwlock.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/corerwlock.inl
 
-$(PROJECT_INCLUDE)/rtems/score/corespinlock.inl: inline/rtems/score/corespinlock.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/corespinlock.inl
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/corespinlock.inl
-
 $(PROJECT_INCLUDE)/rtems/score/coremutex.inl: inline/rtems/score/coremutex.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/coremutex.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/coremutex.inl
@@ -272,6 +269,11 @@ $(PROJECT_INCLUDE)/rtems/score/wkspace.inl: inline/rtems/score/wkspace.inl $(PRO
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/wkspace.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/wkspace.inl
 
+if LIBPOSIX
+$(PROJECT_INCLUDE)/rtems/score/corespinlock.inl: inline/rtems/score/corespinlock.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/corespinlock.inl
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/corespinlock.inl
+endif
 if HAS_MP
 $(PROJECT_INCLUDE)/rtems/score/mppkt.inl: inline/rtems/score/mppkt.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/mppkt.inl