2006-10-15 Thomas Schwinge <tschwinge@gnu.org>

[task #5956 --- ``Automake'ify GNU Mach's code base'']

	* doc/Makefile.in: Remove file.
	* doc/Makefrag.am: New file.
	* tests/Makefrag.am: Likewise.
	* tests/test-mbchk.in: Likewise.

5 files changed, 77 insertions, 65 deletions

diff --git a/ChangeLog b/ChangeLog
index 6407eab..0de6f5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 
 	[task #5956 --- ``Automake'ify GNU Mach's code base'']
 
+	* doc/Makefile.in: Remove file.
+	* doc/Makefrag.am: New file.
+	* tests/Makefrag.am: Likewise.
+	* tests/test-mbchk.in: Likewise.
+
 	* configfrag.ac: New file.
 	* tests/configfrag.ac: Likewise.
 	* Makerules.am (DEFINES): Convert those into...
diff --git a/doc/Makefile.in b/doc/Makefile.in
deleted file mode 100644
index ae2b37e..0000000
--- a/doc/Makefile.in
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#   Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
-#
-#   This program is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation; either version 2, or (at
-#   your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-mach-version := @PACKAGE_VERSION@
-targets := mach.info
-
-# Variables from `configure'.
-srcdir=@srcdir@
-prefix=@prefix@
-
-infodir=$(prefix)/info
-
-DVIPS = dvips
-
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-
-VPATH = $(srcdir)
-
-all: $(targets)
-
-# For each .info file we need a .d file.
--include $(patsubst %.info,%.d,$(filter %.info,$(targets))) /dev/null
-
-# Build dependencies from included files.
-%.d: %.texi
-	set -e; (echo "$*.info $*.dvi: \\"; grep '^@include ' $< | \
-		 sed -e 's/^[^  ]*[     ]*\([^  ]*\).*$$/       \1 \\/'; \
-		 echo) > $@.new
-	mv -f $@.new $@
-
-%.info: %.texi
-	@rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	$(MAKEINFO) -I $(@D) -I $(<D) $<
-
-.PRECIOUS: %.dvi
-%.dvi: %.texi
-	TEXINPUTS=$(srcdir):$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
-
-%.ps: %.dvi
-	$(DVIPS) $< -o $@
-
-# move-if-change = $(SHELL) $(top_srcdir)/move-if-change
-# For now:
-move-if-change = mv
-
-version.texi: stamp-version; @:
-stamp-version:
-	echo '@set VERSION $(mach-version)' > version.texi.new
-	$(move-if-change) version.texi.new version.texi
-	touch $@
diff --git a/doc/Makefrag.am b/doc/Makefrag.am
new file mode 100644
index 0000000..169d2b8
--- /dev/null
+++ b/doc/Makefrag.am
@@ -0,0 +1,26 @@
+# Makefile fragment for the documentation.
+
+# Copyright (C) 2006 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+#
+# The GNU Mach Reference Manual.
+#
+
+info_TEXINFOS += \
+	doc/mach.texi
+mach_TEXINFOS = \
+	doc/fdl.texi doc/gpl.texi
diff --git a/tests/Makefrag.am b/tests/Makefrag.am
new file mode 100644
index 0000000..d42b0f8
--- /dev/null
+++ b/tests/Makefrag.am
@@ -0,0 +1,24 @@
+# Makefile fragment for the test suite.
+
+# Copyright (C) 2006 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+#
+# Tests.
+#
+
+TESTS += \
+	tests/test-mbchk
diff --git a/tests/test-mbchk.in b/tests/test-mbchk.in
new file mode 100644
index 0000000..d4c4c28
--- /dev/null
+++ b/tests/test-mbchk.in
@@ -0,0 +1,22 @@
+#!@SHELL@
+
+# Test if the kernel image complies with the multiboot specification.
+
+# Copyright (C) 2006 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+@MBCHK@ \
+  gnumach