From 0c819966e2ee7a7d55884e76f0366cf66c7e8409 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 9 Dec 2002 09:48:32 +0000 Subject: 2002-12-09 Ralf Corsepius * include/Makefile.am: Remove. * inline/Makefile.am: Remove. * macros/Makefile.am: Remove. * src/Makefile.am: Remove. * Makefile.am: Merge-in removed Makefile.ams. --- cpukit/score/ChangeLog | 8 ++ cpukit/score/Makefile.am | 181 ++++++++++++++++++++++++++++++++++++++- cpukit/score/include/Makefile.am | 51 ----------- cpukit/score/inline/Makefile.am | 43 ---------- cpukit/score/macros/Makefile.am | 43 ---------- cpukit/score/src/Makefile.am | 83 ------------------ 6 files changed, 188 insertions(+), 221 deletions(-) delete mode 100644 cpukit/score/include/Makefile.am delete mode 100644 cpukit/score/inline/Makefile.am delete mode 100644 cpukit/score/macros/Makefile.am delete mode 100644 cpukit/score/src/Makefile.am (limited to 'cpukit') diff --git a/cpukit/score/ChangeLog b/cpukit/score/ChangeLog index 14cd83492b..7c57ac13f8 100644 --- a/cpukit/score/ChangeLog +++ b/cpukit/score/ChangeLog @@ -1,3 +1,11 @@ +2002-12-09 Ralf Corsepius + + * include/Makefile.am: Remove. + * inline/Makefile.am: Remove. + * macros/Makefile.am: Remove. + * src/Makefile.am: Remove. + * Makefile.am: Merge-in removed Makefile.ams. + 2002-12-02 Joel Sherrill * include/rtems/score/object.h, include/rtems/score/tod.h: diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index 96648a10e7..2dbc5a9d95 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -2,8 +2,187 @@ ## $Id$ ## +include $(top_srcdir)/automake/multilib.am +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am -SUBDIRS = include inline macros cpu src +SUBDIRS = . cpu + +$(PROJECT_INCLUDE): + @$(mkinstalldirs) $@ +$(PROJECT_INCLUDE)/rtems: + @$(mkinstalldirs) $@ +$(PROJECT_INCLUDE)/rtems/score: + @$(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/%.h: include/%.h + $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/%.inl: $(INLINEdir)/%.inl + $(INSTALL_DATA) $< $@ + +PREINSTALL_FILES = $(PROJECT_INCLUDE) +## include + +include_rtemsdir = $(includedir)/rtems +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems + +include_rtems_HEADERS = include/rtems/debug.h include/rtems/system.h \ + include/rtems/seterr.h + +PREINSTALL_FILES += $(include_rtems_HEADERS:include/%=$(PROJECT_INCLUDE)/%) + +include_rtems_scoredir = $(includedir)/rtems/score +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score + +# We only build multiprocessing related files if HAS_MP was defined +MP_H_FILES = include/rtems/score/mpci.h include/rtems/score/mppkt.h \ + include/rtems/score/objectmp.h include/rtems/score/threadmp.h + +# H_FILES that get installed in the rtems/score subdirectoy +STD_H_FILES = include/rtems/score/address.h include/rtems/score/apiext.h \ + include/rtems/score/apimutex.h \ + include/rtems/score/bitfield.h include/rtems/score/chain.h include/rtems/score/context.h \ + include/rtems/score/copyrt.h include/rtems/score/coremsg.h include/rtems/score/coremutex.h \ + include/rtems/score/coresem.h include/rtems/score/heap.h include/rtems/score/interr.h \ + include/rtems/score/isr.h include/rtems/score/object.h include/rtems/score/priority.h \ + include/rtems/score/stack.h include/rtems/score/states.h include/rtems/score/sysstate.h \ + include/rtems/score/thread.h include/rtems/score/threadq.h include/rtems/score/tod.h \ + include/rtems/score/tqdata.h include/rtems/score/userext.h include/rtems/score/watchdog.h \ + include/rtems/score/wkspace.h +include_rtems_score_HEADERS = $(STD_H_FILES) include/rtems/score/cpuopts.h +PREINSTALL_FILES += $(STD_H_FILES:include/%.h=$(PROJECT_INCLUDE)/%.h) + +if HAS_MP +include_rtems_score_HEADERS += $(MP_H_FILES) +PREINSTALL_FILES += $(MP_H_FILES:include/%.h=$(PROJECT_INCLUDE)/%.h) +endif + +## inline + +## We only build multiprocessing related files if HAS_MP was defined +MP_I_FILES = inline/rtems/score/mppkt.inl inline/rtems/score/objectmp.inl inline/rtems/score/threadmp.inl +if INLINE +if HAS_MP +include_rtems_score_HEADERS += $(STD_I_FILES) +PREINSTALL_FILES += $(MP_I_FILES:inline/%.inl=$(PROJECT_INCLUDE)/%.inl) +endif +endif + +STD_I_FILES = inline/rtems/score/address.inl inline/rtems/score/chain.inl \ + inline/rtems/score/coremsg.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 inline/rtems/score/stack.inl inline/rtems/score/states.inl \ + inline/rtems/score/sysstate.inl inline/rtems/score/thread.inl inline/rtems/score/tod.inl \ + inline/rtems/score/tqdata.inl inline/rtems/score/userext.inl inline/rtems/score/watchdog.inl \ + inline/rtems/score/wkspace.inl +if INLINE +include_rtems_score_HEADERS += $(STD_I_FILES) +PREINSTALL_FILES += $(STD_I_FILES:inline/%.inl=$(PROJECT_INCLUDE)/%.inl) +endif + +EXTRA_DIST = $(STD_I_FILES) $(MP_I_FILES) + +## macros + +## We only build multiprocessing related files if HAS_MP was defined +MP_M_FILES = macros/rtems/score/mppkt.inl macros/rtems/score/objectmp.inl macros/rtems/score/threadmp.inl +if MACROS +if HAS_MP +include_rtems_score_HEADERS += $(MP_M_FILES) +PREINSTALL_FILES += $(MP_M_FILES:macros/%.inl=$(PROJECT_INCLUDE)/%.inl) +endif +endif + +STD_M_FILES = macros/rtems/score/address.inl macros/rtems/score/chain.inl \ + macros/rtems/score/coremsg.inl macros/rtems/score/coremutex.inl macros/rtems/score/coresem.inl \ + macros/rtems/score/heap.inl macros/rtems/score/isr.inl macros/rtems/score/object.inl \ + macros/rtems/score/priority.inl macros/rtems/score/stack.inl macros/rtems/score/states.inl \ + macros/rtems/score/sysstate.inl macros/rtems/score/thread.inl macros/rtems/score/tod.inl \ + macros/rtems/score/tqdata.inl macros/rtems/score/userext.inl macros/rtems/score/watchdog.inl \ + macros/rtems/score/wkspace.inl +if MACROS +include_rtems_score_HEADERS += $(STD_M_FILES) +PREINSTALL_FILES += $(MP_M_FILES:inline/%.inl=$(PROJECT_INCLUDE)/%.inl) +endif + +EXTRA_DIST += $(STD_M_FILES) $(MP_M_FILES) macros/README + +## src + +LIB=$(ARCH)/libscore.a + +# We only build multiprocessing related files if HAS_MP was defined +MP_C_FILES = src/mpci.c src/objectmp.c src/threadmp.c + +CORE_MESSAGE_QUEUE_C_FILES = 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 src/coremutexseize.c \ + src/coremutexsurrender.c + +CORE_SEMAPHORE_C_FILES = 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 \ + src/heapsizeofuserarea.c src/heapwalk.c src/heapgetinfo.c + +OBJECT_C_FILES = 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/objectinitializeinformation.c src/objectnametoid.c \ + src/objectshrinkinformation.c src/objectgetnoprotection.c + +THREAD_C_FILES = 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 \ + src/threadinitialize.c src/threadloadenv.c src/threadready.c src/threadresettimeslice.c \ + src/threadreset.c src/threadrestart.c src/threadresume.c src/threadrotatequeue.c \ + src/threadsetpriority.c src/threadsetstate.c src/threadsettransient.c \ + src/threadstackallocate.c src/threadstackfree.c src/threadstart.c \ + src/threadstartmultitasking.c src/threadsuspend.c src/threadtickletimeslice.c \ + src/threadyieldprocessor.c + +THREADQ_C_FILES = src/threadq.c src/threadqdequeue.c src/threadqdequeuefifo.c \ + src/threadqdequeuepriority.c src/threadqenqueue.c src/threadqenqueuefifo.c \ + src/threadqenqueuepriority.c src/threadqextract.c src/threadqextractfifo.c \ + src/threadqextractpriority.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 src/coretodtoseconds.c \ + src/coretodvalidate.c + +WATCHDOG_C_FILES = 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 +OBJS = $(C_FILES:src/%.c=${ARCH}/%.$(OBJEXT)) + +# +# Add local stuff here using += +# + +AM_CPPFLAGS += -D__RTEMS_INSIDE__ + +$(LIB): ${OBJS} + $(make-library) + +${ARCH}/%.$(OBJEXT): src/%.c + test -d $(ARCH) || mkdir $(ARCH) + ${COMPILE} -o $@ -c $< + +EXTRA_DIST += $(STD_C_FILES) $(MP_C_FILES) src/Unlimited.txt + +all-local: $(PREINSTALL_FILES) ${ARCH} $(LIB) include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/include/Makefile.am b/cpukit/score/include/Makefile.am deleted file mode 100644 index afd37e34f3..0000000000 --- a/cpukit/score/include/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -## -## $Id$ -## - - -$(PROJECT_INCLUDE)/%: % - $(INSTALL_DATA) $< $@ - -include_rtemsdir = $(includedir)/rtems - -$(PROJECT_INCLUDE)/rtems: - @$(mkinstalldirs) $@ - -include_rtems_HEADERS = rtems/debug.h rtems/system.h rtems/seterr.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \ - $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%) - -include_rtems_scoredir = $(includedir)/rtems/score - -$(PROJECT_INCLUDE)/rtems/score: - @$(mkinstalldirs) $@ - -# We only build multiprocessing related files if HAS_MP was defined -MP_H_FILES = rtems/score/mpci.h rtems/score/mppkt.h rtems/score/objectmp.h \ - rtems/score/threadmp.h - -# H_FILES that get installed in the rtems/score subdirectoy -STD_H_FILES = rtems/score/address.h rtems/score/apiext.h \ - rtems/score/apimutex.h \ - rtems/score/bitfield.h rtems/score/chain.h rtems/score/context.h \ - rtems/score/copyrt.h rtems/score/coremsg.h rtems/score/coremutex.h \ - rtems/score/coresem.h rtems/score/heap.h rtems/score/interr.h \ - rtems/score/isr.h rtems/score/object.h rtems/score/priority.h \ - rtems/score/stack.h rtems/score/states.h rtems/score/sysstate.h \ - rtems/score/thread.h rtems/score/threadq.h rtems/score/tod.h \ - rtems/score/tqdata.h rtems/score/userext.h rtems/score/watchdog.h \ - rtems/score/wkspace.h - -if HAS_MP -include_rtems_score_HEADERS = $(STD_H_FILES) $(MP_H_FILES) rtems/score/cpuopts.h -else -include_rtems_score_HEADERS = $(STD_H_FILES) rtems/score/cpuopts.h -endif - -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ - $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%) - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/inline/Makefile.am b/cpukit/score/inline/Makefile.am deleted file mode 100644 index 392c18d4b0..0000000000 --- a/cpukit/score/inline/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -## -## $Id$ -## - - -$(PROJECT_INCLUDE)/%: % - $(INSTALL_DATA) $< $@ - -include_rtems_scoredir = $(includedir)/rtems/score - -$(PROJECT_INCLUDE)/rtems/score: - @$(mkinstalldirs) $@ - -## We only build multiprocessing related files if HAS_MP was defined -MP_I_FILES = rtems/score/mppkt.inl rtems/score/objectmp.inl rtems/score/threadmp.inl - -STD_I_FILES = rtems/score/address.inl rtems/score/chain.inl \ - rtems/score/coremsg.inl rtems/score/coremutex.inl rtems/score/coresem.inl \ - rtems/score/heap.inl rtems/score/isr.inl rtems/score/object.inl \ - rtems/score/priority.inl rtems/score/stack.inl rtems/score/states.inl \ - rtems/score/sysstate.inl rtems/score/thread.inl rtems/score/tod.inl \ - rtems/score/tqdata.inl rtems/score/userext.inl rtems/score/watchdog.inl \ - rtems/score/wkspace.inl - -if HAS_MP -I_FILES = $(STD_I_FILES) $(MP_I_FILES) -else -I_FILES = $(STD_I_FILES) -endif - -if INLINE -include_rtems_score_HEADERS = $(I_FILES) - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \ - $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%) - -endif - -all-local: $(PREINSTALL_FILES) - -EXTRA_DIST = $(STD_I_FILES) $(MP_I_FILES) - -include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/macros/Makefile.am b/cpukit/score/macros/Makefile.am deleted file mode 100644 index 2cefac6a56..0000000000 --- a/cpukit/score/macros/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -## -## $Id$ -## - - -$(PROJECT_INCLUDE)/%: % - $(INSTALL_DATA) $< $@ - -include_rtems_scoredir = $(includedir)/rtems/score - -$(PROJECT_INCLUDE)/rtems/score: - @$(mkinstalldirs) $@ - -## We only build multiprocessing related files if HAS_MP was defined -MP_I_FILES = rtems/score/mppkt.inl rtems/score/objectmp.inl rtems/score/threadmp.inl - -STD_I_FILES = rtems/score/address.inl rtems/score/chain.inl \ - rtems/score/coremsg.inl rtems/score/coremutex.inl rtems/score/coresem.inl \ - rtems/score/heap.inl rtems/score/isr.inl rtems/score/object.inl \ - rtems/score/priority.inl rtems/score/stack.inl rtems/score/states.inl \ - rtems/score/sysstate.inl rtems/score/thread.inl rtems/score/tod.inl \ - rtems/score/tqdata.inl rtems/score/userext.inl rtems/score/watchdog.inl \ - rtems/score/wkspace.inl - -if HAS_MP -I_FILES = $(STD_I_FILES) $(MP_I_FILES) -else -I_FILES = $(STD_I_FILES) -endif - -if MACROS -include_rtems_score_HEADERS = $(I_FILES) - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \ - $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%) - -endif - -all-local: $(PREINSTALL_FILES) - -EXTRA_DIST = $(STD_I_FILES) $(MP_I_FILES) README - -include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/src/Makefile.am b/cpukit/score/src/Makefile.am deleted file mode 100644 index 908bd4c8d9..0000000000 --- a/cpukit/score/src/Makefile.am +++ /dev/null @@ -1,83 +0,0 @@ -## -## $Id$ -## - -LIB=$(ARCH)/libscore.a - -include $(top_srcdir)/automake/multilib.am -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am - -# We only build multiprocessing related files if HAS_MP was defined -MP_C_FILES = mpci.c objectmp.c threadmp.c - -CORE_MESSAGE_QUEUE_C_FILES = coremsg.c coremsgbroadcast.c coremsgclose.c \ - coremsgflush.c coremsgflushwait.c coremsginsert.c coremsgflushsupp.c \ - coremsgseize.c coremsgsubmit.c - -CORE_MUTEX_C_FILES = coremutex.c coremutexflush.c coremutexseize.c \ - coremutexsurrender.c - -CORE_SEMAPHORE_C_FILES = coresem.c coresemflush.c coresemseize.c \ - coresemsurrender.c - -HEAP_C_FILES = heap.c heapallocate.c heapextend.c heapfree.c \ - heapsizeofuserarea.c heapwalk.c heapgetinfo.c - -OBJECT_C_FILES = object.c objectallocate.c objectallocatebyindex.c \ - objectclearname.c objectcomparenameraw.c objectcomparenamestring.c \ - objectcopynameraw.c objectcopynamestring.c objectextendinformation.c \ - objectfree.c objectget.c objectgetisr.c objectgetbyindex.c \ - objectgetnext.c objectinitializeinformation.c objectnametoid.c \ - objectshrinkinformation.c objectgetnoprotection.c - -THREAD_C_FILES = thread.c threadchangepriority.c threadclearstate.c \ - threadclose.c threadcreateidle.c threaddelayended.c threaddispatch.c \ - threadevaluatemode.c threadget.c threadhandler.c threadidlebody.c \ - threadinitialize.c threadloadenv.c threadready.c threadresettimeslice.c \ - threadreset.c threadrestart.c threadresume.c threadrotatequeue.c \ - threadsetpriority.c threadsetstate.c threadsettransient.c \ - threadstackallocate.c threadstackfree.c threadstart.c \ - threadstartmultitasking.c threadsuspend.c threadtickletimeslice.c \ - threadyieldprocessor.c - -THREADQ_C_FILES = threadq.c threadqdequeue.c threadqdequeuefifo.c \ - threadqdequeuepriority.c threadqenqueue.c threadqenqueuefifo.c \ - threadqenqueuepriority.c threadqextract.c threadqextractfifo.c \ - threadqextractpriority.c threadqextractwithproxy.c threadqfirst.c \ - threadqfirstfifo.c threadqfirstpriority.c threadqflush.c threadqtimeout.c - -TOD_C_FILES = coretod.c coretodset.c coretodtickle.c coretodtoseconds.c \ - coretodvalidate.c - -WATCHDOG_C_FILES = watchdog.c watchdogadjust.c watchdoginsert.c \ - watchdogremove.c watchdogtickle.c - -STD_C_FILES = apiext.c chain.c $(CORE_MESSAGE_QUEUE_C_FILES) \ - $(CORE_MUTEX_C_FILES) $(CORE_SEMAPHORE_C_FILES) $(HEAP_C_FILES) interr.c \ - isr.c $(OBJECT_C_FILES) $(THREAD_C_FILES) $(THREADQ_C_FILES) \ - $(TOD_C_FILES) userext.c $(WATCHDOG_C_FILES) wkspace.c - -if HAS_MP -C_FILES = $(STD_C_FILES) $(MP_C_FILES) -else -C_FILES = $(STD_C_FILES) -endif -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) - -# -# Add local stuff here using += -# - -AM_CPPFLAGS += -D__RTEMS_INSIDE__ - -all-local: ${ARCH} $(LIB) - -$(LIB): ${OBJS} - $(make-library) - -EXTRA_DIST = $(STD_C_FILES) $(MP_C_FILES) Unlimited.txt - -include $(top_srcdir)/automake/local.am -- cgit v1.2.3