2002-11-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* Makefile.am: Merge-in rtems/Makefile.am and sapi/Makefile.am.
	* sapi/Makefile.am: Removed.
	* rtems/Makefile.am: Removed.
	* rel.am: Removed.
	* configure.ac: Add RTEMS_BSP_CHECK_CACHE.
	Reflect changes above.
This commit is contained in:
Ralf Corsepius
2002-11-20 14:21:25 +00:00
parent b6cc40a1e7
commit cccb7e04b0
6 changed files with 52 additions and 58 deletions

View File

@@ -1,3 +1,12 @@
2002-11-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in rtems/Makefile.am and sapi/Makefile.am.
* sapi/Makefile.am: Removed.
* rtems/Makefile.am: Removed.
* rel.am: Removed.
* configure.ac: Add RTEMS_BSP_CHECK_CACHE.
Reflect changes above.
2002-11-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* rtems/Makefile.am: Reworked.

View File

@@ -4,7 +4,46 @@
ACLOCAL_AMFLAGS = -I ../../../aclocal
SUBDIRS = rtems sapi
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
C_FILES = sapi/no-ext.c sapi/no-io.c
C_O_FILES = $(C_FILES:sapi/%.c=$(ARCH)/%.$(OBJEXT))
C_FILES += rtems/no-dpmem.c rtems/no-event.c rtems/no-msg.c rtems/no-mp.c \
rtems/no-part.c rtems/no-region.c \
rtems/no-rtmon.c rtems/no-sem.c rtems/no-signal.c rtems/no-timer.c
C_O_FILES += $(C_FILES:rtems/%.c=${ARCH}/%.$(OBJEXT))
PGMS = $(C_FILES:rtems/%.c=$(ARCH)/%$(LIB_VARIANT).rel)
PGMS += $(C_FILES:sapi/%.c=$(ARCH)/%$(LIB_VARIANT).rel)
${ARCH}/%.o: sapi/%.c
test -d $(ARCH) || mkdir $(ARCH)
${COMPILE} -o $@ -c $<
${ARCH}/%.o: rtems/%.c
test -d $(ARCH) || mkdir $(ARCH)
${COMPILE} -o $@ -c $<
# Make foo.rel from foo.o
${ARCH}/%$(LIB_VARIANT).rel: ${ARCH}/%.o
test -d $(ARCH) || mkdir $(ARCH)
${make-rel}
bsplib_DATA = $(PGMS)
TMPINSTALL_FILES += \
$(PGMS:${ARCH}/%$(LIB_VARIANT).rel=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel)
$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%$(LIB_VARIANT).rel
$(INSTALL_DATA) $< $@
all-local: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
.PRECIOUS: $(PGMS) $(C_O_FILES)
EXTRA_DIST = $(C_FILES)
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am

View File

@@ -14,6 +14,7 @@ AM_INIT_AUTOMAKE([no-define foreign 1.6])
AM_MAINTAINER_MODE
RTEMS_ENV_RTEMSBSP
RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
RTEMS_CHECK_CPU
RTEMS_CANONICAL_HOST
@@ -24,8 +25,5 @@ RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
RTEMS_CANONICALIZE_TOOLS
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
rtems/Makefile
sapi/Makefile
])
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

View File

@@ -1,19 +0,0 @@
# Make foo.rel from foo.o
${ARCH}/%$(LIB_VARIANT).rel: ${ARCH}/%.o
test -d $(ARCH) || mkdir $(ARCH)
${make-rel}
bsplib_DATA = $(PGMS)
TMPINSTALL_FILES += \
$(C_FILES:%.c=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel)
$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%$(LIB_VARIANT).rel
$(INSTALL_DATA) $< $@
all-local: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
.PRECIOUS: $(PGMS)
EXTRA_DIST = $(C_FILES)

View File

@@ -1,17 +0,0 @@
##
## $Id$
##
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}/%.$(OBJEXT))
PGMS = $(C_FILES:%.c=$(ARCH)/%$(LIB_VARIANT).rel)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
include ../rel.am
include $(top_srcdir)/../../../automake/local.am

View File

@@ -1,16 +0,0 @@
##
## $Id$
##
C_FILES = no-ext.c no-io.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
PGMS = $(C_FILES:%.c=$(ARCH)/%$(LIB_VARIANT).rel)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
include ../rel.am
include $(top_srcdir)/../../../automake/local.am