diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-29 13:11:22 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-29 13:11:22 +0000 |
commit | db0b36999d611a0e4b555cde9dc3210e41d5e1bc (patch) | |
tree | 39d6ec4337bfe101d0af32632b11ea92993556ef /c/src/lib/libbsp/powerpc/helas403 | |
parent | 2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-db0b36999d611a0e4b555cde9dc3210e41d5e1bc.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/helas403')
-rw-r--r-- | c/src/lib/libbsp/powerpc/helas403/ChangeLog | 7 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/helas403/Makefile.am | 21 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/helas403/configure.ac | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/helas403/include/Makefile.am | 20 |
4 files changed, 22 insertions, 27 deletions
diff --git a/c/src/lib/libbsp/powerpc/helas403/ChangeLog b/c/src/lib/libbsp/powerpc/helas403/ChangeLog index f58f9db2e1..1955d04110 100644 --- a/c/src/lib/libbsp/powerpc/helas403/ChangeLog +++ b/c/src/lib/libbsp/powerpc/helas403/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, include/coverhd.h, startup/bspclean.c, diff --git a/c/src/lib/libbsp/powerpc/helas403/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/Makefile.am index 21ffb29a12..634d46a9f4 100644 --- a/c/src/lib/libbsp/powerpc/helas403/Makefile.am +++ b/c/src/lib/libbsp/powerpc/helas403/Makefile.am @@ -5,17 +5,26 @@ 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 flashentry startup @exceptions@ wrapup +# from the individual .rel files built in other directories +SUBDIRS = . dlentry flashentry startup @exceptions@ wrapup include $(top_srcdir)/../../bsp.am -$(PROJECT_RELEASE)/lib/bsp_specs.dl: bsp_specs.dl - $(INSTALL_DATA) $< $@ +dist_bsplib_DATA += bsp_specs.dl + +include_HEADERS += include/coverhd.h + +all-local: $(PREINSTALL_FILES) -PREINSTALL_FILES += $(PROJECT_RELEASE)/lib/bsp_specs.dl +EXTRA_DIST = times -EXTRA_DIST = bsp_specs bsp_specs.dl times +$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h + +$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs.dl: bsp_specs.dl + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs.dl include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/helas403/configure.ac b/c/src/lib/libbsp/powerpc/helas403/configure.ac index d73d6e97a7..1f5b7513df 100644 --- a/c/src/lib/libbsp/powerpc/helas403/configure.ac +++ b/c/src/lib/libbsp/powerpc/helas403/configure.ac @@ -34,7 +34,6 @@ RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE], AC_CONFIG_FILES([Makefile dlentry/Makefile flashentry/Makefile -include/Makefile startup/Makefile wrapup/Makefile]) diff --git a/c/src/lib/libbsp/powerpc/helas403/include/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/include/Makefile.am deleted file mode 100644 index 10c1362ff3..0000000000 --- a/c/src/lib/libbsp/powerpc/helas403/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 |