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/psim | |
| 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/psim')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/psim/ChangeLog | 7 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/psim/Makefile.am | 15 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/psim/configure.ac | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/psim/include/Makefile.am | 20 |
4 files changed, 17 insertions, 26 deletions
diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog index f8d98f066c..f8d24e3373 100644 --- a/c/src/lib/libbsp/powerpc/psim/ChangeLog +++ b/c/src/lib/libbsp/powerpc/psim/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/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am index f05e968e55..8292a61a0c 100644 --- a/c/src/lib/libbsp/powerpc/psim/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am @@ -5,14 +5,19 @@ 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 clock console startup shmsupp timer vectors \ - @exceptions@ wrapup \ - tools +# from the individual .rel files built in other directories +SUBDIRS = . start clock console startup shmsupp timer vectors @exceptions@ \ + wrapup tools include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs +include_HEADERS += include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +$(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/psim/configure.ac b/c/src/lib/libbsp/powerpc/psim/configure.ac index bca3f1820a..7f2f7362ba 100644 --- a/c/src/lib/libbsp/powerpc/psim/configure.ac +++ b/c/src/lib/libbsp/powerpc/psim/configure.ac @@ -37,7 +37,6 @@ RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE], AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile shmsupp/Makefile start/Makefile startup/Makefile diff --git a/c/src/lib/libbsp/powerpc/psim/include/Makefile.am b/c/src/lib/libbsp/powerpc/psim/include/Makefile.am deleted file mode 100644 index 10c1362ff3..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/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 |