From 21677c0e664f84ac20ffec33209348c52d00aace Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Wed, 26 Jan 2000 14:20:08 +0000
Subject: Patch rtems-rc-20000118-0.diff from Ralf Corsepius
 <corsepiu@faw.uni-ulm.de> that converts the a29k to automake.

    This patch contains
    * An initial merger of the libcpu/a29k stuff you sent yesterday. AFAIS,
      most code inside them seems to be empty stubs. One file even contains a
      function called mips_*** which might indicate that this part might
      contain mips code or the code the initial porter used as template for
      porting. Unfortunately, I don't know anything about the a29k so I can't
      comment on the details.
    * A dummy bsp_specs to libbsp/29k/portsw
    * An update to the automake files related to the a29k.

    Note:
    * This patch is completely untested, because I don't have a toolchain
      for it.
    * The files in libcpu/a29k include bsp.h => The libbsp vs. libcpu-issue
      hits again.
---
 c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.am | 38 +++++++++++++++
 c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.in | 62 -------------------------
 2 files changed, 38 insertions(+), 62 deletions(-)
 create mode 100644 c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.am
 delete mode 100644 c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.in

(limited to 'c/src/lib/libbsp/a29k/portsw/wrapup')

diff --git a/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.am b/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.am
new file mode 100644
index 0000000000..ed2b020002
--- /dev/null
+++ b/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.am
@@ -0,0 +1,38 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+if HAS_MP
+MP_BSP_O_FILES = shmsupp
+endif
+
+BSP_FILES = startup console iic ethernet flash nvram $(MP_BSP_O_FILES)
+CPU_FILES = clock timer
+
+# bummer; have to use $foreach since % pattern subst rules only replace 1x
+OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
+    $(foreach piece, $(CPU_FILES), ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).rel)
+LIB = $(ARCH)/libbsp.a
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/lib.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+$(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a: $(LIB)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a
+
+all-local: $(ARCH) $(OBJS) $(LIB) $(TMPINSTALL_FILES)
+
+.PRECIOUS: $(LIB)
+
+include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.in b/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.in
deleted file mode 100644
index 0084e90342..0000000000
--- a/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.in
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = wrapup
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-BSP_PIECES = startup console iic ethernet flash nvram
-CPU_PIECES = clock timer
-GENERIC_PIECES =
-
-# bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
-    $(foreach piece, $(CPU_PIECES), \
-    ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).rel) $(foreach \
-    piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel)
-LIB = $(ARCH)/libbsp.a
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-$(LIB): ${OBJS}
-	$(make-library)
-
-all: ${ARCH} $(SRCS) $(LIB)
-	$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-- 
cgit v1.2.3