diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-29 14:43:22 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-29 14:43:22 +0000 |
commit | d0d6a5c5b6dc2411b53b7077771ae29b5d6e2818 (patch) | |
tree | 55db08f706a59adcd3aa80616db9695ae692162b /c/src/lib/libbsp/sh/gensh1 | |
parent | 2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-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/lib/libbsp/sh/gensh1')
-rw-r--r-- | c/src/lib/libbsp/sh/gensh1/ChangeLog | 7 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh1/Makefile.am | 14 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh1/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh1/include/Makefile.am | 19 |
4 files changed, 18 insertions, 25 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 |