summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cpukit/ChangeLog5
-rw-r--r--cpukit/score/Makefile.am14
2 files changed, 14 insertions, 5 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 7bc9aa7be6..bb2d5436ff 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-12 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ * score/Makefile.am: Only used by ITRON so do not build if ITRON is
+ disabled.
+
2007-12-12 Chris Johns <chrisj@rtems.org>
* Makefile.am: Added libmisc/shell/shellconfig.h to the installed
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index eefe200510..c5163e1817 100644
--- a/cpukit/score/Makefile.am
+++ b/cpukit/score/Makefile.am
@@ -111,15 +111,19 @@ libscore_a_SOURCES += src/heap.c src/heapallocate.c src/heapextend.c \
## OBJECT_C_FILES
libscore_a_SOURCES += src/object.c src/objectallocate.c \
- src/objectallocatebyindex.c src/objectclearname.c \
- src/objectcomparenameraw.c src/objectcomparenamestring.c \
- src/objectcopynameraw.c src/objectcopynamestring.c \
- src/objectextendinformation.c src/objectfree.c src/objectget.c \
- src/objectgetisr.c src/objectgetbyindex.c src/objectgetnext.c \
+ src/objectclearname.c src/objectcomparenameraw.c \
+ src/objectcomparenamestring.c src/objectcopynameraw.c \
+ src/objectcopynamestring.c \ src/objectextendinformation.c \
+ src/objectfree.c src/objectget.c src/objectgetisr.c src/objectgetnext.c \
src/objectinitializeinformation.c src/objectnametoid.c \
src/objectshrinkinformation.c src/objectgetnoprotection.c \
src/objectidtoname.c src/objectgetnameasstring.c
+## OBJECT_C_FILES only used by ITRON API
+if LIBITRON
+libscore_a_SOURCES += src/objectallocatebyindex.c src/objectgetbyindex.c
+endif
+
## PROTECTED_HEAP_C_FILES
libscore_a_SOURCES += src/pheapallocatealigned.c src/pheapallocate.c \
src/pheapextend.c src/pheapfree.c src/pheapgetblocksize.c \