From bc2f04f8a8192e148ca9832c49c1c73a445f4310 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 10 Jan 2000 14:50:45 +0000
Subject: Patch rtems-rc-20000104-13.diff from Ralf Corsepius
 <corsepiu@faw.uni-ulm.de> which does the following:

  * some cleanups, fixes, addtions to the libbsp automake transition
    patches
  * The missing Automake transistion patches all libcpu/<cpu>/<variant>/*
    previously not yet been converted to automake (libcpu/powerpc,
    libcpu/hppa1.1, libcpu/mips64orion, libcpu/sparc)

  => With this patch, libcpu/*/* is under full automake control.

  NOTES:
  * This patch is tested by building for random set of bsps affected by
    this patch, but not tested for all BSPs.
  * The parts of this patch related to libcpu/powerpc fix many small bugs
    inside of those Makefiles.
  * Have a look into libcpu/powerpc/mpc6xx/, which is in rather bad shape,
    IMO. Obviously most subdirectories seem to be build but are not included
    into libcpu.a by wrapup/Makefile. Addtionally, no actual BSP uses this
    cpu-variant subdirectory. Furthermore libcpu/powerpc/mpc6xx has a
    different directory layout than all other powerpc/<variant>/
    directories.

    Joel's note:  I agree but the issue is that there is a conflict between
    including timer or clock in libcpu/XXX/wrapup/Makefile.* and letting
    a BSP specifically decide to pick it up.  There is no clear solution
    to this at the moment.
---
 c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.in | 62 ----------------------
 1 file changed, 62 deletions(-)
 delete mode 100644 c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.in

(limited to 'c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.in')

diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.in b/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.in
deleted file mode 100644
index 47617d6230..0000000000
--- a/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.in
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = mpc6xx/wrapup
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-# PROC_SPECIFIC_O_PIECES = exceptions mmu clock
-PROC_SPECIFIC_O_PIECES = exceptions mmu
-GENERIC_PIECES =
-
-# bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(PROC_SPECIFIC_O_PIECES), \
-    ../../mpc6xx/$(piece)/$(ARCH)/*.o) $(foreach piece, $(GENERIC_PIECES), \
-    ../../mpc6xx/$(piece)/$(ARCH)/*.o)
-LIB = $(ARCH)/libcpuspec.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}
-	echo $(OBJ)
-	$(make-library)
-	cp $(LIB) ..
-
-all: ${ARCH} $(SRCS) $(LIB)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-- 
cgit v1.2.3