diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-29 10:39:05 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-29 10:39:05 +0000 |
| commit | d1b210cd17037565daf172975aff68cdadbb9944 (patch) | |
| tree | eaac039cbeb0821d1338c51f0b5cd0424e95fd5d /c/src/lib/libbsp/bare | |
| parent | 2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-d1b210cd17037565daf172975aff68cdadbb9944.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/bare')
| -rw-r--r-- | c/src/lib/libbsp/bare/ChangeLog | 7 | ||||
| -rw-r--r-- | c/src/lib/libbsp/bare/Makefile.am | 11 | ||||
| -rw-r--r-- | c/src/lib/libbsp/bare/configure.ac | 3 | ||||
| -rw-r--r-- | c/src/lib/libbsp/bare/include/Makefile.am | 23 |
4 files changed, 16 insertions, 28 deletions
diff --git a/c/src/lib/libbsp/bare/ChangeLog b/c/src/lib/libbsp/bare/ChangeLog index 75edad1f6c..61d1104c7b 100644 --- a/c/src/lib/libbsp/bare/ChangeLog +++ b/c/src/lib/libbsp/bare/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> * include/bsp.h: URL for license changed. diff --git a/c/src/lib/libbsp/bare/Makefile.am b/c/src/lib/libbsp/bare/Makefile.am index a0b8915e26..70be864415 100644 --- a/c/src/lib/libbsp/bare/Makefile.am +++ b/c/src/lib/libbsp/bare/Makefile.am @@ -6,9 +6,14 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../bsp.am -SUBDIRS = . include +nodist_include_HEADERS += $(top_srcdir)/../shared/include/coverhd.h -EXTRA_DIST = bsp_specs build-tools do-bare-bsp-build +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = build-tools do-bare-bsp-build + +$(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/bare/configure.ac b/c/src/lib/libbsp/bare/configure.ac index 188739d5f4..72dff4bae2 100644 --- a/c/src/lib/libbsp/bare/configure.ac +++ b/c/src/lib/libbsp/bare/configure.ac @@ -19,6 +19,5 @@ AM_CONFIG_HEADER(include/bspopts.h) RTEMS_PROJECT_ROOT # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -include/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/bare/include/Makefile.am b/c/src/lib/libbsp/bare/include/Makefile.am deleted file mode 100644 index 88725917ef..0000000000 --- a/c/src/lib/libbsp/bare/include/Makefile.am +++ /dev/null @@ -1,23 +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 - $(INSTALL_DATA) $< $@ -CLEANFILES = coverhd.h - -TMPINSTALL_FILES = $(PROJECT_INCLUDE) \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - -all-local: $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../automake/local.am |