From bb37d3263de9233b480d847ccdc076c9506f0df7 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Thu, 18 Dec 2003 23:12:29 +0000
Subject: 2003-12-18	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* bspstart.am: Use .$(OBJEXT) instead of .o.
	* Makefile.am: Remove shmdr.
---
 c/src/lib/libbsp/ChangeLog   |  5 ++++
 c/src/lib/libbsp/Makefile.am | 60 --------------------------------------------
 c/src/lib/libbsp/bspstart.am |  4 +--
 3 files changed, 7 insertions(+), 62 deletions(-)

(limited to 'c')

diff --git a/c/src/lib/libbsp/ChangeLog b/c/src/lib/libbsp/ChangeLog
index 8734d7c513..04693a7b2b 100644
--- a/c/src/lib/libbsp/ChangeLog
+++ b/c/src/lib/libbsp/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-18	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* bspstart.am: Use .$(OBJEXT) instead of .o.
+	* Makefile.am: Remove shmdr.
+
 2003-12-17	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* bsp.am: Use $(mkdir_p) instead of $(mkinstalldirs).
diff --git a/c/src/lib/libbsp/Makefile.am b/c/src/lib/libbsp/Makefile.am
index a5bb8cdada..c8a40465fe 100644
--- a/c/src/lib/libbsp/Makefile.am
+++ b/c/src/lib/libbsp/Makefile.am
@@ -5,12 +5,6 @@
 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 = @libbsp_cpu_subdir@
 DIST_SUBDIRS = @libbsp_cpu_subdir@
 
@@ -26,59 +20,5 @@ EXTRA_DIST += shared/vmeUniverse/vmeUniverse.c \
 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):
-	@$(mkdir_p) shmdr/$(ARCH)
-	@: > shmdr/$(ARCH)/$(dirstamp)
-shmdr/$(ARCH)/%.$(OBJEXT): shmdr/%.c shmdr/$(ARCH)/$(dirstamp)
-	${COMPILE} -o $@ -c $<
-shmdr/$(ARCH)/shmdr$(LIB_VARIANT).rel: $(shmdr_OBJS)
-	$(make-rel)
-
-if HAS_MP
-include_HEADERS = shmdr/shm_driver.h shmdr/mpci.h
-
-all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
-project_lib_DATA = shmdr/$(ARCH)/shmdr$(LIB_VARIANT).rel
-endif
-
-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):
-	@$(mkdir_p) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(mkdir_p) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-
-if HAS_MP
-$(PROJECT_INCLUDE)/shm_driver.h: shmdr/shm_driver.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/shm_driver.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/shm_driver.h
-
-$(PROJECT_INCLUDE)/mpci.h: shmdr/mpci.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpci.h
-
-$(PROJECT_LIB)/shmdr$(LIB_VARIANT).rel: shmdr/$(ARCH)/shmdr$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/shmdr$(LIB_VARIANT).rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/shmdr$(LIB_VARIANT).rel
-endif
-
 include $(top_srcdir)/automake/subdirs.am
 include $(top_srcdir)/automake/local.am
diff --git a/c/src/lib/libbsp/bspstart.am b/c/src/lib/libbsp/bspstart.am
index 2920d0a2d8..9a58fcd3e2 100644
--- a/c/src/lib/libbsp/bspstart.am
+++ b/c/src/lib/libbsp/bspstart.am
@@ -1,8 +1,8 @@
 #
 # HACK: Compilation rules for building variant'ed object files.
 #
-${ARCH}/%$(LIB_VARIANT).o: %.c $(ARCH)/$(dirstamp)
+$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): %.c $(ARCH)/$(dirstamp)
 	${COMPILE} -o $@ -c $<
-${ARCH}/%$(LIB_VARIANT).o: %.S $(ARCH)/$(dirstamp)
+$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): %.S $(ARCH)/$(dirstamp)
 	${CCASCOMPILE} -DASM -o $@ -c $<
 
-- 
cgit v1.2.3