From 2106fc763f04645825d0e4a01d86bdf0d6a0ea09 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 8 Dec 2002 09:04:43 +0000 Subject: 2002-12-08 Ralf Corsepius * Makefile.am: Merge-in images/Makefile.am, common/Makefile.am. * images/Makefile.am: Remove. * common/Makefile.am: Remove. * configure.ac: Reflect changes above. * main.am: Append -I $(topsrc_dir) to AM_MAKEINFOFLAGS. --- doc/ChangeLog | 8 ++++++++ doc/Makefile.am | 15 ++++++++++++++- doc/common/Makefile.am | 6 ------ doc/configure.ac | 2 -- doc/images/Makefile.am | 13 ------------- doc/main.am | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 doc/common/Makefile.am delete mode 100644 doc/images/Makefile.am (limited to 'doc') diff --git a/doc/ChangeLog b/doc/ChangeLog index 06b0821e79..dd37bf4343 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,11 @@ +2002-12-08 Ralf Corsepius + + * Makefile.am: Merge-in images/Makefile.am, common/Makefile.am. + * images/Makefile.am: Remove. + * common/Makefile.am: Remove. + * configure.ac: Reflect changes above. + * main.am: Append -I $(topsrc_dir) to AM_MAKEINFOFLAGS. + 2002-11-13 Joel Sherrill * index.html.in: Note that the Getting Started with GNAT/RTEMS diff --git a/doc/Makefile.am b/doc/Makefile.am index 3e90933fba..cb50680bac 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I ../aclocal # NOTE: The order of the directories is essential. # + tools, common and images are shared across many documents -SUBDIRS = tools common images FAQ started user bsp_howto porting develenv \ +SUBDIRS = tools FAQ started user bsp_howto porting develenv \ posix_users posix1003.1 filesystem itron3.0 networking ada_user \ started_ada rtems_gdb rgdb_specs new_chapters relnotes supplements \ gnu_docs src2html @@ -21,3 +21,16 @@ AUTOMAKE_FILES = project.am main.am EXTRA_DIST = $(AUTOMAKE_FILES) HELP.html \ rtems_header.html.in rtems_footer.html.in +EXTRA_DIST += common/cpright.texi common/setup.texi common/timemac.texi \ + common/timetbl.t common/treedef.tex common/wksheets.t common/timing.t + +html_imagesdir = $(htmldir)/images + +HTML_IMAGES = images/dir-arrow.gif images/dvi.gif images/missing-arrow.gif images/next-arrow.gif \ + images/oaronly.jpg images/pdf.gif images/pdf1.gif images/prev-arrow.gif images/ps.gif images/up-arrow.gif + +if USE_HTML +html_images_DATA = $(HTML_IMAGES) +endif + +EXTRA_DIST += $(HTML_IMAGES) diff --git a/doc/common/Makefile.am b/doc/common/Makefile.am deleted file mode 100644 index ae1c2f93a3..0000000000 --- a/doc/common/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -## $Id$ - - -EXTRA_DIST = cpright.texi setup.texi timemac.texi timetbl.t treedef.tex \ - wksheets.t timing.t - diff --git a/doc/configure.ac b/doc/configure.ac index 09cb01813f..bfcd50e17f 100644 --- a/doc/configure.ac +++ b/doc/configure.ac @@ -138,8 +138,6 @@ AC_CONFIG_SUBDIRS(tools) AC_CONFIG_FILES([Makefile rtems_support.html index.html -images/Makefile -common/Makefile FAQ/Makefile develenv/Makefile user/Makefile diff --git a/doc/images/Makefile.am b/doc/images/Makefile.am deleted file mode 100644 index b3d700461d..0000000000 --- a/doc/images/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -## $Id$ - - -html_imagesdir = $(htmldir)/images - -HTML_IMAGES = dir-arrow.gif dvi.gif missing-arrow.gif next-arrow.gif \ - oaronly.jpg pdf.gif pdf1.gif prev-arrow.gif ps.gif up-arrow.gif - -if USE_HTML -html_images_DATA = $(HTML_IMAGES) -endif - -EXTRA_DIST = $(HTML_IMAGES) diff --git a/doc/main.am b/doc/main.am index b5bec11d0d..b9b6d85aa7 100644 --- a/doc/main.am +++ b/doc/main.am @@ -1,4 +1,4 @@ -AM_MAKEINFOFLAGS = -I .. +AM_MAKEINFOFLAGS = -I .. -I $(top_srcdir) html_projectdir = $(htmldir)/$(PROJECT) -- cgit v1.2.3