summaryrefslogtreecommitdiffstats
path: root/c/src
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-09-29 14:43:22 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-09-29 14:43:22 +0000
commitd0d6a5c5b6dc2411b53b7077771ae29b5d6e2818 (patch)
tree55db08f706a59adcd3aa80616db9695ae692162b /c/src
parent2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-d0d6a5c5b6dc2411b53b7077771ae29b5d6e2818.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')
-rw-r--r--c/src/lib/libbsp/sh/gensh1/ChangeLog7
-rw-r--r--c/src/lib/libbsp/sh/gensh1/Makefile.am14
-rw-r--r--c/src/lib/libbsp/sh/gensh1/configure.ac3
-rw-r--r--c/src/lib/libbsp/sh/gensh1/include/Makefile.am19
-rw-r--r--c/src/lib/libbsp/sh/gensh2/ChangeLog7
-rw-r--r--c/src/lib/libbsp/sh/gensh2/Makefile.am12
-rw-r--r--c/src/lib/libbsp/sh/gensh2/configure.ac3
-rw-r--r--c/src/lib/libbsp/sh/gensh2/include/Makefile.am15
-rw-r--r--c/src/lib/libbsp/sh/gensh4/ChangeLog7
-rw-r--r--c/src/lib/libbsp/sh/gensh4/Makefile.am19
-rw-r--r--c/src/lib/libbsp/sh/gensh4/configure.ac3
-rw-r--r--c/src/lib/libbsp/sh/gensh4/include/Makefile.am16
-rw-r--r--c/src/lib/libbsp/sh/shsim/ChangeLog7
-rw-r--r--c/src/lib/libbsp/sh/shsim/Makefile.am17
-rw-r--r--c/src/lib/libbsp/sh/shsim/configure.ac3
-rw-r--r--c/src/lib/libbsp/sh/shsim/include/Makefile.am24
-rw-r--r--c/src/lib/libbsp/sh/simsh4/ChangeLog7
-rw-r--r--c/src/lib/libbsp/sh/simsh4/Makefile.am22
-rw-r--r--c/src/lib/libbsp/sh/simsh4/configure.ac3
-rw-r--r--c/src/lib/libbsp/sh/simsh4/include/Makefile.am15
20 files changed, 104 insertions, 119 deletions
diff --git a/c/src/lib/libbsp/sh/gensh1/ChangeLog b/c/src/lib/libbsp/sh/gensh1/ChangeLog
index d76c2c2539..26f6a4ebae 100644
--- a/c/src/lib/libbsp/sh/gensh1/ChangeLog
+++ b/c/src/lib/libbsp/sh/gensh1/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-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* bsp_specs: Remove *lib:.
diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am
index 0e174428bb..0d7bbc2ef9 100644
--- a/c/src/lib/libbsp/sh/gensh1/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh1/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 scitab console wrapup
+# from the individual .rel files built in other directories
+SUBDIRS = . start startup scitab console 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/sh/gensh1/configure.ac b/c/src/lib/libbsp/sh/gensh1/configure.ac
index 0bc70792dd..ece4fbb0c8 100644
--- a/c/src/lib/libbsp/sh/gensh1/configure.ac
+++ b/c/src/lib/libbsp/sh/gensh1/configure.ac
@@ -14,7 +14,6 @@ RTEMS_BSP_CONFIGURE
RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
RTEMS_CANONICALIZE_TOOLS
-
## bsp-specific options
RTEMS_BSPOPTS_SET([CPU_CLOCK_RATE_HZ],[*],[20000000])
RTEMS_BSPOPTS_HELP([CPU_CLOCK_RATE_HZ],[cpu clock rate in HZ])
@@ -22,11 +21,9 @@ RTEMS_BSPOPTS_HELP([CPU_CLOCK_RATE_HZ],[cpu clock rate in HZ])
## Used in scitab/Makefile.am
AC_SUBST(CPU_CLOCK_RATE_HZ)
-
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
console/Makefile
-include/Makefile
scitab/Makefile
start/Makefile
startup/Makefile
diff --git a/c/src/lib/libbsp/sh/gensh1/include/Makefile.am b/c/src/lib/libbsp/sh/gensh1/include/Makefile.am
deleted file mode 100644
index d4a88811e9..0000000000
--- a/c/src/lib/libbsp/sh/gensh1/include/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-##
-## $Id$
-##
-
-
-include_HEADERS = bsp.h bspopts.h coverhd.h
-
-$(PROJECT_INCLUDE):
- $(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/%.h: %.h
- $(INSTALL_DATA) $< $@
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE) \
- $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
-all-local: $(PREINSTALL_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sh/gensh2/ChangeLog b/c/src/lib/libbsp/sh/gensh2/ChangeLog
index 2851085658..d73131b8f4 100644
--- a/c/src/lib/libbsp/sh/gensh2/ChangeLog
+++ b/c/src/lib/libbsp/sh/gensh2/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-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* bsp_specs: Remove *lib:.
diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am
index 135a458045..d0098ca295 100644
--- a/c/src/lib/libbsp/sh/gensh2/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh2/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 start startup scitab console wrapup
+## from the individual .rel files built in other directories
+SUBDIRS = . start startup scitab console wrapup
include $(top_srcdir)/../../bsp.am
-EXTRA_DIST = bsp_specs
+include_HEADERS += include/coverhd.h
+
+all-local: $(PREINSTALL_FILES)
+
+$(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/sh/gensh2/configure.ac b/c/src/lib/libbsp/sh/gensh2/configure.ac
index 4c2fcbce44..de9794f46f 100644
--- a/c/src/lib/libbsp/sh/gensh2/configure.ac
+++ b/c/src/lib/libbsp/sh/gensh2/configure.ac
@@ -14,7 +14,6 @@ RTEMS_BSP_CONFIGURE
RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
RTEMS_CANONICALIZE_TOOLS
-
## bsp-specific options
RTEMS_BSPOPTS_SET([CPU_CLOCK_RATE_HZ],[*],[29491200])
RTEMS_BSPOPTS_HELP([CPU_CLOCK_RATE_HZ],[cpu clock rate in HZ])
@@ -31,11 +30,9 @@ RTEMS_BSPOPTS_SET([STANDALONE_EVB],[*],[])
RTEMS_BSPOPTS_HELP([STANDALONE_EVB],
[If defined, compiles code to jump-start from FLASH, without a monitor])
-
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
console/Makefile
-include/Makefile
scitab/Makefile
start/Makefile
startup/Makefile
diff --git a/c/src/lib/libbsp/sh/gensh2/include/Makefile.am b/c/src/lib/libbsp/sh/gensh2/include/Makefile.am
deleted file mode 100644
index 03932adb1a..0000000000
--- a/c/src/lib/libbsp/sh/gensh2/include/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-##
-## $Id$
-##
-
-
-include_HEADERS = bsp.h bspopts.h coverhd.h
-
-$(PROJECT_INCLUDE)/%.h: %.h
- $(INSTALL_DATA) $< $@
-
-PREINSTALL_FILES = $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
-all-local: $(PREINSTALL_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sh/gensh4/ChangeLog b/c/src/lib/libbsp/sh/gensh4/ChangeLog
index cbb59d437c..62a06a0558 100644
--- a/c/src/lib/libbsp/sh/gensh4/ChangeLog
+++ b/c/src/lib/libbsp/sh/gensh4/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-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* bsp_specs: Remove *lib:.
diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am
index 9d2ee17ae8..3f8e4d22bd 100644
--- a/c/src/lib/libbsp/sh/gensh4/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am
@@ -5,12 +5,25 @@
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 hw_init wrapup
+## from the individual .rel files built in other directories
+SUBDIRS = . start startup console hw_init wrapup
include $(top_srcdir)/../../bsp.am
-EXTRA_DIST = bsp_specs times
+include_HEADERS += include/sdram.h
+include_HEADERS += include/coverhd.h
+
+all-local: $(PREINSTALL_FILES)
+
+EXTRA_DIST = times
+
+$(PROJECT_INCLUDE)/sdram.h: include/sdram.h
+ $(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/sdram.h
+
+$(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/sh/gensh4/configure.ac b/c/src/lib/libbsp/sh/gensh4/configure.ac
index 9daf7e4004..0e148607cf 100644
--- a/c/src/lib/libbsp/sh/gensh4/configure.ac
+++ b/c/src/lib/libbsp/sh/gensh4/configure.ac
@@ -14,7 +14,6 @@ RTEMS_BSP_CONFIGURE
RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
RTEMS_CANONICALIZE_TOOLS
-
## bsp-specific options
CPU_CLOCK_RATE_HZ=${CPU_CLOCK_RATE_HZ-96000000}
AC_DEFINE_UNQUOTED(
@@ -32,10 +31,8 @@ AC_DEFINE_UNQUOTED(
[$START_HW_INIT],
[Whether to call early_hw_init from start.S])
-
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
-include/Makefile
start/Makefile
startup/Makefile
hw_init/Makefile
diff --git a/c/src/lib/libbsp/sh/gensh4/include/Makefile.am b/c/src/lib/libbsp/sh/gensh4/include/Makefile.am
deleted file mode 100644
index 6a2b7764d5..0000000000
--- a/c/src/lib/libbsp/sh/gensh4/include/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-##
-## $Id$
-##
-
-
-include_HEADERS = bsp.h bspopts.h coverhd.h sdram.h
-
-$(PROJECT_INCLUDE)/%.h: %.h
- $(INSTALL_DATA) $< $@
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE) \
- $(include_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
-
-all-local: $(PREINSTALL_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sh/shsim/ChangeLog b/c/src/lib/libbsp/sh/shsim/ChangeLog
index 5aa2e1da51..8c2b24dc94 100644
--- a/c/src/lib/libbsp/sh/shsim/ChangeLog
+++ b/c/src/lib/libbsp/sh/shsim/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-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* bsp_specs: Remove *lib:.
diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am
index 19a75d57a2..5fbc89b603 100644
--- a/c/src/lib/libbsp/sh/shsim/Makefile.am
+++ b/c/src/lib/libbsp/sh/shsim/Makefile.am
@@ -5,12 +5,23 @@
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 clock scitab gdbsci console wrapup
+# from the individual .rel files built in other directories
+SUBDIRS = . start startup clock scitab gdbsci console wrapup
include $(top_srcdir)/../../bsp.am
-EXTRA_DIST = bsp_specs
+include_HEADERS += include/gdbsci.h
+nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h
+
+all-local: $(PREINSTALL_FILES)
+
+$(PROJECT_INCLUDE)/gdbsci.h: include/gdbsci.h
+ $(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/gdbsci.h
+
+$(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/sh/shsim/configure.ac b/c/src/lib/libbsp/sh/shsim/configure.ac
index 03a6b02245..56c89d2227 100644
--- a/c/src/lib/libbsp/sh/shsim/configure.ac
+++ b/c/src/lib/libbsp/sh/shsim/configure.ac
@@ -14,7 +14,6 @@ RTEMS_BSP_CONFIGURE
RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
RTEMS_CANONICALIZE_TOOLS
-
## bsp-specific options
RTEMS_BSP_ARG_ENABLE([console],
[ --enable-console=[[null|gdbsci1]]],[
@@ -64,12 +63,10 @@ RTEMS_BSPOPTS_HELP([CPU_CLOCK_RATE_HZ],
## Used in scitab/Makefile.am
AC_SUBST(CPU_CLOCK_RATE_HZ)
-
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
clock/Makefile
console/Makefile
-include/Makefile
scitab/Makefile
gdbsci/Makefile
start/Makefile
diff --git a/c/src/lib/libbsp/sh/shsim/include/Makefile.am b/c/src/lib/libbsp/sh/shsim/include/Makefile.am
deleted file mode 100644
index 93c334e7b0..0000000000
--- a/c/src/lib/libbsp/sh/shsim/include/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-##
-## $Id$
-##
-
-
-include_HEADERS = bsp.h gdbsci.h coverhd.h bspopts.h
-
-coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
- cp $< $@
-
-CLEANFILES = coverhd.h
-
-$(PROJECT_INCLUDE):
- $(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/%.h: %.h
- $(INSTALL_DATA) $< $@
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE) \
- $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
-all-local: $(TMPINSTALL_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sh/simsh4/ChangeLog b/c/src/lib/libbsp/sh/simsh4/ChangeLog
index fb8fc25724..d81a3117f7 100644
--- a/c/src/lib/libbsp/sh/simsh4/ChangeLog
+++ b/c/src/lib/libbsp/sh/simsh4/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>
* clock/ckinit.c, console/console.c, include/bsp.h, include/coverhd.h,
diff --git a/c/src/lib/libbsp/sh/simsh4/Makefile.am b/c/src/lib/libbsp/sh/simsh4/Makefile.am
index 0318484218..e12322462e 100644
--- a/c/src/lib/libbsp/sh/simsh4/Makefile.am
+++ b/c/src/lib/libbsp/sh/simsh4/Makefile.am
@@ -5,8 +5,8 @@
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 clock timer wrapup
+## from the individual .rel files built in other directories
+SUBDIRS = . start startup console clock timer wrapup
SUBDIRS += tools
# FIXME: This directory is missing
@@ -14,7 +14,23 @@ SUBDIRS += tools
include $(top_srcdir)/../../bsp.am
-EXTRA_DIST = bsp_specs
+include_HEADERS += include/syscall.h
+include_HEADERS += include/ramdisk.h
+include_HEADERS += include/coverhd.h
+
+all-local: $(PREINSTALL_FILES)
+
+$(PROJECT_INCLUDE)/syscall.h: include/syscall.h
+ $(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/syscall.h
+
+$(PROJECT_INCLUDE)/ramdisk.h: include/ramdisk.h
+ $(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/ramdisk.h
+
+$(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/sh/simsh4/configure.ac b/c/src/lib/libbsp/sh/simsh4/configure.ac
index 8d7b1ca3af..a58a088409 100644
--- a/c/src/lib/libbsp/sh/simsh4/configure.ac
+++ b/c/src/lib/libbsp/sh/simsh4/configure.ac
@@ -33,12 +33,9 @@ AC_DEFINE_UNQUOTED(
[$START_HW_INIT],
[Whether to call early_hw_init from start.S])
-
-
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
console/Makefile
-include/Makefile
start/Makefile
startup/Makefile
clock/Makefile
diff --git a/c/src/lib/libbsp/sh/simsh4/include/Makefile.am b/c/src/lib/libbsp/sh/simsh4/include/Makefile.am
deleted file mode 100644
index 5363083e88..0000000000
--- a/c/src/lib/libbsp/sh/simsh4/include/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-##
-## $Id$
-##
-
-
-include_HEADERS = bsp.h bspopts.h coverhd.h syscall.h ramdisk.h
-
-$(PROJECT_INCLUDE)/%.h: %.h
- $(INSTALL_DATA) $< $@
-
-PREINSTALL_FILES = $(include_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
-
-all-local: $(PREINSTALL_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am