From 4df3f89fd3657d5e3d1fddc7ec359aee7113cddd Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 16 Jan 2006 15:33:06 +0000 Subject: =?UTF-8?q?2006-01-16=09Ralf=20Cors=C3=A9pius=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * rtems/Makefile.am: Rework. * score/Makefile.am: Rework. --- cpukit/ChangeLog | 11 ++++++--- cpukit/rtems/Makefile.am | 42 +++++++++++++++++++-------------- cpukit/score/Makefile.am | 60 ++++++++++++++++++++++++++---------------------- 3 files changed, 65 insertions(+), 48 deletions(-) (limited to 'cpukit') diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 030bee738f..7f9ec398c2 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2006-01-16 Ralf Corsépius + + * rtems/Makefile.am: Rework. + * score/Makefile.am: Rework. + 2006-01-16 Joel Sherrill Large patch to improve Doxygen output. As a side-effect, grammar and @@ -108,9 +113,9 @@ 2006-01-15 Eric Norum - * /posix/inline/rtems/posix/cond.inl, /posix/inline/rtems/posix/mutex.inl, - /posix/macros/rtems/posix/cond.inl /posix/macros/rtems/posix/mutex.inl: - Keep compiler happy by making some casts explicit. + * posix/inline/rtems/posix/cond.inl, posix/inline/rtems/posix/mutex.inl, + posix/macros/rtems/posix/cond.inl, posix/macros/rtems/posix/mutex.inl: + Keep compiler happy by making some casts explicit. 2006-01-13 Ralf Corsepius diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am index f29b32dcf6..352214d0d3 100644 --- a/cpukit/rtems/Makefile.am +++ b/cpukit/rtems/Makefile.am @@ -64,59 +64,67 @@ endif ## src librtems_a_SOURCES = -TASK_C_FILES = src/tasks.c src/taskcreate.c src/taskdelete.c \ +## TASK_C_FILES +librtems_a_SOURCES += src/tasks.c src/taskcreate.c src/taskdelete.c \ src/taskgetnote.c src/taskident.c src/taskinitusers.c \ src/taskissuspended.c src/taskmode.c src/taskrestart.c src/taskresume.c \ src/tasksetnote.c src/tasksetpriority.c src/taskstart.c \ src/tasksuspend.c src/taskwakeafter.c src/taskwakewhen.c \ src/taskvariableadd.c src/taskvariabledelete.c src/taskvariableget.c -RATEMON_C_FILES = src/ratemon.c src/ratemoncancel.c src/ratemoncreate.c \ +## RATEMON_C_FILES +librtems_a_SOURCES += src/ratemon.c src/ratemoncancel.c src/ratemoncreate.c \ src/ratemondelete.c src/ratemongetstatus.c src/ratemonident.c \ src/ratemonperiod.c src/ratemontimeout.c -INTR_C_FILES = src/intr.c src/intrbody.c src/intrcatch.c +## INTR_C_FILES +librtems_a_SOURCES += src/intr.c src/intrbody.c src/intrcatch.c -CLOCK_C_FILES = src/rtclock.c src/clockget.c src/clockset.c src/clocktick.c +## CLOCK_C_FILES +librtems_a_SOURCES += src/rtclock.c src/clockget.c src/clockset.c src/clocktick.c -TIMER_C_FILES = src/rtemstimer.c src/timercancel.c src/timercreate.c \ +## TIMER_C_FILES +librtems_a_SOURCES += src/rtemstimer.c src/timercancel.c src/timercreate.c \ src/timerdelete.c src/timerfireafter.c src/timerfirewhen.c \ src/timergetinfo.c src/timerident.c src/timerreset.c src/timerserver.c \ src/timerserverfireafter.c src/timerserverfirewhen.c -MESSAGE_QUEUE_C_FILES = src/msg.c src/msgqallocate.c src/msgqbroadcast.c \ +## MESSAGE_QUEUE_C_FILES +librtems_a_SOURCES += src/msg.c src/msgqallocate.c src/msgqbroadcast.c \ src/msgqcreate.c src/msgqdelete.c src/msgqflush.c \ src/msgqgetnumberpending.c src/msgqident.c src/msgqreceive.c \ src/msgqsend.c src/msgqsubmit.c src/msgqtranslatereturncode.c \ src/msgqurgent.c -SEMAPHORE_C_FILES = src/sem.c src/semcreate.c src/semdelete.c src/semident.c \ +## SEMAPHORE_C_FILES +librtems_a_SOURCES += src/sem.c src/semcreate.c src/semdelete.c src/semident.c \ src/semobtain.c src/semrelease.c src/semflush.c \ src/semtranslatereturncode.c -EVENT_C_FILES = src/event.c src/eventreceive.c src/eventseize.c \ +## EVENT_C_FILES +librtems_a_SOURCES += src/event.c src/eventreceive.c src/eventseize.c \ src/eventsend.c src/eventsurrender.c src/eventtimeout.c -SIGNAL_C_FILES = src/signal.c src/signalcatch.c src/signalsend.c +## SIGNAL_C_FILES +librtems_a_SOURCES += src/signal.c src/signalcatch.c src/signalsend.c -REGION_C_FILES = src/region.c src/regioncreate.c src/regiondelete.c \ +## REGION_C_FILES +librtems_a_SOURCES += src/region.c src/regioncreate.c src/regiondelete.c \ src/regionextend.c src/regiongetsegment.c src/regiongetsegmentsize.c \ src/regionident.c src/regionreturnsegment.c src/regiongetinfo.c \ src/regiongetfreeinfo.c src/regionresizesegment.c \ src/regionprocessqueue.c -PARTITION_C_FILES = src/part.c src/partcreate.c src/partdelete.c \ +## PARTITION_C_FILES +librtems_a_SOURCES += src/part.c src/partcreate.c src/partdelete.c \ src/partgetbuffer.c src/partident.c src/partreturnbuffer.c -DPMEM_C_FILES = src/dpmem.c src/dpmemcreate.c src/dpmemdelete.c \ +## DPMEM_C_FILES +librtems_a_SOURCES += src/dpmem.c src/dpmemcreate.c src/dpmemdelete.c \ src/dpmemexternal2internal.c src/dpmemident.c \ src/dpmeminternal2external.c -librtems_a_SOURCES += src/attr.c src/rtemsidtoname.c $(TASK_C_FILES) \ - $(RATEMON_C_FILES) $(INTR_C_FILES) $(CLOCK_C_FILES) $(TIMER_C_FILES) \ - $(SEMAPHORE_C_FILES) $(MESSAGE_QUEUE_C_FILES) $(EVENT_C_FILES) \ - $(SIGNAL_C_FILES) $(PARTITION_C_FILES) $(REGION_C_FILES) \ - $(DPMEM_C_FILES) +librtems_a_SOURCES += src/attr.c src/rtemsidtoname.c if HAS_MP # We only build multiprocessing related files if HAS_MP was defined diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index 07518eb865..04ddb00229 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -5,7 +5,7 @@ include $(top_srcdir)/automake/multilib.am include $(top_srcdir)/automake/compile.am -SUBDIRS = . cpu +SUBDIRS = cpu ## include @@ -79,26 +79,39 @@ EXTRA_DIST = macros/README ## src +AM_CPPFLAGS += -D__RTEMS_INSIDE__ + +noinst_LIBRARIES = libscore.a +libscore_a_SOURCES = +libscore_a_CPPFLAGS = $(AM_CPPFLAGS) + # We only build multiprocessing related files if HAS_MP was defined -MP_C_FILES = src/mpci.c src/objectmp.c src/threadmp.c +if HAS_MP +libscore_a_SOURCES += src/mpci.c src/objectmp.c src/threadmp.c +endif -CORE_MESSAGE_QUEUE_C_FILES = src/coremsg.c src/coremsgbroadcast.c \ +## CORE_MESSAGE_QUEUE_C_FILES +libscore_a_SOURCES += src/coremsg.c src/coremsgbroadcast.c \ src/coremsgclose.c src/coremsgflush.c src/coremsgflushwait.c \ src/coremsginsert.c src/coremsgflushsupp.c src/coremsgseize.c \ src/coremsgsubmit.c -CORE_MUTEX_C_FILES = src/coremutex.c src/coremutexflush.c \ +## CORE_MUTEX_C_FILES +libscore_a_SOURCES += src/coremutex.c src/coremutexflush.c \ src/coremutexseize.c src/coremutexsurrender.c -CORE_SEMAPHORE_C_FILES = src/coresem.c src/coresemflush.c src/coresemseize.c \ +## CORE_SEMAPHORE_C_FILES +libscore_a_SOURCES += src/coresem.c src/coresemflush.c src/coresemseize.c \ src/coresemsurrender.c -HEAP_C_FILES = src/heap.c src/heapallocate.c src/heapextend.c src/heapfree.c \ +## HEAP_C_FILES +libscore_a_SOURCES += src/heap.c src/heapallocate.c src/heapextend.c src/heapfree.c \ src/heapsizeofuserarea.c src/heapwalk.c src/heapgetinfo.c \ src/heapgetfreeinfo.c src/heapallocatealigned.c \ src/heapresizeblock.c -OBJECT_C_FILES = src/object.c src/objectallocate.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 \ @@ -108,7 +121,8 @@ OBJECT_C_FILES = src/object.c src/objectallocate.c \ src/objectshrinkinformation.c src/objectgetnoprotection.c \ src/objectidtoname.c -THREAD_C_FILES = src/thread.c src/threadchangepriority.c \ +## THREAD_C_FILES +libscore_a_SOURCES += src/thread.c src/threadchangepriority.c \ src/threadclearstate.c src/threadclose.c src/threadcreateidle.c \ src/threaddelayended.c src/threaddispatch.c src/threadevaluatemode.c \ src/threadget.c src/threadhandler.c src/threadidlebody.c \ @@ -120,7 +134,8 @@ THREAD_C_FILES = src/thread.c src/threadchangepriority.c \ src/threadsuspend.c src/threadtickletimeslice.c \ src/threadyieldprocessor.c src/iterateoverthreads.c -THREADQ_C_FILES = src/threadq.c src/threadqdequeue.c \ +## THREADQ_C_FILES +libscore_a_SOURCES += src/threadq.c src/threadqdequeue.c \ src/threadqdequeuefifo.c src/threadqdequeuepriority.c \ src/threadqenqueue.c src/threadqenqueuefifo.c \ src/threadqenqueuepriority.c src/threadqextract.c \ @@ -128,30 +143,19 @@ THREADQ_C_FILES = src/threadq.c src/threadqdequeue.c \ src/threadqextractwithproxy.c src/threadqfirst.c src/threadqfirstfifo.c \ src/threadqfirstpriority.c src/threadqflush.c src/threadqtimeout.c -TOD_C_FILES = src/coretod.c src/coretodset.c src/coretodtickle.c \ +## TOD_C_FILES +libscore_a_SOURCES += src/coretod.c src/coretodset.c src/coretodtickle.c \ src/coretodtoseconds.c src/coretodvalidate.c -WATCHDOG_C_FILES = src/watchdog.c src/watchdogadjust.c src/watchdoginsert.c \ +## WATCHDOG_C_FILES +libscore_a_SOURCES += src/watchdog.c src/watchdogadjust.c src/watchdoginsert.c \ src/watchdogremove.c src/watchdogtickle.c -STD_C_FILES = src/apiext.c src/chain.c $(CORE_MESSAGE_QUEUE_C_FILES) \ - $(CORE_MUTEX_C_FILES) $(CORE_SEMAPHORE_C_FILES) $(HEAP_C_FILES) \ - src/interr.c src/isr.c $(OBJECT_C_FILES) $(THREAD_C_FILES) \ - $(THREADQ_C_FILES) $(TOD_C_FILES) src/userext.c $(WATCHDOG_C_FILES) \ - src/wkspace.c - -C_FILES = $(STD_C_FILES) -if HAS_MP -C_FILES += $(MP_C_FILES) -endif - -AM_CPPFLAGS += -D__RTEMS_INSIDE__ - -noinst_LIBRARIES = libscore.a -libscore_a_SOURCES = $(C_FILES) -libscore_a_CPPFLAGS = $(AM_CPPFLAGS) +## STD_C_FILES +libscore_a_SOURCES += src/apiext.c src/chain.c \ + src/interr.c src/isr.c src/userext.c src/wkspace.c -EXTRA_DIST += $(STD_C_FILES) $(MP_C_FILES) src/Unlimited.txt +EXTRA_DIST += src/Unlimited.txt DISTCLEANFILES = include/rtems/score/cpuopts.h -- cgit v1.2.3