summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-01-20 17:03:51 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-01-20 17:03:51 +0000
commit003d4da3fcd6f0530f643997e3c42c30d1ebd450 (patch)
tree4264e46b44c07291cd7ec87b61f85a59fbc57f05
parent645a43d39f8166a54d7fcc9e0a824edc856d8c1e (diff)
downloadrtems-003d4da3fcd6f0530f643997e3c42c30d1ebd450.tar.bz2
2002-01-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Add --enable-docs support. Add RTEMS_HOST_CONFIG_SUBDIRS(doc). Remove doc/Makefile. * Makefile.am: Add HOST_SUBDIRS to SUBDIRS. Remove doc from hard-coded SUBDIRS. * README.configure: Added a bit of information on this new option.
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.am2
-rw-r--r--README.configure13
-rw-r--r--configure.ac9
4 files changed, 25 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 47071a7eb3..956918e5b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac: Add --enable-docs support. Add
+ RTEMS_HOST_CONFIG_SUBDIRS(doc). Remove doc/Makefile.
+ * Makefile.am: Add HOST_SUBDIRS to SUBDIRS. Remove doc from
+ hard-coded SUBDIRS.
+ * README.configure: Added a bit of information on this new option.
+
2002-01-18 Joel Sherrill <joel@OARcorp.com>
* VERSION: Updated to rtems-ss-20020118.
diff --git a/Makefile.am b/Makefile.am
index c879526516..9dd552e761 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@
AUTOMAKE_OPTIONS = foreign 1.5
ACLOCAL_AMFLAGS = -I aclocal
-SUBDIRS = doc make tools $(BUILD_SUBDIRS) $(TARGET_SUBDIRS)
+SUBDIRS = tools make $(BUILD_SUBDIRS) $(HOST_SUBDIRS) $(TARGET_SUBDIRS)
AUTOMAKE_FILES = automake/compile.am automake/host.am automake/lib.am \
automake/local.am automake/multilib.am automake/subdirs.am \
diff --git a/README.configure b/README.configure
index 9fe7e0d0c6..9a24abfc5e 100644
--- a/README.configure
+++ b/README.configure
@@ -32,6 +32,7 @@ RTEMS-specific option are supported:
--enable-rtemsbsp="bsp1 bsp2 ..."
--enable-tests
--enable-rdbg (only valid for i386 and some PowerPC BSPs)
+ --enable-docs
In addition, the following standard autoconf options are frequently
used when configuring RTEMS installations:
@@ -87,10 +88,10 @@ unless directly specified. There are two ways of changing this:
bsps as the default bsps, or
+ set the RTEMS_BSP variable during make (see below).
-The --enable-rtemsbsp= option configures RTEMS for a specific target
-architecture. Remember that the target specifies the CPU family while
-the BSP specifies the precise board you will be using. The following
-targets are supported:
+The --enable-rtemsbsp= option configures RTEMS for a specific board
+within a target architecture. Remember that the target specifies the
+CPU family while the BSP specifies the precise board you will be using.
+The following targets are supported:
(none) will build the host-based version on Linux,
Solaris and HPUX.
@@ -109,7 +110,7 @@ targets are supported:
sh-rtems
sparc-rtems
bare see notes
-
+
The cross-compiler is set to $(target)-gcc by default. This can be
overridden by:
@@ -135,6 +136,8 @@ As an example, to build and install the mvme136 and dmv152 bsps for m68k do:
The sample tests are built by 'make all', do a 'make test' to build the full
test suite.
+By default, --enable-docs is disabled and documentation is not built.
+
2.2 Build with Cygnus one-tree release
To build and install RTEMS with the one-tree structure, just copy the rtems
diff --git a/configure.ac b/configure.ac
index 4dc63d6478..fe31dda1cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,10 @@ RTEMS_ENABLE_RTEMS_DEBUG
RTEMS_ENABLE_RTEMSBSP(dummy)
RTEMS_ENABLE_MULTILIB
+AC_ARG_ENABLE([docs],
+ [AC_HELP_STRING([--enable-docs],[enable building documentation
+ (default:disabled)])])
+
if test $host != $build; then
AC_MSG_WARN([]
[*** *** *** WARNING *** *** ***]
@@ -59,6 +63,9 @@ RTEMS_BUILD_CONFIG_SUBDIRS([tools/update])
RTEMS_HOST_CONFIG_SUBDIRS([tools/build])
RTEMS_HOST_CONFIG_SUBDIRS([tools/cpu])
+AS_IF([test x"${enable_docs}" = x"yes"],
+ [RTEMS_HOST_CONFIG_SUBDIRS([doc])])
+
RTEMS_TARGET_CONFIG_SUBDIRS([c/make])
if test x"$enable_multilib" = x"yes"; then
RTEMS_TARGET_CONFIG_SUBDIRS([c/src/exec])
@@ -73,6 +80,6 @@ make/Makefile
make/custom/Makefile
make/Templates/Makefile
make/compilers/Makefile
-doc/Makefile])
+])
AC_OUTPUT