From cccb7e04b02e7b81d214f846b31c81ab3f76c058 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 20 Nov 2002 14:21:25 +0000 Subject: 2002-11-20 Ralf Corsepius * 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. --- c/src/optman/ChangeLog | 9 +++++++++ c/src/optman/Makefile.am | 43 ++++++++++++++++++++++++++++++++++++++++-- c/src/optman/configure.ac | 6 ++---- c/src/optman/rel.am | 19 ------------------- c/src/optman/rtems/Makefile.am | 17 ----------------- c/src/optman/sapi/Makefile.am | 16 ---------------- 6 files changed, 52 insertions(+), 58 deletions(-) delete mode 100644 c/src/optman/rel.am delete mode 100644 c/src/optman/rtems/Makefile.am delete mode 100644 c/src/optman/sapi/Makefile.am (limited to 'c/src/optman') diff --git a/c/src/optman/ChangeLog b/c/src/optman/ChangeLog index e1223b0cd0..65b23efd64 100644 --- a/c/src/optman/ChangeLog +++ b/c/src/optman/ChangeLog @@ -1,3 +1,12 @@ +2002-11-20 Ralf Corsepius + + * 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 * rtems/Makefile.am: Reworked. diff --git a/c/src/optman/Makefile.am b/c/src/optman/Makefile.am index 4758d16a75..ee2872875b 100644 --- a/c/src/optman/Makefile.am +++ b/c/src/optman/Makefile.am @@ -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 diff --git a/c/src/optman/configure.ac b/c/src/optman/configure.ac index fb2ceea459..6be35cc71d 100644 --- a/c/src/optman/configure.ac +++ b/c/src/optman/configure.ac @@ -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 diff --git a/c/src/optman/rel.am b/c/src/optman/rel.am deleted file mode 100644 index fd47220c33..0000000000 --- a/c/src/optman/rel.am +++ /dev/null @@ -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) - diff --git a/c/src/optman/rtems/Makefile.am b/c/src/optman/rtems/Makefile.am deleted file mode 100644 index dd0e847a5a..0000000000 --- a/c/src/optman/rtems/Makefile.am +++ /dev/null @@ -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 diff --git a/c/src/optman/sapi/Makefile.am b/c/src/optman/sapi/Makefile.am deleted file mode 100644 index 87d357e6ab..0000000000 --- a/c/src/optman/sapi/Makefile.am +++ /dev/null @@ -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 -- cgit v1.2.3