diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-22 09:10:42 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-22 09:10:42 +0000 |
| commit | bcdaffdf50895c349fd3fd6a702c2ac481ba7177 (patch) | |
| tree | 233c6eda15548c65dfa574f3faecb064ba7bfc00 /doc/ada_user | |
| parent | 2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-bcdaffdf50895c349fd3fd6a702c2ac481ba7177.tar.bz2 | |
2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merger from rtems-4-6-branch.
Diffstat (limited to 'doc/ada_user')
| -rw-r--r-- | doc/ada_user/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/ada_user/Makefile.am | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/ada_user/ChangeLog b/doc/ada_user/ChangeLog index 767c309737..83dc740c59 100644 --- a/doc/ada_user/ChangeLog +++ b/doc/ada_user/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-01-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * ada_user.texi: Set @setfilename ada_user.info. diff --git a/doc/ada_user/Makefile.am b/doc/ada_user/Makefile.am index 273afdb1b7..d98b1cf131 100644 --- a/doc/ada_user/Makefile.am +++ b/doc/ada_user/Makefile.am @@ -13,7 +13,7 @@ EDITION = 1 include $(top_srcdir)/project.am include $(top_srcdir)/main.am -COMMON_FILES = $(top_builddir)/user/bsp.texi $(top_builddir)/user/clock.texi \ +COMMON_FILES += $(top_builddir)/user/bsp.texi $(top_builddir)/user/clock.texi \ $(top_builddir)/user/concepts.texi $(top_builddir)/user/datatypes.texi \ $(top_builddir)/user/conf.texi $(top_builddir)/user/dirstat.texi \ $(top_builddir)/user/dpmem.texi $(top_builddir)/user/event.texi \ @@ -26,7 +26,7 @@ COMMON_FILES = $(top_builddir)/user/bsp.texi $(top_builddir)/user/clock.texi \ $(top_builddir)/user/schedule.texi $(top_builddir)/user/sem.texi \ $(top_builddir)/user/signal.texi $(top_builddir)/user/task.texi \ $(top_builddir)/user/timer.texi $(top_builddir)/user/userext.texi \ - $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi + $(top_srcdir)/common/cpright.texi FILES = example.texi |