Patch rtems-rc-19991203-3.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>

which adds automake support to libbsp/bare.

4 files changed, 43 insertions, 82 deletions

diff --git a/c/src/lib/libbsp/bare/Makefile.am b/c/src/lib/libbsp/bare/Makefile.am
new file mode 100644
index 0000000000..d8a5abe2d3
--- /dev/null
+++ b/c/src/lib/libbsp/bare/Makefile.am
@@ -0,0 +1,24 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+include $(top_srcdir)/../bsp.am
+
+SUBDIRS = . include
+
+$(PROJECT_RELEASE)/bsp_specs: bsp_specs
+	$(INSTALL_DATA) $< $@
+
+PREINSTALL_FILES += \
+$(PROJECT_RELEASE)/bsp_specs
+
+all-local : $(PREINSTALL_FILES)
+
+EXTRA_DIST = \
+build-tools bsp_specs do-bare-bsp-build
+
+include $(top_srcdir)/../../../../../automake/subdirs.am
+include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/bare/Makefile.in b/c/src/lib/libbsp/bare/Makefile.in
deleted file mode 100644
index ca046cb705..0000000000
--- a/c/src/lib/libbsp/bare/Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = bare
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SRCS = README
-
-all: $(SRCS)
-
-# wrapup is the one that actually builds and installs the library
-#  from the individual .rel files built in other directories
-SUBDIRS = include wrapup
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libbsp/bare/include/Makefile.am b/c/src/lib/libbsp/bare/include/Makefile.am
new file mode 100644
index 0000000000..c447880f94
--- /dev/null
+++ b/c/src/lib/libbsp/bare/include/Makefile.am
@@ -0,0 +1,19 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+H_FILES = bsp.h coverhd.h
+
+noinst_HEADERS = $(H_FILES)
+
+TMPINSTALL_FILES += \
+$(PROJECT_INCLUDE) \
+$(H_FILES:%=$(PROJECT_INCLUDE)/%)
+
+$(PROJECT_INCLUDE)/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+all-local: $(TMPINSTALL_FILES)
+
+include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/bare/include/Makefile.in b/c/src/lib/libbsp/bare/include/Makefile.in
deleted file mode 100644
index 9a10ed9dec..0000000000
--- a/c/src/lib/libbsp/bare/include/Makefile.in
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = bare/include
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h
-
-#
-#  Equate files are for including from assembly preprocessed by
-#  gm4 or gasp.  No examples are provided except for those for
-#  other CPUs.  The best way to generate them would be to
-#  provide a program which generates the constants used based
-#  on the C equivalents.
-#
-
-EQ_FILES =
-
-SRCS = $(H_FILES) $(EQ_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)
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all: preinstall
-
-preinstall: $(SRCS)
-	$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status