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/gensh4 | |
| 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/gensh4')
| -rw-r--r-- | c/src/lib/libbsp/sh/gensh4/ChangeLog | 7 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sh/gensh4/Makefile.am | 19 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sh/gensh4/configure.ac | 3 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sh/gensh4/include/Makefile.am | 16 |
4 files changed, 23 insertions, 22 deletions
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 |