From fba12eb6ff4a91fcbac1c43dd3196114cc12756b Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 23 Nov 1999 13:29:04 +0000 Subject: Patch rtems-rc-19991117-11.diff from Ralf Corsepius to convert the libc directory to automake and "dozens of small fixes for Makefile.ins/configure.ins below c/src/lib." --- c/src/exec/rtems/include/rtems/rtems/Makefile.am | 16 ++-- c/src/exec/rtems/macros/rtems/rtems/Makefile.am | 5 +- c/src/exec/rtems/optman/Makefile.am | 40 ++++++++++ c/src/exec/rtems/optman/Makefile.in | 61 --------------- c/src/exec/rtems/src/Makefile.am | 79 ++++++++++++++++++++ c/src/exec/rtems/src/Makefile.in | 95 ------------------------ 6 files changed, 132 insertions(+), 164 deletions(-) create mode 100644 c/src/exec/rtems/optman/Makefile.am delete mode 100644 c/src/exec/rtems/optman/Makefile.in create mode 100644 c/src/exec/rtems/src/Makefile.am delete mode 100644 c/src/exec/rtems/src/Makefile.in (limited to 'c/src/exec/rtems') diff --git a/c/src/exec/rtems/include/rtems/rtems/Makefile.am b/c/src/exec/rtems/include/rtems/rtems/Makefile.am index 4afbdd0695..cbd214e1aa 100644 --- a/c/src/exec/rtems/include/rtems/rtems/Makefile.am +++ b/c/src/exec/rtems/include/rtems/rtems/Makefile.am @@ -5,20 +5,24 @@ AUTOMAKE_OPTIONS = foreign 1.4 ## We only build multiprocessing related files if HAS_MP was defined -if HAS_MP MP_H_FILES = eventmp.h mp.h msgmp.h partmp.h regionmp.h semmp.h \ signalmp.h taskmp.h -endif -H_FILES = asr.h attr.h clock.h config.h dpmem.h event.h eventset.h intr.h \ +STD_H_FILES = asr.h attr.h clock.h config.h dpmem.h event.h eventset.h intr.h \ message.h modes.h options.h part.h ratemon.h region.h rtemsapi.h sem.h \ - signal.h status.h support.h tasks.h timer.h types.h $(MP_H_FILES) + signal.h status.h support.h tasks.h timer.h types.h + +if HAS_MP +H_FILES = $(STD_HFILES) $(MP_H_FILES) +else +H_FILES = $(STD_H_FILES) +endif -noinst_HEADERS = $(H_FILES) +noinst_HEADERS = $(STD_H_FILES) $(MP_H_FILES) PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/rtems/rtems \ -$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/rtems/%) +$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/rtems/%) $(PROJECT_INCLUDE)/rtems/rtems: @$(mkinstalldirs) $@ diff --git a/c/src/exec/rtems/macros/rtems/rtems/Makefile.am b/c/src/exec/rtems/macros/rtems/rtems/Makefile.am index f738254bfc..65e0594cfd 100644 --- a/c/src/exec/rtems/macros/rtems/rtems/Makefile.am +++ b/c/src/exec/rtems/macros/rtems/rtems/Makefile.am @@ -4,16 +4,17 @@ AUTOMAKE_OPTIONS = foreign 1.4 -if MACROS I_FILES = asr.inl attr.inl dpmem.inl event.inl eventset.inl message.inl \ modes.inl options.inl part.inl ratemon.inl \ region.inl sem.inl status.inl support.inl tasks.inl timer.inl noinst_HEADERS = $(I_FILES) +if MACROS + PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/rtems/rtems \ -$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/rtems/%) +$(I_FILES:%=$(PROJECT_INCLUDE)/rtems/rtems/%) $(PROJECT_INCLUDE)/rtems/rtems: @$(mkinstalldirs) $@ diff --git a/c/src/exec/rtems/optman/Makefile.am b/c/src/exec/rtems/optman/Makefile.am new file mode 100644 index 0000000000..163bd86c97 --- /dev/null +++ b/c/src/exec/rtems/optman/Makefile.am @@ -0,0 +1,40 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +C_FILES = no-dpmem.c no-event.c no-msg.c no-mp.c no-part.c no-region.c \ + no-rtmon.c no-sem.c no-signal.c no-timer.c +C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) + +SRCS = $(C_FILES) +OBJS = $(C_O_FILES) + +PGMS = $(C_FILES:%.c=$(ARCH)/%.rel) + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../automake/lib.am + +TMPINSTALL_FILES = \ +$(PROJECT_RELEASE)/lib \ +$(C_FILES:%.c=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel) + +$(PROJECT_RELEASE)/lib: + @$(mkinstalldirs) $@ + +$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel + $(INSTALL_DATA) $< $@ + +# +# (OPTIONAL) Add local stuff here using += +# + +AM_CFLAGS += $(CFLAGS_OS_V) +ASM4FLAGS += -I$(PROJECT_INCLUDE)/rtems + +all: ${ARCH} $(TMPINSTALL_FILES) + +EXTRA_DIST = $(C_FILES) + +include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/exec/rtems/optman/Makefile.in b/c/src/exec/rtems/optman/Makefile.in deleted file mode 100644 index 10bff24c12..0000000000 --- a/c/src/exec/rtems/optman/Makefile.in +++ /dev/null @@ -1,61 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = rtems/optman - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -C_FILES = no-dpmem.c no-event.c no-msg.c no-mp.c no-part.c no-region.c \ - no-rtmon.c no-sem.c no-signal.c no-timer.c - -S_FILES = - -H_FILES = - -SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) -OBJS = $(C_O_FILES) $(CC_O_FILES) - -PGMS = $(C_FILES:%.c=$(ARCH)/%.rel) - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/leaf.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -# -# (OPTIONAL) Add local stuff here using += -# - -DEFINES += -CPPFLAGS += -CFLAGS += $(CFLAGS_OS_V) - -ASM4FLAGS += -I$(PROJECT_INCLUDE)/rtems -LD_PATHS += -LD_LIBS += -LDFLAGS += - -# -# Add your list of files to delete here. The config files -# already know how to delete some stuff, so you may want -# to just run 'make clean' first to see what gets missed. -# 'make clobber' already includes 'make clean' -# - -CLEAN_ADDITIONS += -CLOBBER_ADDITIONS += - -all: ${ARCH} $(SRCS) $(OBJS) $(PGMS) - $(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/rtems/src/Makefile.am b/c/src/exec/rtems/src/Makefile.am new file mode 100644 index 0000000000..1752e16e4c --- /dev/null +++ b/c/src/exec/rtems/src/Makefile.am @@ -0,0 +1,79 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../automake/lib.am + +# We only build multiprocessing related files if HAS_MP was defined +MP_C_FILES = eventmp.c mp.c msgmp.c partmp.c regionmp.c semmp.c signalmp.c \ + taskmp.c + +TASK_C_FILES = tasks.c taskcreate.c taskdelete.c taskgetnote.c taskident.c \ + taskinitusers.c taskissuspended.c taskmode.c taskrestart.c taskresume.c \ + tasksetnote.c tasksetpriority.c taskstart.c tasksuspend.c \ + taskwakeafter.c taskwakewhen.c taskvariableadd.c taskvariabledelete.c + +RATEMON_C_FILES = ratemon.c ratemoncancel.c ratemoncreate.c ratemondelete.c \ + ratemongetstatus.c ratemonident.c ratemonperiod.c ratemontimeout.c + +INTR_C_FILES = intr.c intrbody.c intrcatch.c + +CLOCK_C_FILES = rtclock.c clockget.c clockset.c clocktick.c + +TIMER_C_FILES = rtemstimer.c timercancel.c timercreate.c timerdelete.c \ + timerfireafter.c timerfirewhen.c timerident.c timerreset.c + +MESSAGE_QUEUE_C_FILES = msg.c msgqallocate.c msgqbroadcast.c msgqcreate.c \ + msgqdelete.c msgqflush.c msgqgetnumberpending.c msgqident.c \ + msgqreceive.c msgqsend.c msgqsubmit.c msgqtranslatereturncode.c \ + msgqurgent.c + +SEMAPHORE_C_FILES = sem.c semcreate.c semdelete.c semident.c semobtain.c \ + semrelease.c semflush.c semtranslatereturncode.c + +EVENT_C_FILES = event.c eventreceive.c eventseize.c eventsend.c \ + eventsurrender.c eventtimeout.c + +SIGNAL_C_FILES = signal.c signalcatch.c signalsend.c + +REGION_C_FILES = region.c regioncreate.c regiondelete.c regionextend.c \ + regiongetsegment.c regiongetsegmentsize.c regionident.c \ + regionreturnsegment.c regionreturnsegment.c + +PARTITION_C_FILES = part.c partcreate.c partdelete.c partgetbuffer.c \ + partident.c partreturnbuffer.c + +DPMEM_C_FILES = dpmem.c dpmemcreate.c dpmemdelete.c dpmemexternal2internal.c \ + dpmemident.c dpmeminternal2external.c + +STD_C_FILES = attr.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) + +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}/%.o) + +SRCS = $(C_FILES) +OBJS = $(C_O_FILES) + +# +# Add local stuff here using += +# + +AM_CPPFLAGS += -D__RTEMS_INSIDE__ +AM_CFLAGS += $(CFLAGS_OS_V) + +all: ${ARCH} $(SRCS) ${OBJS} + +EXTRA_DIST = $(STD_C_FILES) $(MP_C_FILES) + +include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/exec/rtems/src/Makefile.in b/c/src/exec/rtems/src/Makefile.in deleted file mode 100644 index a8ff531bcf..0000000000 --- a/c/src/exec/rtems/src/Makefile.in +++ /dev/null @@ -1,95 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = rtems/src - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/lib.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -# We only build multiprocessing related files if HAS_MP was defined -MP_C_PIECES_yes_V = eventmp mp msgmp partmp regionmp semmp signalmp taskmp -MP_C_PIECES = $(MP_C_PIECES_$(HAS_MP)_V) - -TASK_C_PIECES = tasks taskcreate taskdelete taskgetnote taskident \ - taskinitusers taskissuspended taskmode taskrestart taskresume tasksetnote \ - tasksetpriority taskstart tasksuspend taskwakeafter taskwakewhen \ - taskvariableadd taskvariabledelete - -RATEMON_C_PIECES = ratemon ratemoncancel ratemoncreate ratemondelete \ - ratemongetstatus ratemonident ratemonperiod ratemontimeout - -INTR_C_PIECES = intr intrbody intrcatch - -CLOCK_C_PIECES = rtclock clockget clockset clocktick - -TIMER_C_PIECES = rtemstimer timercancel timercreate timerdelete \ - timerfireafter timerfirewhen timerident timerreset - -MESSAGE_QUEUE_C_PIECES = msg msgqallocate msgqbroadcast msgqcreate \ - msgqdelete msgqflush msgqgetnumberpending msgqident msgqreceive msgqsend \ - msgqsubmit msgqtranslatereturncode msgqurgent - -SEMAPHORE_C_PIECES = sem semcreate semdelete semident semobtain semrelease \ - semflush semtranslatereturncode - -EVENT_C_PIECES = event eventreceive eventseize eventsend eventsurrender \ - eventtimeout - -SIGNAL_C_PIECES = signal signalcatch signalsend - -REGION_C_PIECES = region regioncreate regiondelete regionextend \ - regiongetsegment regiongetsegmentsize regionident regionreturnsegment \ - regionreturnsegment - -PARTITION_C_PIECES = part partcreate partdelete partgetbuffer partident \ - partreturnbuffer - -DPMEM_C_PIECES = dpmem dpmemcreate dpmemdelete dpmemexternal2internal \ - dpmemident dpmeminternal2external - -C_PIECES = attr $(TASK_C_PIECES) $(RATEMON_C_PIECES) $(INTR_C_PIECES) \ - $(CLOCK_C_PIECES) $(TIMER_C_PIECES) $(SEMAPHORE_C_PIECES) \ - $(MESSAGE_QUEUE_C_PIECES) $(EVENT_C_PIECES) $(SIGNAL_C_PIECES) \ - $(PARTITION_C_PIECES) $(REGION_C_PIECES) $(DPMEM_C_PIECES) \ - $(MP_C_PIECES) -C_FILES = $(C_PIECES:%=%.c) -C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) - -SRCS = $(C_FILES) -OBJS = $(C_O_FILES) - -# -# Add local stuff here using += -# - -DEFINES += -D__RTEMS_INSIDE__ -CPPFLAGS += -CFLAGS += $(CFLAGS_OS_V) - -# -# Add your list of files to delete here. The config files -# already know how to delete some stuff, so you may want -# to just run 'make clean' first to see what gets missed. -# 'make clobber' already includes 'make clean' -# - -CLEAN_ADDITIONS += -CLOBBER_ADDITIONS += - -all: ${ARCH} $(SRCS) ${OBJS} - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -- cgit v1.2.3