diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-29 10:26:06 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-29 10:26:06 +0000 |
| commit | 8d7f47f4a5f1a7cd87bcd1a10f95b544d7b380a8 (patch) | |
| tree | 27452a6ba2972d4e2d87bac90cf8ad1ddc02db4b /c/src | |
| parent | 2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-8d7f47f4a5f1a7cd87bcd1a10f95b544d7b380a8.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/h8300/h8sim/ChangeLog | 7 | ||||
| -rw-r--r-- | c/src/lib/libbsp/h8300/h8sim/Makefile.am | 16 | ||||
| -rw-r--r-- | c/src/lib/libbsp/h8300/h8sim/configure.ac | 3 | ||||
| -rw-r--r-- | c/src/lib/libbsp/h8300/h8sim/include/Makefile.am | 23 |
4 files changed, 19 insertions, 30 deletions
diff --git a/c/src/lib/libbsp/h8300/h8sim/ChangeLog b/c/src/lib/libbsp/h8300/h8sim/ChangeLog index a8bcbc4e85..e357ff17b9 100644 --- a/c/src/lib/libbsp/h8300/h8sim/ChangeLog +++ b/c/src/lib/libbsp/h8300/h8sim/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-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/h8300/h8sim/Makefile.am b/c/src/lib/libbsp/h8300/h8sim/Makefile.am index b507a3af3d..e707e1ff56 100644 --- a/c/src/lib/libbsp/h8300/h8sim/Makefile.am +++ b/c/src/lib/libbsp/h8300/h8sim/Makefile.am @@ -5,13 +5,21 @@ 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 console timer wrapup -SUBDIRS = include start startup clock console wrapup +# from the individual .rel files built in other directories +#SUBDIRS = . start startup clock console timer wrapup +SUBDIRS = . start startup clock console wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs times +nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = times + +$(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/h8300/h8sim/configure.ac b/c/src/lib/libbsp/h8300/h8sim/configure.ac index 884e98c871..a1bdd87659 100644 --- a/c/src/lib/libbsp/h8300/h8sim/configure.ac +++ b/c/src/lib/libbsp/h8300/h8sim/configure.ac @@ -14,13 +14,10 @@ RTEMS_BSP_CONFIGURE RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) RTEMS_CANONICALIZE_TOOLS - - # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile start/Makefile startup/Makefile wrapup/Makefile]) diff --git a/c/src/lib/libbsp/h8300/h8sim/include/Makefile.am b/c/src/lib/libbsp/h8300/h8sim/include/Makefile.am deleted file mode 100644 index c54bb1b2bd..0000000000 --- a/c/src/lib/libbsp/h8300/h8sim/include/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.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) $< $@ - -TMPINSTALL_FILES = $(PROJECT_INCLUDE) \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - -all-local: $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/local.am |