RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* Makefile.am: Merge-in shared/Makefile.am, shmdr/Makefile.am.
	* shared/Makefile.am: Remove.
	* shmdir/Makefile.am: Remove.
	* bsp.am: Add preinstallation dirstamp support.
This commit is contained in:
Ralf Corsepius
2003-12-03 15:27:06 +00:00
parent 900301fecb
commit 57d673c982
5 changed files with 86 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c/src/lib/libbsp/ChangeLog
View File

@@ -1,3 +1,10 @@
2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in shared/Makefile.am, shmdr/Makefile.am.
* shared/Makefile.am: Remove.
* shmdir/Makefile.am: Remove.
* bsp.am: Add preinstallation dirstamp support.
2003-12-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* shmdr/Makefile.am: Remove all-local: $(ARCH).

70
c/src/lib/libbsp/Makefile.am
View File

@@ -2,16 +2,82 @@
## $Id$
##
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am
# If we are building a "real" BSP, then we need to descend into the
# appropriate CPU specific directory. The bare BSP is a special
# case which can be built for any CPU and it resides at the same
# level as the CPUs. If we are building the bare BSP, then descend
# into that directory.
SUBDIRS = shared shmdr @libbsp_cpu_subdir@
DIST_SUBDIRS = shared shmdr @libbsp_cpu_subdir@
SUBDIRS = @libbsp_cpu_subdir@
DIST_SUBDIRS = @libbsp_cpu_subdir@
EXTRA_DIST = MERGE.PROCEDURE bsp.am
# shared
EXTRA_DIST += shared/bootcard.c shared/bspclean.c shared/bsplibc.c \
shared/bsppost.c shared/console-polled.c shared/console.c \
shared/gnatinstallhandler.c shared/main.c shared/sbrk.c shared/tod.c \
shared/tod.h
EXTRA_DIST += shared/vmeUniverse/vmeUniverse.c \
shared/vmeUniverse/vmeUniverse.h
EXTRA_DIST += shared/include/coverhd.h
EXTRA_DIST += shared/gdbstub/rtems-stub-glue.c
# shmdr
shmdr_C_FILES = shmdr/addlq.c shmdr/cnvpkt.c shmdr/getlq.c shmdr/dump.c \
shmdr/fatal.c shmdr/getpkt.c shmdr/init.c shmdr/initlq.c shmdr/intr.c \
shmdr/mpisr.c shmdr/poll.c shmdr/receive.c shmdr/retpkt.c shmdr/send.c \
shmdr/setckvec.c
shmdr_OBJS = $(shmdr_C_FILES:shmdr/%.c=shmdr/$(ARCH)/%.$(OBJEXT))
# the .rel file built here will be put into libbsp.a by
# ../$(RTEMS_BSP_FAMILY)/wrapup/Makefile
shmdr/$(ARCH)/$(dirstamp):
@$(mkinstalldirs) shmdr/$(ARCH)
@: > shmdr/$(ARCH)/$(dirstamp)
shmdr/$(ARCH)/%.$(OBJEXT): shmdr/%.c shmdr/$(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
shmdr/$(ARCH)/shmdr.rel: $(shmdr_OBJS)
$(make-rel)
$(PROJECT_RELEASE)/lib/shmdr$(LIB_VARIANT).rel: shmdr/$(ARCH)/shmdr.rel
$(INSTALL_DATA) $< $@
if HAS_MP
include_HEADERS = shmdir/shm_driver.h shmdir/mpci.h
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/shmdr$(LIB_VARIANT).rel
all-local: $(PREINSTALL_FILES) shmdr/$(ARCH)/shmdr.rel $(TMPINSTALL_FILES)
endif
.PRECIOUS: shmdr/$(ARCH)/shmdr.rel
EXTRA_DIST += shmdr/README shmdr/addlq.c shmdr/cnvpkt.c shmdr/dump.c \
shmdr/fatal.c shmdr/getlq.c shmdr/getpkt.c shmdr/init.c shmdr/initlq.c \
shmdr/intr.c shmdr/mpisr.c shmdr/poll.c shmdr/receive.c shmdr/retpkt.c \
shmdr/send.c shmdr/setckvec.c
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/$(dirstamp):
@$(mkinstalldirs) $(PROJECT_INCLUDE)
@: > $(PROJECT_INCLUDE)/$(dirstamp)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
if HAS_MP
$(PROJECT_INCLUDE)/shm_driver.h: shmdir/shm_driver.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/shm_driver.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/shm_driver.h
$(PROJECT_INCLUDE)/mpci.h: shmdir/mpci.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpci.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpci.h
endif
include $(top_srcdir)/automake/subdirs.am
include $(top_srcdir)/automake/local.am

20
c/src/lib/libbsp/bsp.am
View File

@@ -7,22 +7,24 @@ dist_bsplib_DATA = bsp_specs
include_HEADERS = include/bsp.h
nodist_include_HEADERS = include/bspopts.h
$(PROJECT_ROOT)/@RTEMS_BSP@/lib:
@$(mkinstalldirs) $@
PREINSTALL_FILES = $(PROJECT_ROOT)/@RTEMS_BSP@/lib
$(PROJECT_ROOT)/@RTEMS_BSP@/lib/$(dirstamp):
@$(mkinstalldirs) $(PROJECT_ROOT)/@RTEMS_BSP@/lib
@: > $(PROJECT_ROOT)/@RTEMS_BSP@/lib/$(dirstamp)
PREINSTALL_FILES = $(PROJECT_ROOT)/@RTEMS_BSP@/lib/$(dirstamp)
$(PROJECT_INCLUDE):
@$(mkinstalldirs) $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)
$(PROJECT_INCLUDE)/$(dirstamp):
@$(mkinstalldirs) $(PROJECT_INCLUDE)
@: > $(PROJECT_INCLUDE)/$(dirstamp)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: bsp_specs
$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: bsp_specs $(PROJECT_ROOT)/@RTEMS_BSP@/lib/$(dirstamp)
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs
$(PROJECT_INCLUDE)/bsp.h: include/bsp.h
$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h
$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h

14
c/src/lib/libbsp/shared/Makefile.am
View File

@@ -1,14 +0,0 @@
##
## $Id$
##
EXTRA_DIST = bootcard.c bspclean.c bsplibc.c bsppost.c console-polled.c \
console.c gnatinstallhandler.c main.c sbrk.c tod.c tod.h
EXTRA_DIST += vmeUniverse/vmeUniverse.c vmeUniverse/vmeUniverse.h
EXTRA_DIST += include/coverhd.h
EXTRA_DIST += gdbstub/rtems-stub-glue.c
include $(top_srcdir)/automake/local.am

53
c/src/lib/libbsp/shmdr/Makefile.am
View File

@@ -1,53 +0,0 @@
##
## $Id$
##
PGM = $(ARCH)/shmdr.rel
C_FILES = addlq.c cnvpkt.c getlq.c dump.c fatal.c getpkt.c init.c initlq.c \
intr.c mpisr.c poll.c receive.c retpkt.c send.c setckvec.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am
#
# (OPTIONAL) Add local stuff here using +=
#
$(PGM): $(OBJS)
$(make-rel)
$(PROJECT_RELEASE)/lib/shmdr$(LIB_VARIANT).rel: $(ARCH)/shmdr.rel
$(INSTALL_DATA) $< $@
# the .rel file built here will be put into libbsp.a by
# ../$(RTEMS_BSP_FAMILY)/wrapup/Makefile
$(PROJECT_INCLUDE):
$(mkinstalldirs) $@
if HAS_MP
include_HEADERS = shm_driver.h mpci.h
endif
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES = $(PROJECT_INCLUDE)
PREINSTALL_FILES += $(include_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/shmdr$(LIB_VARIANT).rel
if HAS_MP
all-local: $(PREINSTALL_FILES) $(PGM) $(TMPINSTALL_FILES)
endif
.PRECIOUS: $(PGM)
EXTRA_DIST = README addlq.c cnvpkt.c dump.c fatal.c getlq.c getpkt.c init.c \
initlq.c intr.c mpisr.c poll.c receive.c retpkt.c send.c \
setckvec.c
include $(top_srcdir)/automake/local.am