2 files changed, 45 insertions, 57 deletions
diff --git a/doc/Makefile b/doc/Makefile
deleted file mode 100644
index 39ca6a35f4..0000000000
--- a/doc/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-#  $Id$
-#
-
-include Make.config
-
-BASEDIR=$(shell pwd)
-
-all: env info html ps pdf
-#	find $(WWW_INSTALL) -type f | xargs -e chmod 444
-#	find $(WWW_INSTALL) -type d | xargs -e chmod 555
-
-env: tools dirs headers
-
-dirs:
-	$(make-dirs)
-
-headers:
-	sed -e 's/RTEMS_VERSION/$(RTEMS_VERSION)/' \
-	    <$(SRCDIR)/index.html >$(WWW_INSTALL)/index.html
-	sed -e 's/RTEMS_VERSION/$(RTEMS_VERSION)/' \
-	    <$(SRCDIR)/rtems_support.html >$(WWW_INSTALL)/rtems_support.html
-	sed -e 's/RTEMS_VERSION/$(RTEMS_VERSION)/' \
-	    <$(SRCDIR)/rtems_header.html >$(WWW_INSTALL)/rtems_header.html
-	sed -e 's/RTEMS_VERSION/$(RTEMS_VERSION)/' \
-	    <$(SRCDIR)/rtems_footer.html >$(WWW_INSTALL)/rtems_footer.html
-	cp common/*.gif $(WWW_INSTALL)
-	cp BAD.html $(WWW_INSTALL)
-
-info: env
-	./do_docs $(BASEDIR) info
-
-html: env
-	./do_docs $(BASEDIR) html
-
-dvi: dirs env
-	./do_docs $(BASEDIR) dvi
-
-ps: dirs env
-	./do_docs $(BASEDIR) ps
-
-pdf: dirs env
-	./do_docs $(BASEDIR) pdf
-
-clean:
-	./do_docs $(BASEDIR) clean
-	cd tools/bmenu ; gmake clean
-	cd tools/pdl2texi ; gmake clean
-	cd tools/src2html ; gmake clean
-
-
-.PHONY: tools
-
-tools:
-	cd tools/bmenu ; gmake 
-	cd tools/pdl2texi ; gmake 
-	cd tools/src2html ; gmake
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000000..af6790ff4b
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,45 @@
+#
+#  $Id$
+#
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+# NOTE: The order of the directories is essential
+SUBDIRS = \
+tools \
+common \
+images \
+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
+
+if USE_HTML
+html_DATA = index.html HELP.html BAD.html
+endif
+
+AUTOMAKE_FILES = project.am
+
+noinst_SCRIPTS = bootstrap
+
+EXTRA_DIST = \
+$(AUTOMAKE_FILES) \
+HELP.html BAD.html \
+texinfo/texinfo.tex \
+$(noinst_SCRIPTS)