diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-29 12:23:14 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-29 12:23:14 +0000 |
commit | a692823e787f34cc6faf03bb604ae237afc04c02 (patch) | |
tree | ae2d6ba04bf7d5393d06d806092a42aecf91ce2c /c/src/lib/libbsp/powerpc/gen405 | |
parent | 2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-a692823e787f34cc6faf03bb604ae237afc04c02.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/powerpc/gen405')
-rw-r--r-- | c/src/lib/libbsp/powerpc/gen405/ChangeLog | 7 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/gen405/Makefile.am | 14 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/gen405/configure.ac | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/gen405/include/Makefile.am | 20 |
4 files changed, 18 insertions, 24 deletions
diff --git a/c/src/lib/libbsp/powerpc/gen405/ChangeLog b/c/src/lib/libbsp/powerpc/gen405/ChangeLog index f155cfb425..39fa051303 100644 --- a/c/src/lib/libbsp/powerpc/gen405/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen405/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/powerpc/gen405/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/Makefile.am index 698cf52127..028d24b726 100644 --- a/c/src/lib/libbsp/powerpc/gen405/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen405/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 dlentry startup @exceptions@ wrapup +# from the individual .rel files built in other directories +SUBDIRS = . dlentry startup @exceptions@ 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/powerpc/gen405/configure.ac b/c/src/lib/libbsp/powerpc/gen405/configure.ac index 2622d82972..0db7f0bba2 100644 --- a/c/src/lib/libbsp/powerpc/gen405/configure.ac +++ b/c/src/lib/libbsp/powerpc/gen405/configure.ac @@ -34,7 +34,6 @@ RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE], # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile dlentry/Makefile -include/Makefile startup/Makefile wrapup/Makefile]) diff --git a/c/src/lib/libbsp/powerpc/gen405/include/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/include/Makefile.am deleted file mode 100644 index 10c1362ff3..0000000000 --- a/c/src/lib/libbsp/powerpc/gen405/include/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h bspopts.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/force-preinstall.am -include $(top_srcdir)/../../../../automake/local.am |