Changeset bb37d32 in rtems

Timestamp:

12/18/03 23:12:29 (19 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

e98048e6

Parents:

ab21e14

Message:

2003-12-18 Ralf Corsepius <corsepiu@…>

• bspstart.am: Use .$(OBJEXT) instead of .o.
• Makefile.am: Remove shmdr.

Location:

c/src/lib/libbsp

Files:

• ChangeLog (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• bspstart.am (modified) (1 diff)

c/src/lib/libbsp/ChangeLog

@@ +1 @@
+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>
 

c/src/lib/libbsp/Makefile.am

@@ -5 +5 @@
 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@
@@ -27 +21 @@
 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

c/src/lib/libbsp/bspstart.am

@@ -2 +2 @@
 # 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 $<