summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-01-22 05:39:11 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-01-22 05:39:11 +0000
commit4b1f9242ae2fb343ee2c91a5ced93cb03ce3b929 (patch)
treeef5499bfea81a36df73d2a8eeaf0677b772e0977
parent4f35b06f581c6b5f55f83dced5a61cf548921c7e (diff)
downloadrtems-4b1f9242ae2fb343ee2c91a5ced93cb03ce3b929.tar.bz2
2003-01-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Require autoconf-2.57. Require automake-1.7.2. Remove started/pictures/Makefile. * started/Makefile.am: Merge-in pictures/Makefile.am * started/pictures/Makefile.am: Remove.
-rw-r--r--doc/ChangeLog8
-rw-r--r--doc/configure.ac5
-rw-r--r--doc/started/Makefile.am17
-rw-r--r--doc/started/pictures/Makefile.am20
4 files changed, 25 insertions, 25 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index dd37bf4343..91b574dbf9 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,11 @@
+2003-01-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac: Require autoconf-2.57.
+ Require automake-1.7.2.
+ Remove started/pictures/Makefile.
+ * started/Makefile.am: Merge-in pictures/Makefile.am
+ * started/pictures/Makefile.am: Remove.
+
2002-12-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in images/Makefile.am, common/Makefile.am.
diff --git a/doc/configure.ac b/doc/configure.ac
index bfcd50e17f..94193d79af 100644
--- a/doc/configure.ac
+++ b/doc/configure.ac
@@ -1,13 +1,13 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.52)
+AC_PREREQ(2.57)
AC_INIT([rtems-doc],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
AC_CONFIG_SRCDIR([project.am])
RTEMS_TOP([..])
AC_CONFIG_AUX_DIR([..])
-AM_INIT_AUTOMAKE([no-define foreign 1.6])
+AM_INIT_AUTOMAKE([no-define foreign 1.7.2])
AM_MAINTAINER_MODE
AC_ARG_ENABLE(html,
@@ -143,7 +143,6 @@ develenv/Makefile
user/Makefile
bsp_howto/Makefile
started/Makefile
-started/pictures/Makefile
porting/Makefile
networking/Makefile
posix_users/Makefile
diff --git a/doc/started/Makefile.am b/doc/started/Makefile.am
index 5bc64aeb68..f22b0bcdd2 100644
--- a/doc/started/Makefile.am
+++ b/doc/started/Makefile.am
@@ -10,8 +10,6 @@
PROJECT = started
EDITION = 1
-SUBDIRS = pictures
-
include $(top_srcdir)/project.am
include $(top_srcdir)/main.am
@@ -68,3 +66,18 @@ $(srcdir)/nt.texi: nt.t tversions.texi
EXTRA_DIST = binaries.t buildc.t buildrt.t intro.t nextstep.t nt.t \
require.t sample.t
+
+
+if USE_HTML
+html_project_DATA += pictures/sfile12c.jpg pictures/bit_c.jpg
+endif
+
+PICTURES = pictures/bit_ada.jpg pictures/bit_ada.vsd pictures/bit_c.jpg pictures/bit_c.vsd pictures/scfile10.jpg \
+ pictures/scfile10.vsd pictures/scfile11.jpg pictures/scfile11.vsd pictures/scfile12.jpg pictures/scfile12.vsd \
+ pictures/scfile13.jpg pictures/scfile13.vsd pictures/scsfile1.jpg pictures/scsfile1.vsd pictures/scsfile2.jpg \
+ pictures/scsfile2.vsd pictures/scsfile3.jpg pictures/scsfile3.vsd pictures/scsfile4.jpg pictures/scsfile4.vsd \
+ pictures/scsfile5.jpg pictures/scsfile5.vsd pictures/scsfile6.jpg pictures/scsfile6.vsd pictures/scsfile7.jpg \
+ pictures/scsfile7.vsd pictures/scsfile8.jpg pictures/scsfile8.vsd pictures/scsfile9.jpg pictures/scsfile9.vsd \
+ pictures/sfile12c.jpg pictures/sfile12c.vsd
+
+EXTRA_DIST += $(PICTURES)
diff --git a/doc/started/pictures/Makefile.am b/doc/started/pictures/Makefile.am
deleted file mode 100644
index 6d4ba01795..0000000000
--- a/doc/started/pictures/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-## $Id$
-
-
-PROJECT = started
-
-html_projectdir = $(htmldir)/$(PROJECT)
-
-if USE_HTML
-html_project_DATA = sfile12c.jpg bit_c.jpg
-endif
-
-noinst_DATA = bit_ada.jpg bit_ada.vsd bit_c.jpg bit_c.vsd scfile10.jpg \
- scfile10.vsd scfile11.jpg scfile11.vsd scfile12.jpg scfile12.vsd \
- scfile13.jpg scfile13.vsd scsfile1.jpg scsfile1.vsd scsfile2.jpg \
- scsfile2.vsd scsfile3.jpg scsfile3.vsd scsfile4.jpg scsfile4.vsd \
- scsfile5.jpg scsfile5.vsd scsfile6.jpg scsfile6.vsd scsfile7.jpg \
- scsfile7.vsd scsfile8.jpg scsfile8.vsd scsfile9.jpg scsfile9.vsd \
- sfile12c.jpg sfile12c.vsd
-
-EXTRA_DIST = $(noinst_DATA)