From 99db5e9420ce71c53525c5d24855ec5e8e5cc857 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 9 Dec 2002 05:33:57 +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. * configure.ac: Reflect changes above. --- cpukit/itron/ChangeLog | 9 +++ cpukit/itron/Makefile.am | 141 ++++++++++++++++++++++++++++++++++++++- cpukit/itron/configure.ac | 8 +-- cpukit/itron/include/Makefile.am | 55 --------------- cpukit/itron/inline/Makefile.am | 26 -------- cpukit/itron/macros/Makefile.am | 26 -------- cpukit/itron/src/Makefile.am | 64 ------------------ 7 files changed, 150 insertions(+), 179 deletions(-) delete mode 100644 cpukit/itron/include/Makefile.am delete mode 100644 cpukit/itron/inline/Makefile.am delete mode 100644 cpukit/itron/macros/Makefile.am delete mode 100644 cpukit/itron/src/Makefile.am (limited to 'cpukit/itron') diff --git a/cpukit/itron/ChangeLog b/cpukit/itron/ChangeLog index 9a12f75bb0..0e44b7247f 100644 --- a/cpukit/itron/ChangeLog +++ b/cpukit/itron/ChangeLog @@ -1,3 +1,12 @@ +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. + * configure.ac: Reflect changes above. + 2002-11-19 Ralf Corsepius * configure.ac: Cosmetical fixes. diff --git a/cpukit/itron/Makefile.am b/cpukit/itron/Makefile.am index e76b696b26..c241f5c228 100644 --- a/cpukit/itron/Makefile.am +++ b/cpukit/itron/Makefile.am @@ -4,7 +4,144 @@ ACLOCAL_AMFLAGS = -I ../aclocal -SUBDIRS = include inline macros src +include $(top_srcdir)/../automake/multilib.am +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/lib.am + +$(PROJECT_INCLUDE): + @$(mkinstalldirs) $@ +$(PROJECT_INCLUDE)/itronsys: + @$(mkinstalldirs) $@ +$(PROJECT_INCLUDE)/rtems/itron: + @$(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/%.h: include/%.h + $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/%.inl: $(INLINEdir)/%.inl + $(INSTALL_DATA) $< $@ + +## include + +include_HEADERS = include/itron.h + +PREINSTALL_FILES = $(PROJECT_INCLUDE) +PREINSTALL_FILES += $(include_HEADERS:include/%=$(PROJECT_INCLUDE)/%) + +## itronsys + +include_itronsysdir = $(includedir)/itronsys + +include_itronsys_HEADERS = include/itronsys/eventflags.h include/itronsys/fmempool.h \ + include/itronsys/intr.h include/itronsys/mbox.h include/itronsys/msgbuffer.h include/itronsys/network.h \ + include/itronsys/port.h include/itronsys/semaphore.h include/itronsys/status.h include/itronsys/sysmgmt.h \ + include/itronsys/task.h include/itronsys/time.h include/itronsys/types.h include/itronsys/vmempool.h + +PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys \ + $(include_itronsys_HEADERS:include/%=$(PROJECT_INCLUDE)/%) + +EXTRA_DIST = include/itronsys/README + +## rtems/itron +include_rtems_itrondir = $(includedir)/rtems/itron + +include_rtems_itron_HEADERS = include/rtems/itron/config.h include/rtems/itron/eventflags.h \ + include/rtems/itron/fmempool.h include/rtems/itron/intr.h include/rtems/itron/itronapi.h \ + include/rtems/itron/mbox.h include/rtems/itron/msgbuffer.h include/rtems/itron/network.h \ + include/rtems/itron/object.h include/rtems/itron/port.h include/rtems/itron/semaphore.h \ + include/rtems/itron/sysmgmt.h include/rtems/itron/task.h include/rtems/itron/time.h \ + include/rtems/itron/vmempool.h + +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron \ + $(include_rtems_itron_HEADERS:include/%=$(PROJECT_INCLUDE)/%) + +EXTRA_DIST += include/rtems/itron/README + +## Inline + +inline_H_FILES = inline/rtems/itron/eventflags.inl \ + inline/rtems/itron/fmempool.inl inline/rtems/itron/intr.inl inline/rtems/itron/mbox.inl \ + inline/rtems/itron/msgbuffer.inl inline/rtems/itron/network.inl inline/rtems/itron/port.inl \ + inline/rtems/itron/semaphore.inl inline/rtems/itron/sysmgmt.inl inline/rtems/itron/task.inl \ + inline/rtems/itron/time.inl inline/rtems/itron/vmempool.inl +noinst_HEADERS = $(inline_H_FILES) + +if INLINE +PREINSTALL_FILES += $(inline_H_FILES:inline/%=$(PROJECT_INCLUDE)/%) +include_rtems_itron_HEADERS += $(inline_H_FILES) +endif + +## Macros + +macros_H_FILES = macros/rtems/itron/eventflags.inl \ + macros/rtems/itron/fmempool.inl macros/rtems/itron/intr.inl macros/rtems/itron/mbox.inl \ + macros/rtems/itron/msgbuffer.inl macros/rtems/itron/network.inl macros/rtems/itron/port.inl \ + macros/rtems/itron/semaphore.inl macros/rtems/itron/sysmgmt.inl macros/rtems/itron/task.inl \ + macros/rtems/itron/time.inl macros/rtems/itron/vmempool.inl +noinst_HEADERS += $(macros_H_FILES) + +if MACROS +PREINSTALL_FILES += $(macros_H_FILES:macros/%=$(PROJECT_INCLUDE)/%) +include_rtems_itron_HEADERS += $(macros_H_FILES) +endif + +## Sources + +LIB=$(ARCH)/libitron.a + +TASK_C_FILES = src/task.c src/cre_tsk.c src/del_tsk.c src/sta_tsk.c src/ext_tsk.c src/exd_tsk.c \ + src/ter_tsk.c src/dis_dsp.c src/ena_dsp.c src/chg_pri.c src/rot_rdq.c src/rel_wai.c src/get_tid.c \ + src/ref_tsk.c + +TASKSYNC_C_FILES = src/sus_tsk.c src/rsm_tsk.c src/frsm_tsk.c src/slp_tsk.c src/tslp_tsk.c \ + src/wup_tsk.c src/can_wup.c + +SEMAPHORE_C_FILES = src/itronsem.c src/cre_sem.c src/del_sem.c src/preq_sem.c src/ref_sem.c \ + src/sig_sem.c src/twai_sem.c src/wai_sem.c + +EVENTFLAGS_C_FILES = src/eventflags.c + +MAILBOX_C_FILES = src/mbox.c + +MSGBUFFER_C_FILES = src/msgbuffer.c src/msgbuffertranslatereturncode.c src/cre_mbf.c \ + src/del_mbf.c src/prcv_mbf.c src/psnd_mbf.c src/rcv_mbf.c src/ref_mbf.c src/snd_mbf.c src/trcv_mbf.c \ + src/tsnd_mbf.c + +RENDEZVOUS_C_FILES = src/port.c + +INTERRUPT_C_FILES = src/itronintr.c + +VARIABLE_MEMORY_POOL_C_FILES = src/vmempool.c + +FIXED_MEMORY_POOL_C_FILES = src/fmempool.c + +TIME_C_FILES = src/itrontime.c + +CONFIGURATION_C_FILES = src/sysmgmt.c + +NETWORK_C_FILES = src/network.c + +C_FILES = $(TASK_C_FILES) $(TASKSYNC_C_FILES) $(SEMAPHORE_C_FILES) \ + $(EVENTFLAGS_C_FILES) $(MAILBOX_C_FILES) $(MSGBUFFER_C_FILES) \ + $(RENDEZVOUS_C_FILES) $(INTERRUPT_C_FILES) \ + $(VARIABLE_MEMORY_POOL_C_FILES) $(FIXED_MEMORY_POOL_C_FILES) \ + $(TIME_C_FILES) +OBJS = $(C_FILES:src/%.c=${ARCH}/%.$(OBJEXT)) + +AM_CPPFLAGS += -Isrc -D__RTEMS_INSIDE__ + +$(LIB): ${OBJS} + $(make-library) + +${ARCH}/%.$(OBJEXT): src/%.c + test -d ${ARCH} || mkdir ${ARCH} + ${COMPILE} -o $@ -c $< + +UNUSED_C_FILES = src/cre_mbx.c src/del_mbx.c src/mboxtranslatereturncode.c src/network.c \ + src/prcv_mbx.c src/rcv_mbx.c src/ref_mbx.c src/snd_mbx.c src/sysmgmt.c src/trcv_mbx.c + +EXTRA_DIST += $(C_FILES) $(UNUSED_C_FILES) src/TODO + +## General +all-local: $(PREINSTALL_FILES) ${ARCH} ${LIB} -include $(top_srcdir)/../automake/subdirs.am include $(top_srcdir)/../automake/local.am diff --git a/cpukit/itron/configure.ac b/cpukit/itron/configure.ac index 61b3c63997..b76ac4b305 100644 --- a/cpukit/itron/configure.ac +++ b/cpukit/itron/configure.ac @@ -33,6 +33,7 @@ if test "$RTEMS_USE_MACROS" = "yes"; then else INLINEdir="inline" fi +AC_SUBST(INLINEdir) AM_CONDITIONAL(INLINE,test "$INLINEdir" = "inline" ) AM_CONDITIONAL(MACROS,test "$INLINEdir" = "macros" ) @@ -45,11 +46,6 @@ AM_CONFIG_HEADER([src/config.h]) ## FIXME: We configure and build the macros subdirectory, too. ## Should probably use AM_CONDITIONALs to disable them in future # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -src/Makefile -include/Makefile -inline/Makefile -macros/Makefile -]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/cpukit/itron/include/Makefile.am b/cpukit/itron/include/Makefile.am deleted file mode 100644 index 4d6f968519..0000000000 --- a/cpukit/itron/include/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -## -## $Id$ -## - - -$(PROJECT_INCLUDE): - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/itronsys: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/rtems/itron: - @$(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%: % - $(INSTALL_DATA) $< $@ - -## include - -include_HEADERS = itron.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE) \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - -## itronsys - -include_itronsysdir = $(includedir)/itronsys - -include_itronsys_HEADERS = itronsys/eventflags.h itronsys/fmempool.h \ - itronsys/intr.h itronsys/mbox.h itronsys/msgbuffer.h itronsys/network.h \ - itronsys/port.h itronsys/semaphore.h itronsys/status.h itronsys/sysmgmt.h \ - itronsys/task.h itronsys/time.h itronsys/types.h itronsys/vmempool.h - -PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys \ - $(include_itronsys_HEADERS:%=$(PROJECT_INCLUDE)/%) - -EXTRA_DIST = itronsys/README - -## rtems/itron -include_rtems_itrondir = $(includedir)/rtems/itron - -include_rtems_itron_HEADERS = rtems/itron/config.h rtems/itron/eventflags.h \ - rtems/itron/fmempool.h rtems/itron/intr.h rtems/itron/itronapi.h \ - rtems/itron/mbox.h rtems/itron/msgbuffer.h rtems/itron/network.h \ - rtems/itron/object.h rtems/itron/port.h rtems/itron/semaphore.h \ - rtems/itron/sysmgmt.h rtems/itron/task.h rtems/itron/time.h \ - rtems/itron/vmempool.h - -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron \ - $(include_rtems_itron_HEADERS:%=$(PROJECT_INCLUDE)/%) - -EXTRA_DIST += rtems/itron/README - -## General -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../automake/local.am diff --git a/cpukit/itron/inline/Makefile.am b/cpukit/itron/inline/Makefile.am deleted file mode 100644 index c0d667c927..0000000000 --- a/cpukit/itron/inline/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -## -## $Id$ -## - - -include_rtems_itrondir = $(includedir)/rtems/itron - -$(PROJECT_INCLUDE)/rtems/itron: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%: % - $(INSTALL_DATA) $< $@ - -if INLINE -include_rtems_itron_HEADERS = rtems/itron/eventflags.inl \ - rtems/itron/fmempool.inl rtems/itron/intr.inl rtems/itron/mbox.inl \ - rtems/itron/msgbuffer.inl rtems/itron/network.inl rtems/itron/port.inl \ - rtems/itron/semaphore.inl rtems/itron/sysmgmt.inl rtems/itron/task.inl \ - rtems/itron/time.inl rtems/itron/vmempool.inl - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/itron \ - $(include_rtems_itron_HEADERS:%=$(PROJECT_INCLUDE)/%) -endif - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../automake/local.am diff --git a/cpukit/itron/macros/Makefile.am b/cpukit/itron/macros/Makefile.am deleted file mode 100644 index 954b38e39c..0000000000 --- a/cpukit/itron/macros/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -## -## $Id$ -## - - -include_rtems_itrondir = $(includedir)/rtems/itron - -$(PROJECT_INCLUDE)/rtems/itron: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%: % - $(INSTALL_DATA) $< $@ - -if MACROS -include_rtems_itron_HEADERS = rtems/itron/eventflags.inl \ - rtems/itron/fmempool.inl rtems/itron/intr.inl rtems/itron/mbox.inl \ - rtems/itron/msgbuffer.inl rtems/itron/network.inl rtems/itron/port.inl \ - rtems/itron/semaphore.inl rtems/itron/sysmgmt.inl rtems/itron/task.inl \ - rtems/itron/time.inl rtems/itron/vmempool.inl - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/itron \ - $(include_rtems_itron_HEADERS:%=$(PROJECT_INCLUDE)/%) -endif - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../automake/local.am diff --git a/cpukit/itron/src/Makefile.am b/cpukit/itron/src/Makefile.am deleted file mode 100644 index 5fda1e1621..0000000000 --- a/cpukit/itron/src/Makefile.am +++ /dev/null @@ -1,64 +0,0 @@ -## -## $Id$ -## - -LIB=$(ARCH)/libitron.a - -TASK_C_FILES = task.c cre_tsk.c del_tsk.c sta_tsk.c ext_tsk.c exd_tsk.c \ - ter_tsk.c dis_dsp.c ena_dsp.c chg_pri.c rot_rdq.c rel_wai.c get_tid.c \ - ref_tsk.c - -TASKSYNC_C_FILES = sus_tsk.c rsm_tsk.c frsm_tsk.c slp_tsk.c tslp_tsk.c \ - wup_tsk.c can_wup.c - -SEMAPHORE_C_FILES = itronsem.c cre_sem.c del_sem.c preq_sem.c ref_sem.c \ - sig_sem.c twai_sem.c wai_sem.c - -EVENTFLAGS_C_FILES = eventflags.c - -MAILBOX_C_FILES = mbox.c - -MSGBUFFER_C_FILES = msgbuffer.c msgbuffertranslatereturncode.c cre_mbf.c \ - del_mbf.c prcv_mbf.c psnd_mbf.c rcv_mbf.c ref_mbf.c snd_mbf.c trcv_mbf.c \ - tsnd_mbf.c - -RENDEZVOUS_C_FILES = port.c - -INTERRUPT_C_FILES = itronintr.c - -VARIABLE_MEMORY_POOL_C_FILES = vmempool.c - -FIXED_MEMORY_POOL_C_FILES = fmempool.c - -TIME_C_FILES = itrontime.c - -CONFIGURATION_C_FILES = sysmgmt.c - -NETWORK_C_FILES = network.c - -C_FILES = $(TASK_C_FILES) $(TASKSYNC_C_FILES) $(SEMAPHORE_C_FILES) \ - $(EVENTFLAGS_C_FILES) $(MAILBOX_C_FILES) $(MSGBUFFER_C_FILES) \ - $(RENDEZVOUS_C_FILES) $(INTERRUPT_C_FILES) \ - $(VARIABLE_MEMORY_POOL_C_FILES) $(FIXED_MEMORY_POOL_C_FILES) \ - $(TIME_C_FILES) -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) - -include $(top_srcdir)/../automake/multilib.am -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am - -AM_CPPFLAGS += -I. -D__RTEMS_INSIDE__ - -all-local: ${ARCH} ${LIB} - -$(LIB): ${OBJS} - $(make-library) - -UNUSED_C_FILES = cre_mbx.c del_mbx.c mboxtranslatereturncode.c network.c \ - prcv_mbx.c rcv_mbx.c ref_mbx.c snd_mbx.c sysmgmt.c trcv_mbx.c - -EXTRA_DIST = $(C_FILES) $(UNUSED_C_FILES) - -include $(top_srcdir)/../automake/local.am -- cgit v1.2.3