7 files changed, 69 insertions, 53 deletions
diff --git a/doc/tools/src2html/Makefile b/doc/tools/src2html/Makefile
deleted file mode 100644
index 6aa7b47e39..0000000000
--- a/doc/tools/src2html/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-#  COPYRIGHT (c) 1988-1999.
-#  On-Line Applications Research Corporation (OAR).
-#  All rights reserved.
-#
-#  $Id$
-#
-
-CC=gcc
-CFLAGS=-g 
-
-PROGS=ctags-wr ctags-new ctags src2html
-
-SRC2HTMLDIR=src2html1.4a
-
-all:  tools
-
-tools: $(PROGS)
-	chmod +x $(PROGS)
-
-ctags-wr:
-	cp ../$(SRC2HTMLDIR)/ctags-wr .
-
-ctags-new:
-	cd ../$(SRC2HTMLDIR)/Ctags ; gmake 
-	cp ../$(SRC2HTMLDIR)/Ctags/ctags-new .
-
-# EMACS ctags with Ada awareness
-ctags:
-	cp ../$(SRC2HTMLDIR)/ctags-emacs/ctags ctags
-
-src2html:
-	cp ../$(SRC2HTMLDIR)/src2html .
-
-clean:
-	rm -f $(PROGS) 
-	cd ../$(SRC2HTMLDIR)/Ctags ; gmake clean
-
diff --git a/doc/tools/src2html/Makefile.am b/doc/tools/src2html/Makefile.am
new file mode 100644
index 0000000000..76d61c75ce
--- /dev/null
+++ b/doc/tools/src2html/Makefile.am
@@ -0,0 +1,25 @@
+#
+#  COPYRIGHT (c) 1988-1998.
+#  On-Line Applications Research Corporation (OAR).
+#  All rights reserved.
+#
+#  $Id$
+#
+
+AUTOMAKE_OPTIONS = foreign
+
+SRC2HTMLDIR=$(top_srcdir)/src2html1.4a
+
+ctags-wr: $(SRC2HTMLDIR)/ctags-wr
+	cp $< $@
+	chmod 755 $@
+
+ctags-new: $(SRC2HTMLDIR)/Ctags/ctags-new
+	cp $< $@
+
+# EMACS ctags with Ada awareness
+ctags: $(SRC2HTMLDIR)/ctags-emacs/ctags
+	cp $< $@
+
+src2html: $(SRC2HTMLDIR)/src2html
+	cp $< $@
diff --git a/doc/tools/src2html1.4a/Ctags/Makefile b/doc/tools/src2html1.4a/Ctags/Makefile
deleted file mode 100644
index c6dd7f0d6a..0000000000
--- a/doc/tools/src2html1.4a/Ctags/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-#	@(#)Makefile	5.6 (Berkeley) 5/11/90
-
-CC=gcc
-
-PROG=	ctags-new
-CFLAGS+=-I. -g
-
-SRCS=	C.c ctags.c fortran.c lisp.c print.c tree.c yacc.c strerror.c
-
-ctags: C.o ctags.o fortran.o lisp.o print.o tree.o yacc.o strerror.o
-	$(CC) -o ctags-new C.o ctags.o fortran.o lisp.o print.o tree.o yacc.o \
-	strerror.o
-
-clean:
-	rm -f *.o ctags-new
diff --git a/doc/tools/src2html1.4a/Ctags/Makefile.am b/doc/tools/src2html1.4a/Ctags/Makefile.am
new file mode 100644
index 0000000000..0066980147
--- /dev/null
+++ b/doc/tools/src2html1.4a/Ctags/Makefile.am
@@ -0,0 +1,10 @@
+## $Id$
+
+AUTOMAKE_OPTIONS = foreign
+
+noinst_PROGRAMS =	ctags-new
+
+ctags_new_SOURCES =	C.c ctags.c fortran.c lisp.c print.c \
+tree.c yacc.c strerror.c ctags.h
+
+EXTRA_DIST = ctags.1 z.c
diff --git a/doc/tools/src2html1.4a/FreeBSD/Makefile.am b/doc/tools/src2html1.4a/FreeBSD/Makefile.am
new file mode 100644
index 0000000000..df56641ebe
--- /dev/null
+++ b/doc/tools/src2html1.4a/FreeBSD/Makefile.am
@@ -0,0 +1,21 @@
+## $Id$
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = \
+FreeBSD.hdr \
+FreeBSD.s2h \
+conf.hdr \
+ddb.hdr \
+i386.i386.hdr \
+i386.include.hdr \
+i386.isa.hdr \
+i386.stand.hdr \
+kern.hdr \
+net.hdr \
+netinet.hdr \
+nfs.hdr \
+stand.hdr \
+sys.hdr \
+ufs.hdr \
+vm.hdr
diff --git a/doc/tools/src2html1.4a/Makefile.am b/doc/tools/src2html1.4a/Makefile.am
new file mode 100644
index 0000000000..8814866d6f
--- /dev/null
+++ b/doc/tools/src2html1.4a/Makefile.am
@@ -0,0 +1,8 @@
+AUTOMAKE_OPTIONS = foreign
+
+SUBDIRS = Ctags FreeBSD ctags-emacs
+
+noinst_SCRIPTS = ctags-wr src2html src2html.cgi
+
+EXTRA_DIST = src2html.1 Readme $(noinst_SCRIPTS)
+
diff --git a/doc/tools/src2html1.4a/ctags-emacs/Makefile.am b/doc/tools/src2html1.4a/ctags-emacs/Makefile.am
new file mode 100644
index 0000000000..8c0c4a0ac5
--- /dev/null
+++ b/doc/tools/src2html1.4a/ctags-emacs/Makefile.am
@@ -0,0 +1,5 @@
+## $Id$
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = ctags etags.c-ada-patch README