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/hppa1.1/semaphore/Makefile.am | 28 +++++++++++
 c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in | 69 --------------------------
 2 files changed, 28 insertions(+), 69 deletions(-)
 create mode 100644 c/src/lib/libcpu/hppa1.1/semaphore/Makefile.am
 delete mode 100644 c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in

(limited to 'c/src/lib/libcpu/hppa1.1/semaphore')

diff --git a/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.am b/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.am
new file mode 100644
index 0000000000..9be0beb05f
--- /dev/null
+++ b/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.am
@@ -0,0 +1,28 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+PGM = ${ARCH}/semaphore.rel
+
+## C source names
+C_FILES = semaphore.c
+
+semaphore_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../automake/lib.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+$(PGM): $(semaphore_rel_OBJECTS)
+	$(make-rel)
+
+all-local: ${ARCH} $(PGM)
+
+EXTRA_DIST = $(C_FILES)
+
+include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in b/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in
deleted file mode 100644
index 6b211b12cd..0000000000
--- a/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = semaphore
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-PGM = ${ARCH}/semaphore.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = semaphore
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_PIECES =
-H_FILES = $(H_PIECES:%=$(srcdir)/%.h)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES =
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)
-
-$(INSTALLDIRS):
-	@$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS += $(CFLAGS_OS_V)
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-# Add your list of files to delete here.
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-$(PGM): ${OBJS}
-	$(make-rel)
-
-all: ${ARCH} $(SRCS) $(PGM)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-- 
cgit v1.2.3