summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/mips64orion/p4000
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-09-29 14:26:12 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-09-29 14:26:12 +0000
commitd688b2ca0cda16ff93ae6cea8b9721608f79ac77 (patch)
treec40d08191da94e4d5e6f8174fc1992fdf38aef5e /c/src/lib/libbsp/mips64orion/p4000
parent2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-d688b2ca0cda16ff93ae6cea8b9721608f79ac77.tar.bz2
2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in include/Makefile.am. Reflect changes to bsp.am. * include/Makefile.am: Remove. * configure.ac: Reflect changes above.
Diffstat (limited to 'c/src/lib/libbsp/mips64orion/p4000')
-rw-r--r--c/src/lib/libbsp/mips64orion/p4000/ChangeLog7
-rw-r--r--c/src/lib/libbsp/mips64orion/p4000/Makefile.am14
-rw-r--r--c/src/lib/libbsp/mips64orion/p4000/configure.ac3
-rw-r--r--c/src/lib/libbsp/mips64orion/p4000/include/Makefile.am18
4 files changed, 18 insertions, 24 deletions
diff --git a/c/src/lib/libbsp/mips64orion/p4000/ChangeLog b/c/src/lib/libbsp/mips64orion/p4000/ChangeLog
index dbb9f4ce12..74030979ef 100644
--- a/c/src/lib/libbsp/mips64orion/p4000/ChangeLog
+++ b/c/src/lib/libbsp/mips64orion/p4000/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Merge-in include/Makefile.am.
+ Reflect changes to bsp.am.
+ * include/Makefile.am: Remove.
+ * configure.ac: Reflect changes above.
+
2003-09-04 Joel Sherrill <joel@OARcorp.com>
* console/console.c, include/bsp.h, include/coverhd.h,
diff --git a/c/src/lib/libbsp/mips64orion/p4000/Makefile.am b/c/src/lib/libbsp/mips64orion/p4000/Makefile.am
index 2d93f819b8..22ebbab452 100644
--- a/c/src/lib/libbsp/mips64orion/p4000/Makefile.am
+++ b/c/src/lib/libbsp/mips64orion/p4000/Makefile.am
@@ -5,12 +5,20 @@
ACLOCAL_AMFLAGS = -I ../../../../aclocal
# wrapup is the one that actually builds and installs the library
-# from the individual .rel files built in other directories
-SUBDIRS = include start startup console liblnk wrapup
+# from the individual .rel files built in other directories
+SUBDIRS = . start startup console liblnk wrapup
include $(top_srcdir)/../../bsp.am
-EXTRA_DIST = bsp_specs times
+include_HEADERS += include/coverhd.h
+
+all-local: $(PREINSTALL_FILES)
+
+EXTRA_DIST = times
+
+$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h
+ $(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/mips64orion/p4000/configure.ac b/c/src/lib/libbsp/mips64orion/p4000/configure.ac
index 342e6215de..73d7131e4a 100644
--- a/c/src/lib/libbsp/mips64orion/p4000/configure.ac
+++ b/c/src/lib/libbsp/mips64orion/p4000/configure.ac
@@ -14,12 +14,9 @@ RTEMS_BSP_CONFIGURE
RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
RTEMS_CANONICALIZE_TOOLS
-
-
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
console/Makefile
-include/Makefile
liblnk/Makefile
start/Makefile
startup/Makefile
diff --git a/c/src/lib/libbsp/mips64orion/p4000/include/Makefile.am b/c/src/lib/libbsp/mips64orion/p4000/include/Makefile.am
deleted file mode 100644
index abbccfd9f7..0000000000
--- a/c/src/lib/libbsp/mips64orion/p4000/include/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-##
-## $Id$
-##
-
-
-include_HEADERS = bsp.h coverhd.h bspopts.h
-
-$(PROJECT_INCLUDE):
- $(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/%.h: %.h
- $(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
-all-local: $(TMPINSTALL_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am