summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/arm/armulator
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-09-29 10:12:40 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-09-29 10:12:40 +0000
commitd348010c03f9b397596a2dfab3e8e0cba8d9481c (patch)
tree7482cb5df25b215c87624a773c3131dfd3c619f8 /c/src/lib/libbsp/arm/armulator
parent2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-d348010c03f9b397596a2dfab3e8e0cba8d9481c.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/arm/armulator')
-rw-r--r--c/src/lib/libbsp/arm/armulator/ChangeLog7
-rw-r--r--c/src/lib/libbsp/arm/armulator/Makefile.am12
-rw-r--r--c/src/lib/libbsp/arm/armulator/configure.ac1
-rw-r--r--c/src/lib/libbsp/arm/armulator/include/Makefile.am22
4 files changed, 16 insertions, 26 deletions
diff --git a/c/src/lib/libbsp/arm/armulator/ChangeLog b/c/src/lib/libbsp/arm/armulator/ChangeLog
index 0413c0d032..a08b795829 100644
--- a/c/src/lib/libbsp/arm/armulator/ChangeLog
+++ b/c/src/lib/libbsp/arm/armulator/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-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* bsp_specs: Remove *lib:.
diff --git a/c/src/lib/libbsp/arm/armulator/Makefile.am b/c/src/lib/libbsp/arm/armulator/Makefile.am
index 1e26a4ca29..f2ebbf4283 100644
--- a/c/src/lib/libbsp/arm/armulator/Makefile.am
+++ b/c/src/lib/libbsp/arm/armulator/Makefile.am
@@ -5,12 +5,18 @@
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 clock console startup timer start wrapup
+# from the individual .rel files built in other directories
+SUBDIRS = . clock console startup timer start wrapup
include $(top_srcdir)/../../bsp.am
-EXTRA_DIST = bsp_specs
+nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h
+
+all-local: $(PREINSTALL_FILES)
+
+$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/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/arm/armulator/configure.ac b/c/src/lib/libbsp/arm/armulator/configure.ac
index fc6f31e65a..408bb600aa 100644
--- a/c/src/lib/libbsp/arm/armulator/configure.ac
+++ b/c/src/lib/libbsp/arm/armulator/configure.ac
@@ -33,7 +33,6 @@ RTEMS_BSPOPTS_HELP([ARM_RDP_MONITOR],
AC_CONFIG_FILES([Makefile
clock/Makefile
console/Makefile
-include/Makefile
start/Makefile
startup/Makefile
timer/Makefile
diff --git a/c/src/lib/libbsp/arm/armulator/include/Makefile.am b/c/src/lib/libbsp/arm/armulator/include/Makefile.am
deleted file mode 100644
index 7116f621b2..0000000000
--- a/c/src/lib/libbsp/arm/armulator/include/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## $Id$
-##
-
-
-include_HEADERS = bsp.h coverhd.h bspopts.h
-
-$(PROJECT_INCLUDE):
- $(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/%.h: %.h
- $(INSTALL_DATA) $< $@
-
-coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
- cp $< $@
-CLEANFILES = coverhd.h
-
-TMPINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
-all-local: $(TMPINSTALL_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am