2006-11-30 Barry deFreese <bddebian@comcast.net>

	    Thomas Schwinge  <tschwinge@gnu.org>

[bug #18015 --- ``GNU Mach: `make dist' and friends'']
	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
	(EXTRA_DIST): Enhance with the patches and documentation files.
	(dist-hook): New target to remove the `CVS' directories.
	* Makefrag.am (libkernel_a_SOURCES, EXTRA_DIST): Add header and `mig'
	input files.
	(DISTCHECK_CONFIGURE_FLAGS): Enable the kernel debugger.
	* i386/Makefrag.am: Likewise.  Also add `i386/i386/i386asm.sym',
	`i386/ldscript' and `i386/README-Drivers'.
	* i386/linux/Makefrag.am (liblinux_a_SOURCES): Add the header files
	from `i386/linux/'.
	* linux/Makefrag.am (liblinux_a_SOURCES, EXTRA_DIST)
	(liblinux_pcmcia_cs_modules_a_SOURCES)
	(liblinux_pcmcia_cs_clients_a_SOURCES)
	(liblinux_pcmcia_cs_wireless_a_SOURCES): Add header and other included
	files.
	(dist-hook): Depend on `dist-hook-linux'.
	(dist-hook-linux): New phony target to remove the `asm' symbolic links.
	* Makerules.am (EXTRA_DIST): Add `gensym.awk'.
	* doc/Makefrag.am (EXTRA_DIST): Add `$(mach_TEXINFOS)'.
	* configure.ac (AC_CONFIG_LINKS): Move instantiation to...
	* configfrag.ac: ... here and change quotation.
	* linux/configfrag.ac (AC_CONFIG_LINKS): Change quotation.

11 files changed, 517 insertions, 73 deletions

diff --git a/ChangeLog b/ChangeLog
index d3f6494..47e2b79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2006-11-30  Barry deFreese  <bddebian@comcast.net>
+	    Thomas Schwinge  <tschwinge@gnu.org>
+
+	[bug #18015 --- ``GNU Mach: `make dist' and friends'']
+	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
+	(EXTRA_DIST): Enhance with the patches and documentation files.
+	(dist-hook): New target to remove the `CVS' directories.
+	* Makefrag.am (libkernel_a_SOURCES, EXTRA_DIST): Add header and `mig'
+	input files.
+	(DISTCHECK_CONFIGURE_FLAGS): Enable the kernel debugger.
+	* i386/Makefrag.am: Likewise.  Also add `i386/i386/i386asm.sym',
+	`i386/ldscript' and `i386/README-Drivers'.
+	* i386/linux/Makefrag.am (liblinux_a_SOURCES): Add the header files
+	from `i386/linux/'.
+	* linux/Makefrag.am (liblinux_a_SOURCES, EXTRA_DIST)
+	(liblinux_pcmcia_cs_modules_a_SOURCES)
+	(liblinux_pcmcia_cs_clients_a_SOURCES)
+	(liblinux_pcmcia_cs_wireless_a_SOURCES): Add header and other included
+	files.
+	(dist-hook): Depend on `dist-hook-linux'.
+	(dist-hook-linux): New phony target to remove the `asm' symbolic links.
+	* Makerules.am (EXTRA_DIST): Add `gensym.awk'.
+	* doc/Makefrag.am (EXTRA_DIST): Add `$(mach_TEXINFOS)'.
+	* configure.ac (AC_CONFIG_LINKS): Move instantiation to...
+	* configfrag.ac: ... here and change quotation.
+	* linux/configfrag.ac (AC_CONFIG_LINKS): Change quotation.
+
 2006-11-29  Thomas Schwinge  <tschwinge@gnu.org>
 
 	* configure: Regenerate.
diff --git a/Makefile.am b/Makefile.am
index cb07e2f..9d3b311 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,7 @@
 SUBDIRS =
 DIST_SUBDIRS =
 EXTRA_DIST =
+DISTCHECK_CONFIGURE_FLAGS =
 noinst_LIBRARIES =
 noinst_PROGRAMS =
 TESTS=
@@ -155,6 +156,26 @@ exec_boot_PROGRAMS = \
 	gnumach
 
 #
+# Building a distribution.
+#
+
+EXTRA_DIST += \
+	Makefile.correct_output_files_for_.S_files.patch \
+	config.status.dep.patch
+
+EXTRA_DIST += \
+	ChangeLog.0 ChangeLog.00 \
+	DEVELOPMENT
+
+dist-hook:
+# Try to be very safe with respect to spuriously removing various directories
+# in case of an error.
+	find $(distdir)/ -type d -name CVS | while read d; do	\
+	  rm -f "$$d"/{Entries,Repository,Root,Tag} &&		\
+	  rmdir "$$d";						\
+	done
+
+#
 # Legacy support.
 #
 
diff --git a/Makefrag.am b/Makefrag.am
index 02cf8c3..9a898a6 100644
--- a/Makefrag.am
+++ b/Makefrag.am
@@ -13,141 +13,290 @@
 # LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE
 # USE OF THIS SOFTWARE.
 
+#
+# DDB support --- eventually to die.  Please.
+#
+
 # Do we want the icky kernel debugger?
 if enable_kdb
-# DDB support --- eventually to die.  Please.
 libkernel_a_SOURCES += \
 	ddb/db_access.c \
+	ddb/db_access.h \
 	ddb/db_aout.c \
 	ddb/db_break.c \
+	ddb/db_break.h \
 	ddb/db_command.c \
+	ddb/db_command.h \
 	ddb/db_cond.c \
 	ddb/db_examine.c \
 	ddb/db_expr.c \
+	ddb/db_expr.h \
 	ddb/db_ext_symtab.c \
 	ddb/db_input.c \
 	ddb/db_lex.c \
+	ddb/db_lex.h \
 	ddb/db_macro.c \
 	ddb/db_mp.c \
 	ddb/db_output.c \
+	ddb/db_output.h \
 	ddb/db_print.c \
+	ddb/db_print.h \
 	ddb/db_run.c \
+	ddb/db_run.h \
 	ddb/db_sym.c \
+	ddb/db_sym.h \
 	ddb/db_task_thread.c \
+	ddb/db_task_thread.h \
 	ddb/db_trap.c \
 	ddb/db_variables.c \
+	ddb/db_variables.h \
 	ddb/db_watch.c \
-	ddb/db_write_cmd.c 
+	ddb/db_watch.h \
+	ddb/db_write_cmd.c \
+	ddb/nlist.h \
+	ddb/stab.h \
+	ddb/tr.h
 endif
 
+
+#
 # IPC implementation.
+#
+
 libkernel_a_SOURCES += \
 	ipc/ipc_entry.c \
+	ipc/ipc_entry.h \
 	ipc/ipc_hash.c \
+	ipc/ipc_hash.h \
 	ipc/ipc_init.c \
+	ipc/ipc_init.h \
 	ipc/ipc_kmsg.c \
+	ipc/ipc_kmsg.h \
+	ipc/ipc_kmsg_queue.h \
+	ipc/ipc_machdep.h \
 	ipc/ipc_marequest.c \
+	ipc/ipc_marequest.h \
 	ipc/ipc_mqueue.c \
+	ipc/ipc_mqueue.h \
 	ipc/ipc_notify.c \
+	ipc/ipc_notify.h \
 	ipc/ipc_object.c \
+	ipc/ipc_object.h \
 	ipc/ipc_port.c \
+	ipc/ipc_port.h \
 	ipc/ipc_pset.c \
+	ipc/ipc_pset.h \
 	ipc/ipc_right.c \
+	ipc/ipc_right.h \
 	ipc/ipc_space.c \
+	ipc/ipc_space.h \
 	ipc/ipc_splay.c \
+	ipc/ipc_splay.h \
 	ipc/ipc_table.c \
+	ipc/ipc_table.h \
 	ipc/ipc_target.c \
+	ipc/ipc_target.h \
 	ipc/ipc_thread.c \
+	ipc/ipc_thread.h \
+	ipc/ipc_types.h \
 	ipc/mach_msg.c \
+	ipc/mach_msg.h \
 	ipc/mach_port.c \
 	ipc/mach_rpc.c \
-	ipc/mach_debug.c 
+	ipc/mach_debug.c \
+	ipc/port.h
+EXTRA_DIST += \
+	ipc/mach_port.srv
+
+
+#
+# `kernel' implementation (tasks, threads, trivia, etc.).
+#
 
-# "kernel" implementation (tasks, threads, trivia, etc.).
 libkernel_a_SOURCES += \
 	kern/act.c \
+	kern/act.h \
+	kern/assert.h \
 	kern/ast.c \
+	kern/ast.h \
+	kern/boot_script.h \
 	kern/bootstrap.c \
+	kern/compat_xxx_defs.h \
 	kern/counters.c \
+	kern/counters.h \
+	kern/cpu_number.h \
 	kern/debug.c \
+	kern/debug.h \
 	kern/eventcount.c \
+	kern/eventcount.h \
 	kern/exception.c \
 	kern/host.c \
+	kern/host.h \
 	kern/ipc_host.c \
+	kern/ipc_host.h \
 	kern/ipc_kobject.c \
+	kern/ipc_kobject.h \
 	kern/ipc_mig.c \
 	kern/ipc_sched.c \
+	kern/ipc_sched.h \
 	kern/ipc_tt.c \
+	kern/ipc_tt.h \
 	kern/kalloc.c \
+	kern/kalloc.h \
+	kern/kern_types.h \
 	kern/lock.c \
+	kern/lock.h \
 	kern/lock_mon.c \
 	kern/mach_clock.c \
+	kern/mach_clock.h \
 	kern/mach_factor.c \
+	kern/mach_factor.h \
+	kern/mach_param.h \
 	kern/machine.c \
+	kern/macro_help.h \
 	kern/pc_sample.c \
+	kern/pc_sample.h \
 	kern/printf.c \
+	kern/printf.h \
 	kern/priority.c \
 	kern/processor.c \
+	kern/processor.h \
 	kern/profile.c \
 	kern/queue.c \
+	kern/queue.h \
+	kern/refcount.h \
+	kern/sched.h \
 	kern/sched_prim.c \
+	kern/sched_prim.h \
+	kern/shuttle.h \
 	kern/startup.c \
 	kern/strings.c \
 	kern/syscall_emulation.c \
+	kern/syscall_emulation.h \
 	kern/syscall_subr.c \
+	kern/syscall_subr.h \
 	kern/syscall_sw.c \
+	kern/syscall_sw.h \
 	kern/task.c \
+	kern/task.h \
 	kern/thread.c \
+	kern/thread.h \
 	kern/thread_swap.c \
+	kern/thread_swap.h \
+	kern/time_out.h \
 	kern/time_stamp.c \
+	kern/time_stamp.h \
 	kern/timer.c \
+	kern/timer.h \
 	kern/xpr.c \
+	kern/xpr.h \
 	kern/zalloc.c \
+	kern/zalloc.h \
 	kern/elf-load.c \
 	kern/boot_script.c
+EXTRA_DIST += \
+	kern/mach.srv \
+	kern/mach4.srv \
+	kern/mach_debug.srv \
+	kern/mach_host.srv
+
 
+#
 # Still more trivia.
+#
+
 libkernel_a_SOURCES += \
 	util/putchar.c \
 	util/puts.c
 
+#
 # Virtual memory implementation.
+#
+
 libkernel_a_SOURCES += \
+	vm/memory_object.c \
+	vm/memory_object.h \
+	vm/pmap.h \
 	vm/vm_debug.c \
 	vm/vm_external.c \
+	vm/vm_external.h \
 	vm/vm_fault.c \
+	vm/vm_fault.h \
 	vm/vm_init.c \
 	vm/vm_kern.c \
+	vm/vm_kern.h \
 	vm/vm_map.c \
+	vm/vm_map.h \
 	vm/vm_object.c \
+	vm/vm_object.h \
+	vm/vm_page.h \
 	vm/vm_pageout.c \
+	vm/vm_pageout.h \
 	vm/vm_resident.c \
 	vm/vm_user.c \
-	vm/memory_object.c
+	vm/vm_user.h
+EXTRA_DIST += \
+	vm/memory_object_default.cli \
+	vm/memory_object_user.cli
+
+
+#
+# Device driver support.
+#
 
 # These device support files are always needed; the others are needed only if
 # particular drivers want the routines.
 # TODO.  Functions in device/subrs.c should each be moved elsewhere.
 libkernel_a_SOURCES += \
+	device/blkio.c \
+	device/buf.h \
+	device/chario.c \
+	device/cirbuf.h \
+	device/conf.h \
 	device/cons.c \
+	device/cons.h \
+	device/dev_hdr.h \
 	device/dev_lookup.c \
+	device/dev_master.h \
 	device/dev_name.c \
 	device/dev_pager.c \
 	device/device_init.c \
+	device/device_port.h \
+	device/device_types_kernel.h \
 	device/ds_routines.c \
-	device/subrs.c \
+	device/ds_routines.h \
+	device/errno.h \
+	device/if_ether.h \
+	device/if_hdr.h \
+	device/io_req.h \
+	device/kmsg.h \
 	device/net_io.c \
-	device/blkio.c \
-	device/chario.c
+	device/net_io.h \
+	device/param.h \
+	device/subrs.c \
+	device/tty.h
+EXTRA_DIST += \
+	device/device.srv \
+	device/device_pager.srv \
+	device/device_reply.cli \
+	device/memory_object_reply.cli
+
+
+#
+# `kmsg' device.
+#
 
-# kmsg device.
 if enable_kmsg
 libkernel_a_SOURCES += \
 	device/kmsg.c
 endif
 
+
+#
 # Version number.
-libkernel_a_SOURCES += \
+#
+
+nodist_libkernel_a_SOURCES += \
 	version.c
 
 #
@@ -247,6 +396,18 @@ install-data-hook:
 	ln -s '$(systype)' '$(DESTDIR)$(include_machdir)'/machine
 
 #
+# Building a distribution.
+#
+
+# Enable all available features.
+DISTCHECK_CONFIGURE_FLAGS += \
+	--enable-kdb
+
+# Instead of listing each file individually...
+EXTRA_DIST += \
+	include
+
+#
 # Automatically generated source files.
 #
 
diff --git a/Makerules.am b/Makerules.am
index ac214b5..05e7448 100644
--- a/Makerules.am
+++ b/Makerules.am
@@ -17,7 +17,9 @@
 # Building foo.h from foo.sym.
 #
 
-%.symc: %.sym $(top_srcdir)/gensym.awk
+EXTRA_DIST += \
+	gensym.awk
+%.symc: %.sym gensym.awk
 	$(AWK) -f $(word 2,$^) $< > $@
 %.symc.o: %.symc
 	$(COMPILE) -S -x c -o $@ $<
diff --git a/configfrag.ac b/configfrag.ac
index 03ba7b3..68c78c4 100644
--- a/configfrag.ac
+++ b/configfrag.ac
@@ -135,3 +135,13 @@ AC_ARG_ENABLE([default-device-drivers],
 [if [ x"$enable_default_device_drivers" != xno ]
 then enable_default_device_drivers=yes
 fi]
+
+#
+# Set up `SYSTYPE/SYSTYPE' and `SYSTYPE/include/mach/SYSTYPE' links.
+#
+
+# `${file}' and `$file' have different meanings here with respect to having the
+# files in the referenced directory considered for `make dist' or not.  See
+# <http://lists.gnu.org/archive/html/bug-automake/2006-11/msg00027.html>.
+AC_CONFIG_LINKS([machine:$systype/$systype
+		 mach/machine:$systype/include/mach/$systype])
diff --git a/configure.ac b/configure.ac
index f15f08f..6815f9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,13 +141,7 @@ AM_CONDITIONAL([disable_smashing_stack_protector],
 # Output.
 #
 
-# Set up `machine' and `mach/machine' links in the build directory for easier
-# header file location.
-AC_CONFIG_LINKS([machine:${systype}/${systype}
-		 mach/machine:${systype}/include/mach/${systype}])
-
 AC_CONFIG_HEADER([config.h])
-
 AC_CONFIG_FILES([Makefile version.c])
 
 #
diff --git a/doc/Makefrag.am b/doc/Makefrag.am
index a60722a..17b6298 100644
--- a/doc/Makefrag.am
+++ b/doc/Makefrag.am
@@ -24,6 +24,8 @@ info_TEXINFOS += \
 	doc/mach.texi
 mach_TEXINFOS = \
 	doc/fdl.texi doc/gpl.texi
+EXTRA_DIST += \
+	$(mach_TEXINFOS)
 
 #
 # Web pages of the GNU Mach Reference Manual.
diff --git a/i386/Makefrag.am b/i386/Makefrag.am
index 1ba5eb8..f34c7cc 100644
--- a/i386/Makefrag.am
+++ b/i386/Makefrag.am
@@ -13,79 +13,161 @@
 # LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE
 # USE OF THIS SOFTWARE.
 
+#
 # Source files for any i386 kernel.
+#
+
 libkernel_a_SOURCES += \
 	i386/i386at/autoconf.c \
 	i386/i386at/boothdr.S \
 	i386/i386at/com.c \
+	i386/i386at/comreg.h \
 	i386/i386at/conf.c \
 	i386/i386at/cons_conf.c \
+	i386/i386at/cram.h \
+	i386/i386at/dev_hdr.h \
+	i386/i386at/device_emul.h \
+	i386/i386at/disk.h \
 	i386/i386at/rtc.c \
 	i386/i386at/i386at_ds_routines.c \
+	i386/i386at/i8250.h \
+	i386/i386at/idt.h \
 	i386/i386at/immc.c \
 	i386/i386at/int_init.c \
 	i386/i386at/interrupt.S \
 	i386/i386at/iopl.c \
 	i386/i386at/kd.c \
-	i386/i386at/kdasm.S \
+	i386/i386at/kd.h \
 	i386/i386at/kd_event.c \
+	i386/i386at/kd_event.h \
 	i386/i386at/kd_mouse.c \
+	i386/i386at/kd_mouse.h \
 	i386/i386at/kd_queue.c \
+	i386/i386at/kd_queue.h \
+	i386/i386at/kdasm.S \
+	i386/i386at/kdsoft.h \
 	i386/i386at/model_dep.c \
-	i386/i386at/pic_isa.c
+	i386/i386at/pic_isa.c \
+	i386/i386at/rtc.h \
+	i386/include/mach/sa/stdarg.h
+
+#
+# `lpr' device support.
+#
 
-# lpr device support.
 if enable_lpr
 libkernel_a_SOURCES += \
-	i386/i386at/lpr.c
+	i386/i386at/lpr.c \
+	i386/i386at/lprreg.h
 endif
 
+
+#
+# Further source files for any i386 kernel.
+#
+
 libkernel_a_SOURCES += \
+	i386/i386/ast.h \
 	i386/i386/ast_check.c \
+	i386/i386/ast_types.h \
+	i386/i386/cpu_number.h \
 	i386/i386/cswitch.S \
 	i386/i386/db_disasm.c \
 	i386/i386/db_interface.c \
+	i386/i386/db_machdep.h \
 	i386/i386/db_trace.c \
+	i386/i386/debug.h \
 	i386/i386/debug_i386.c \
 	i386/i386/debug_trace.S \
+	i386/i386/eflags.h \
 	i386/i386/fpe_linkage.c \
 	i386/i386/fpu.c \
+	i386/i386/fpu.h \
 	i386/i386/gdt.c \
+	i386/i386/gdt.h \
 	i386/i386/hardclock.c \
+	i386/i386/idt-gen.h \
 	i386/i386/idt.c \
 	i386/i386/idt_inittab.S \
 	i386/i386/io_emulate.c \
+	i386/i386/io_emulate.h \
 	i386/i386/io_map.c \
+	i386/i386/io_port.h \
 	i386/i386/iopb.c \
+	i386/i386/iopb.h \
+	i386/i386/ipl.h \
 	i386/i386/ktss.c \
+	i386/i386/ktss.h \
 	i386/i386/kttd_interface.c \
+	i386/i386/kttd_machdep.h \
 	i386/i386/ldt.c \
+	i386/i386/ldt.h \
+	i386/i386/lock.h \
 	i386/i386/locore.S \
+	i386/i386/locore.h \
 	i386/i386/loose_ends.c \
+	i386/i386/mach_param.h \
+	i386/i386/machine_routines.h \
+	i386/i386/machspl.h \
 	i386/i386/mp_desc.c \
+	i386/i386/mp_desc.h \
 	i386/i386/pcb.c \
+	i386/i386/pcb.h \
 	i386/i386/phys.c \
 	i386/i386/pic.c \
+	i386/i386/pic.h \
+	i386/i386/pio.h \
 	i386/i386/pit.c \
+	i386/i386/pit.h \
+	i386/i386/pmap.h \
+	i386/i386/proc_reg.h \
+	i386/i386/sched_param.h \
 	i386/i386/seg.c \
+	i386/i386/seg.h \
+	i386/i386/setjmp.h \
 	i386/i386/spl.S \
+	i386/i386/spl.h \
+	i386/i386/thread.h \
+	i386/i386/time_stamp.h \
+	i386/i386/timer.h \
 	i386/i386/trap.c \
-	i386/i386/user_ldt.c
+	i386/i386/trap.h \
+	i386/i386/tss.h \
+	i386/i386/user_ldt.c \
+	i386/i386/user_ldt.h \
+	i386/i386/vm_param.h \
+	i386/i386/vm_tuning.h \
+	i386/i386/xpr.h \
+	i386/i386/zalloc.h \
+	i386/intel/pmap.c \
+	i386/intel/pmap.h \
+	i386/intel/read_fault.c
+EXTRA_DIST += \
+	i386/i386/mach_i386.srv
+
+
+#
+# KDB support.
+#
 
-# This file is only needed for KDB support.
 if enable_kdb
 libkernel_a_SOURCES += \
 	i386/i386/_setjmp.S
 endif
 
-libkernel_a_SOURCES += \
-	i386/intel/pmap.c \
-	i386/intel/read_fault.c
 
+#
 # Files from the generic sources that we want.
+#
+
 libkernel_a_SOURCES += \
 	chips/busses.c \
+	chips/busses.h \
 	device/cirbuf.c
+
+#
+# Automatically generated source files.
+#
 
 # See Makefrag.am about lib_dep_tr_for_defs.a.
 nodist_lib_dep_tr_for_defs_a_SOURCES += \
@@ -102,6 +184,8 @@ nodist_libkernel_a_SOURCES += \
 # TODO.  Hm.
 i386/i386at/boothdr.o: i386/i386/i386asm.h
 
+EXTRA_DIST += \
+	i386/i386/i386asm.sym
 nodist_libkernel_a_SOURCES += \
 	i386/i386/i386asm.h
 
@@ -109,6 +193,8 @@ nodist_libkernel_a_SOURCES += \
 # Architecture specialities.
 #
 
+EXTRA_DIST += \
+	i386/ldscript
 LINKFLAGS_gnumach = \
 	-T '$(srcdir)/$(systype)'/ldscript
 
@@ -136,3 +222,14 @@ include_mach_i386_HEADERS = \
 	i386/include/mach/i386/trap.h \
 	i386/include/mach/i386/vm_param.h \
 	i386/include/mach/i386/vm_types.h
+
+#
+# Building a distribution.
+#
+
+EXTRA_DIST += \
+	i386/README-Drivers
+
+# Instead of listing each file individually...
+EXTRA_DIST += \
+	i386/include
diff --git a/i386/linux/Makefrag.am b/i386/linux/Makefrag.am
index 533c6c3..41606c9 100644
--- a/i386/linux/Makefrag.am
+++ b/i386/linux/Makefrag.am
@@ -21,4 +21,6 @@
 #
 
 liblinux_a_SOURCES += \
+	i386/linux/dev/include/linux/autoconf.h \
+	i386/linux/dev/include/linux_emul.h \
 	linux/src/arch/i386/lib/semaphore.S
diff --git a/linux/Makefrag.am b/linux/Makefrag.am
index c8cab2c..0fd21d0 100644
--- a/linux/Makefrag.am
+++ b/linux/Makefrag.am
@@ -74,6 +74,8 @@ liblinux_a_SOURCES += \
 	linux/src/drivers/block/cmd640.c \
 	linux/src/drivers/block/ide-cd.c \
 	linux/src/drivers/block/ide.c \
+	linux/src/drivers/block/ide.h \
+	linux/src/drivers/block/ide_modes.h \
 	linux/src/drivers/block/rz1000.c \
 	linux/src/drivers/block/triton.c
 endif
@@ -81,157 +83,217 @@ endif
 if device_driver_group_scsi
 liblinux_a_SOURCES += \
 	linux/src/drivers/scsi/constants.c \
+	linux/src/drivers/scsi/constants.h \
 	linux/src/drivers/scsi/hosts.c \
+	linux/src/drivers/scsi/hosts.h \
 	linux/src/drivers/scsi/scsi.c \
+	linux/src/drivers/scsi/scsi.h \
 	linux/src/drivers/scsi/scsi_ioctl.c \
 	linux/src/drivers/scsi/scsi_proc.c \
 	linux/src/drivers/scsi/scsicam.c \
 	linux/src/drivers/scsi/sd.c \
+	linux/src/drivers/scsi/sd.h \
 	linux/src/drivers/scsi/sd_ioctl.c \
 	linux/src/drivers/scsi/sr.c \
+	linux/src/drivers/scsi/sr.h \
 	linux/src/drivers/scsi/sr_ioctl.c
 endif
 
 if device_driver_53c78xx
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/53c78xx.c
+	linux/src/drivers/scsi/53c7,8xx.h \
+	linux/src/drivers/scsi/53c78xx.c \
+	linux/src/drivers/scsi/53c8xx_d.h \
+	linux/src/drivers/scsi/53c8xx_u.h
 endif
 
 if device_driver_AM53C974
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/AM53C974.c
+	linux/src/drivers/scsi/AM53C974.c \
+	linux/src/drivers/scsi/AM53C974.h
 endif
 
 if device_driver_BusLogic
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/BusLogic.c
+	linux/src/drivers/scsi/BusLogic.c \
+	linux/src/drivers/scsi/BusLogic.h
+EXTRA_DIST += \
+	linux/src/drivers/scsi/FlashPoint.c
 endif
 
 if device_driver_NCR53c406a
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/NCR53c406a.c
+	linux/src/drivers/scsi/NCR53c406a.c \
+	linux/src/drivers/scsi/NCR53c406a.h
 endif
 
 if device_driver_advansys
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/advansys.c
+	linux/src/drivers/scsi/advansys.c \
+	linux/src/drivers/scsi/advansys.h
 endif
 
 if device_driver_aha152x
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/aha152x.c
+	linux/src/drivers/scsi/aha152x.c \
+	linux/src/drivers/scsi/aha152x.h
 endif
 
 if device_driver_aha1542
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/aha1542.c
+	linux/src/drivers/scsi/aha1542.c \
+	linux/src/drivers/scsi/aha1542.h
 endif
 
 if device_driver_aha1740
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/aha1740.c
+	linux/src/drivers/scsi/aha1740.c \
+	linux/src/drivers/scsi/aha1740.h
 endif
 
 if device_driver_aic7xxx
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/aic7xxx.c
+	linux/src/drivers/scsi/aic7xxx.c \
+	linux/src/drivers/scsi/aic7xxx.h \
+	linux/src/drivers/scsi/aic7xxx/scsi_message.h \
+	linux/src/drivers/scsi/aic7xxx/sequencer.h \
+	linux/src/drivers/scsi/aic7xxx_reg.h
+EXTRA_DIST += \
+	linux/src/drivers/scsi/aic7xxx_proc.c \
+	linux/src/drivers/scsi/aic7xxx_seq.c
 endif
 
 if device_driver_dtc
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/dtc.c
+	linux/src/drivers/scsi/dtc.c \
+	linux/src/drivers/scsi/dtc.h
 endif
 
 if device_driver_eata
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/eata.c
+	linux/src/drivers/scsi/eata.c \
+	linux/src/drivers/scsi/eata.h \
+	linux/src/drivers/scsi/eata_generic.h
 endif
 
 if device_driver_eata_dma
 liblinux_a_SOURCES += \
-	linux/dev/drivers/scsi/eata_dma.c
+	linux/dev/drivers/scsi/eata_dma.c \
+	linux/src/drivers/scsi/eata_dma.h \
+	linux/src/drivers/scsi/eata_dma_proc.h
+EXTRA_DIST += \
+	linux/src/drivers/scsi/eata_dma_proc.c
 endif
 
 if device_driver_eata_pio
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/eata_pio.c
+	linux/src/drivers/scsi/eata_pio.c \
+	linux/src/drivers/scsi/eata_pio.h
+EXTRA_DIST += \
+	linux/src/drivers/scsi/eata_pio_proc.c
 endif
 
 if device_driver_fdomain
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/fdomain.c
+	linux/src/drivers/scsi/fdomain.c \
+	linux/src/drivers/scsi/fdomain.h
 endif
 
 if device_driver_g_NCR5380
 liblinux_a_SOURCES += \
-	linux/dev/drivers/scsi/g_NCR5380.c
+	linux/dev/drivers/scsi/g_NCR5380.c \
+	linux/src/drivers/scsi/g_NCR5380.h
 endif
 
 if device_driver_gdth
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/gdth.c
+	linux/src/drivers/scsi/gdth.c \
+	linux/src/drivers/scsi/gdth.h \
+	linux/src/drivers/scsi/gdth_ioctl.h \
+	linux/src/drivers/scsi/gdth_proc.h
+EXTRA_DIST += \
+	linux/src/drivers/scsi/gdth_proc.c
 endif
 
 if device_driver_in2000
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/in2000.c
+	linux/src/drivers/scsi/in2000.c \
+	linux/src/drivers/scsi/in2000.h
 endif
 
 if device_driver_ncr53c8xx
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/ncr53c8xx.c
+	linux/src/drivers/scsi/ncr53c8xx.c \
+	linux/src/drivers/scsi/ncr53c8xx.h
 endif
 
 if device_driver_pas16
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/pas16.c
+	linux/src/drivers/scsi/pas16.c \
+	linux/src/drivers/scsi/pas16.h
 endif
 
 if device_driver_ppa
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/ppa.c
+	linux/src/drivers/scsi/ppa.c \
+	linux/src/drivers/scsi/ppa.h
 endif
 
 if device_driver_qlogicfas
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/qlogicfas.c
+	linux/src/drivers/scsi/qlogicfas.c \
+	linux/src/drivers/scsi/qlogicfas.h
 endif
 
 if device_driver_qlogicisp
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/qlogicisp.c
+	linux/src/drivers/scsi/qlogicisp.c \
+	linux/src/drivers/scsi/qlogicisp.h
 endif
 
 if device_driver_seagate
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/seagate.c
+	linux/src/drivers/scsi/seagate.c \
+	linux/src/drivers/scsi/seagate.h
 endif
 
 if device_driver_t128
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/t128.c
+	linux/src/drivers/scsi/t128.c \
+	linux/src/drivers/scsi/t128.h
 endif
 
 if device_driver_tmscsim
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/tmscsim.c
+	linux/src/drivers/scsi/dc390.h \
+	linux/src/drivers/scsi/tmscsim.c \
+	linux/src/drivers/scsi/tmscsim.h
+EXTRA_DIST += \
+	linux/src/drivers/scsi/scsiiom.c
 endif
 
 if device_driver_u14_34f
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/u14-34f.c
+	linux/src/drivers/scsi/u14-34f.c \
+	linux/src/drivers/scsi/u14-34f.h
 endif
 
 if device_driver_ultrastor
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/ultrastor.c
+	linux/src/drivers/scsi/ultrastor.c \
+	linux/src/drivers/scsi/ultrastor.h
 endif
 
 if device_driver_wd7000
 liblinux_a_SOURCES += \
-	linux/src/drivers/scsi/wd7000.c
+	linux/src/drivers/scsi/wd7000.c \
+	linux/src/drivers/scsi/wd7000.h
 endif
 
+EXTRA_DIST += \
+	linux/src/drivers/scsi/NCR5380.c \
+	linux/src/drivers/scsi/NCR5380.h
+
 if device_driver_group_net
 liblinux_a_SOURCES += \
 	linux/dev/drivers/net/auto_irq.c \
@@ -239,7 +301,8 @@ liblinux_a_SOURCES += \
 	linux/dev/drivers/net/Space.c \
 	linux/dev/net/core/dev.c \
 	linux/dev/drivers/net/net_init.c \
-	linux/src/drivers/net/pci-scan.c
+	linux/src/drivers/net/pci-scan.c \
+	linux/src/drivers/net/pci-scan.h
 endif
 
 if device_driver_3c501
@@ -250,12 +313,14 @@ endif
 if device_driver_3c503
 liblinux_a_SOURCES += \
 	linux/src/drivers/net/3c503.c \
+	linux/src/drivers/net/3c503.h \
 	linux/src/drivers/net/8390.c
 endif
 
 if device_driver_3c505
 liblinux_a_SOURCES += \
-	linux/src/drivers/net/3c505.c
+	linux/src/drivers/net/3c505.c \
+	linux/src/drivers/net/3c505.h
 endif
 
 if device_driver_3c507
@@ -296,7 +361,8 @@ endif
 
 if device_driver_atp
 liblinux_a_SOURCES += \
-	linux/src/drivers/net/atp.c
+	linux/src/drivers/net/atp.c \
+	linux/src/drivers/net/atp.h
 endif
 
 #if device_driver_cb_shim
@@ -306,7 +372,8 @@ endif
 
 if device_driver_de4x5
 liblinux_a_SOURCES += \
-	linux/src/drivers/net/de4x5.c
+	linux/src/drivers/net/de4x5.c \
+	linux/src/drivers/net/de4x5.h
 endif
 
 if device_driver_de600
@@ -316,12 +383,14 @@ endif
 
 if device_driver_de620
 liblinux_a_SOURCES += \
-	linux/src/drivers/net/de620.c
+	linux/src/drivers/net/de620.c \
+	linux/src/drivers/net/de620.h
 endif
 
 if device_driver_depca
 liblinux_a_SOURCES += \
-	linux/src/drivers/net/depca.c
+	linux/src/drivers/net/depca.c \
+	linux/src/drivers/net/depca.h
 endif
 
 if device_driver_e2100
@@ -342,7 +411,8 @@ endif
 
 if device_driver_eexpress
 liblinux_a_SOURCES += \
-	linux/src/drivers/net/eexpress.c
+	linux/src/drivers/net/eexpress.c \
+	linux/src/drivers/net/eth82586.h
 endif
 
 if device_driver_epic100
@@ -357,7 +427,8 @@ endif
 
 if device_driver_ewrk3
 liblinux_a_SOURCES += \
-	linux/src/drivers/net/ewrk3.c
+	linux/src/drivers/net/ewrk3.c \
+	linux/src/drivers/net/ewrk3.h
 endif
 
 if device_driver_fmv18x
@@ -384,7 +455,8 @@ endif
 
 if device_driver_hp100
 liblinux_a_SOURCES += \
-	linux/src/drivers/net/hp100.c
+	linux/src/drivers/net/hp100.c \
+	linux/src/drivers/net/hp100.h
 endif
 
 if device_driver_intel_gige
@@ -421,12 +493,14 @@ endif
 
 if device_driver_ni52
 liblinux_a_SOURCES += \
-	linux/src/drivers/net/ni52.c
+	linux/src/drivers/net/ni52.c \
+	linux/src/drivers/net/ni52.h
 endif
 
 if device_driver_ni65
 liblinux_a_SOURCES += \
-	linux/src/drivers/net/ni65.c
+	linux/src/drivers/net/ni65.c \
+	linux/src/drivers/net/ni65.h
 endif
 
 if device_driver_ns820
@@ -446,12 +520,14 @@ endif
 
 if device_driver_seeq8005
 liblinux_a_SOURCES += \
-	linux/src/drivers/net/seeq8005.c
+	linux/src/drivers/net/seeq8005.c \
+	linux/src/drivers/net/seeq8005.h
 endif
 
 if device_driver_sk_g16
 liblinux_a_SOURCES += \
-	linux/src/drivers/net/sk_g16.c
+	linux/src/drivers/net/sk_g16.c \
+	linux/src/drivers/net/sk_g16.h
 endif
 
 if device_driver_smc_ultra
@@ -478,7 +554,8 @@ endif
 
 if device_driver_tlan
 liblinux_a_SOURCES += \
-	linux/src/drivers/net/tlan.c
+	linux/src/drivers/net/tlan.c \
+	linux/src/drivers/net/tlan.h
 endif
 
 if device_driver_tulip
@@ -493,7 +570,10 @@ endif
 
 if device_driver_wavelan
 liblinux_a_SOURCES += \
-	linux/src/drivers/net/wavelan.c
+	linux/src/drivers/net/i82586.h \
+	linux/src/drivers/net/wavelan.c \
+	linux/src/drivers/net/wavelan.h \
+	linux/dev/drivers/net/wavelan.p.h
 endif
 
 if device_driver_wd
@@ -517,6 +597,10 @@ liblinux_a_SOURCES += \
 	linux/src/drivers/net/znet.c
 endif
 
+EXTRA_DIST += \
+	linux/src/drivers/net/8390.h \
+	linux/src/drivers/net/kern_compat.h
+
 # pcmcia-cs.
 
 liblinux_pcmcia_cs_modules_a_CPPFLAGS = $(liblinux_a_CPPFLAGS) \
@@ -532,17 +616,31 @@ gnumach_o_LDADD += \
 if device_driver_group_pcmcia
 liblinux_pcmcia_cs_modules_a_SOURCES += \
 	linux/pcmcia-cs/glue/pcmcia.c \
+	linux/pcmcia-cs/glue/pcmcia_glue.h \
 	linux/pcmcia-cs/modules/cs.c \
+	linux/pcmcia-cs/modules/cs_internal.h \
 	linux/pcmcia-cs/modules/ds.c \
 	linux/pcmcia-cs/modules/rsrc_mgr.c \
 	linux/pcmcia-cs/modules/bulkmem.c \
 	linux/pcmcia-cs/modules/cistpl.c \
 	linux/pcmcia-cs/modules/pci_fixup.c
+EXTRA_DIST += \
+	linux/pcmcia-cs/glue/ds.c
 endif
 
 if device_driver_i82365
 liblinux_pcmcia_cs_modules_a_SOURCES += \
-	linux/pcmcia-cs/modules/i82365.c
+	linux/pcmcia-cs/modules/cirrus.h \
+	linux/pcmcia-cs/modules/ene.h \
+	linux/pcmcia-cs/modules/i82365.c \
+	linux/pcmcia-cs/modules/i82365.h \
+	linux/pcmcia-cs/modules/o2micro.h \
+	linux/pcmcia-cs/modules/ricoh.h \
+	linux/pcmcia-cs/modules/smc34c90.h \
+	linux/pcmcia-cs/modules/ti113x.h \
+	linux/pcmcia-cs/modules/topic.h \
+	linux/pcmcia-cs/modules/vg468.h \
+	linux/pcmcia-cs/modules/yenta.h
 endif
 
 liblinux_pcmcia_cs_clients_a_CPPFLAGS = $(liblinux_a_CPPFLAGS) \
@@ -567,6 +665,7 @@ endif
 
 if device_driver_axnet_cs
 liblinux_pcmcia_cs_clients_a_SOURCES += \
+	linux/pcmcia-cs/clients/ax8390.h \
 	linux/pcmcia-cs/clients/axnet_cs.c
 endif
 
@@ -588,6 +687,7 @@ endif
 
 if device_driver_smc91c92_cs
 liblinux_pcmcia_cs_clients_a_SOURCES += \
+	linux/pcmcia-cs/clients/ositech.h \
 	linux/pcmcia-cs/clients/smc91c92_cs.c
 endif
 
@@ -608,12 +708,40 @@ gnumach_o_LDADD += \
 
 if device_driver_orinoco_cs
 liblinux_pcmcia_cs_wireless_a_SOURCES += \
+	linux/pcmcia-cs/glue/wireless_glue.h \
 	linux/pcmcia-cs/wireless/hermes.c \
+	linux/pcmcia-cs/wireless/hermes.h \
+	linux/pcmcia-cs/wireless/hermes_rid.h \
+	linux/pcmcia-cs/wireless/ieee802_11.h \
 	linux/pcmcia-cs/wireless/orinoco.c \
+	linux/pcmcia-cs/wireless/orinoco.h \
 	linux/pcmcia-cs/wireless/orinoco_cs.c
 endif
 
 #
+# Building a distribution.
+#
+
+EXTRA_DIST += \
+	linux/dev/README \
+	linux/src/COPYING
+
+# Instead of listing each file individually...
+EXTRA_DIST += \
+	linux/dev/include \
+	linux/src/include
+EXTRA_DIST += \
+	linux/pcmcia-cs/include
+dist-hook: dist-hook-linux
+.PHONY: dist-hook-linux
+dist-hook-linux:
+# These symbolic links are copied from the build directory due to including
+# `linux/dev/include linux/src/include' to `EXTRA_DIST' above.
+	rm -f					\
+	  $(distdir)/linux/dev/include/asm	\
+	  $(distdir)/linux/src/include/asm
+
+#
 # Architecture specific parts.
 #
 
diff --git a/linux/configfrag.ac b/linux/configfrag.ac
index 286f881..648f109 100644
--- a/linux/configfrag.ac
+++ b/linux/configfrag.ac
@@ -559,8 +559,8 @@ if [ x"$device_driver_group_wireless" = xselected ]; then]
 [fi]
 
 #
-# Create `asm-SYSTYPE' links.
+# Set up `asm-SYSTYPE' links.
 #
 
-AC_CONFIG_LINKS([linux/src/include/asm:linux/src/include/asm-${systype}
-		 linux/dev/include/asm:linux/dev/include/asm-${systype}])
+AC_CONFIG_LINKS([linux/src/include/asm:linux/src/include/asm-$systype
+		 linux/dev/include/asm:linux/dev/include/asm-$systype])