Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/gnumach

5 files changed, 74 insertions, 8 deletions

diff --git a/Makefile.am b/Makefile.am
index 2907518..bc8a9e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -167,11 +167,9 @@ exec_boot_PROGRAMS = \
 #
 
 EXTRA_DIST += \
-	Makefile.correct_output_files_for_.S_files.patch \
 	config.status.dep.patch
 
 EXTRA_DIST += \
-	ChangeLog.0 ChangeLog.00 \
 	DEVELOPMENT
 
 dist-hook:
diff --git a/Makefrag.am b/Makefrag.am
index 0377e80..aa6b228 100644
--- a/Makefrag.am
+++ b/Makefrag.am
@@ -102,6 +102,7 @@ libkernel_a_SOURCES += \
 	ipc/mach_msg.c \
 	ipc/mach_msg.h \
 	ipc/mach_port.c \
+	ipc/mach_port.h \
 	ipc/mach_rpc.c \
 	ipc/mach_debug.c \
 	ipc/port.h
@@ -137,6 +138,7 @@ libkernel_a_SOURCES += \
 	kern/ipc_kobject.c \
 	kern/ipc_kobject.h \
 	kern/ipc_mig.c \
+	kern/ipc_mig.h \
 	kern/ipc_sched.c \
 	kern/ipc_sched.h \
 	kern/ipc_tt.c \
@@ -153,6 +155,7 @@ libkernel_a_SOURCES += \
 	kern/mach_factor.h \
 	kern/mach_param.h \
 	kern/machine.c \
+	kern/machine.h \
 	kern/macro_help.h \
 	kern/pc_sample.c \
 	kern/pc_sample.h \
@@ -183,7 +186,6 @@ libkernel_a_SOURCES += \
 	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 \
@@ -207,8 +209,10 @@ EXTRA_DIST += \
 
 libkernel_a_SOURCES += \
 	util/putchar.c \
+	util/putchar.h \
 	util/puts.c \
-	util/atoi.c
+	util/atoi.c \
+	util/atoi.h
 
 #
 # Virtual memory implementation.
@@ -235,6 +239,8 @@ libkernel_a_SOURCES += \
 	vm/vm_pageout.c \
 	vm/vm_pageout.h \
 	vm/vm_resident.c \
+	vm/vm_resident.h \
+	vm/vm_types.h \
 	vm/vm_user.c \
 	vm/vm_user.h
 EXTRA_DIST += \
@@ -276,6 +282,7 @@ libkernel_a_SOURCES += \
 	device/net_io.h \
 	device/param.h \
 	device/subrs.c \
+	device/subrs.h \
 	device/tty.h
 EXTRA_DIST += \
 	device/device.srv \
diff --git a/i386/Makefrag.am b/i386/Makefrag.am
index b2bad86..8cb7824 100644
--- a/i386/Makefrag.am
+++ b/i386/Makefrag.am
@@ -19,6 +19,7 @@
 
 libkernel_a_SOURCES += \
 	i386/i386at/autoconf.c \
+	i386/i386at/autoconf.h \
 	i386/i386at/conf.c \
 	i386/i386at/cons_conf.c \
 	i386/i386at/idt.h \
@@ -33,12 +34,14 @@ if PLATFORM_at
 libkernel_a_SOURCES += \
 	i386/i386at/boothdr.S \
 	i386/i386at/com.c \
+	i386/i386at/com.h \
 	i386/i386at/comreg.h \
 	i386/i386at/cram.h \
 	i386/i386at/disk.h \
 	i386/i386at/i8250.h \
 	i386/i386at/immc.c \
 	i386/i386at/int_init.c \
+	i386/i386at/int_init.h \
 	i386/i386at/interrupt.S \
 	i386/i386at/kd.c \
 	i386/i386at/kd.h \
@@ -101,10 +104,12 @@ libkernel_a_SOURCES += \
 	i386/i386/locore.S \
 	i386/i386/locore.h \
 	i386/i386/loose_ends.c \
+	i386/i386/loose_ends.h \
 	i386/i386/mach_param.h \
 	i386/i386/machine_routines.h \
 	i386/i386/machine_task.c \
 	i386/i386/machspl.h \
+	i386/i386/model_dep.h \
 	i386/i386/mp_desc.c \
 	i386/i386/mp_desc.h \
 	i386/i386/pcb.c \
@@ -122,7 +127,6 @@ libkernel_a_SOURCES += \
 	i386/i386/task.h \
 	i386/i386/thread.h \
 	i386/i386/time_stamp.h \
-	i386/i386/timer.h \
 	i386/i386/trap.c \
 	i386/i386/trap.h \
 	i386/i386/tss.h \
@@ -134,7 +138,8 @@ libkernel_a_SOURCES += \
 	i386/i386/zalloc.h \
 	i386/intel/pmap.c \
 	i386/intel/pmap.h \
-	i386/intel/read_fault.c
+	i386/intel/read_fault.c \
+	i386/intel/read_fault.h
 EXTRA_DIST += \
 	i386/i386/mach_i386.srv
 
@@ -240,4 +245,8 @@ EXTRA_DIST += \
 
 if PLATFORM_xen
 include i386/xen/Makefrag.am
+
+libkernel_a_SOURCES += \
+	i386/i386/xen.h
+
 endif
diff --git a/linux/Makefrag.am b/linux/Makefrag.am
index 52bc890..fccb807 100644
--- a/linux/Makefrag.am
+++ b/linux/Makefrag.am
@@ -528,7 +528,8 @@ endif
 
 if device_driver_sis900
 liblinux_a_SOURCES += \
-	linux/src/drivers/net/sis900.c
+	linux/src/drivers/net/sis900.c \
+	linux/src/drivers/net/sis900.h
 endif
 
 if device_driver_sk_g16
diff --git a/xen/Makefrag.am b/xen/Makefrag.am
index c5792a9..61eb475 100644
--- a/xen/Makefrag.am
+++ b/xen/Makefrag.am
@@ -21,12 +21,63 @@
 #
 
 libkernel_a_SOURCES += \
+	xen/public/arch-x86_32.h \
+	xen/public/arch-x86_64.h \
+	xen/public/arch-x86/xen.h \
+	xen/public/arch-x86/xen-mca.h \
+	xen/public/arch-x86/xen-x86_32.h \
+	xen/public/arch-x86/xen-x86_64.h \
+	xen/public/callback.h \
+	xen/public/COPYING \
+	xen/public/dom0_ops.h \
+	xen/public/domctl.h \
+	xen/public/elfnote.h \
+	xen/public/elfstructs.h \
+	xen/public/event_channel.h \
+	xen/public/features.h \
+	xen/public/grant_table.h \
+	xen/public/io/blkif.h \
+	xen/public/io/console.h \
+	xen/public/io/fbif.h \
+	xen/public/io/fsif.h \
+	xen/public/io/kbdif.h \
+	xen/public/io/netif.h \
+	xen/public/io/pciif.h \
+	xen/public/io/protocols.h \
+	xen/public/io/ring.h \
+	xen/public/io/tpmif.h \
+	xen/public/io/xenbus.h \
+	xen/public/io/xs_wire.h \
+	xen/public/kexec.h \
+	xen/public/libelf.h \
+	xen/public/memory.h \
+	xen/public/nmi.h \
+	xen/public/physdev.h \
+	xen/public/platform.h \
+	xen/public/sched.h \
+	xen/public/sysctl.h \
+	xen/public/trace.h \
+	xen/public/vcpu.h \
+	xen/public/version.h \
+	xen/public/xencomm.h \
+	xen/public/xen-compat.h \
+	xen/public/xen.h \
+	xen/public/xenoprof.h \
 	xen/block.c \
+	xen/block.h \
 	xen/console.c \
+	xen/console.h \
 	xen/evt.c \
+	xen/evt.h \
 	xen/grant.c \
+	xen/grant.h \
 	xen/net.c \
+	xen/net.h \
 	xen/ring.c \
+	xen/ring.h \
 	xen/store.c \
+	xen/store.h \
 	xen/time.c \
-	xen/xen.c
+	xen/time.h \
+	xen/xen.c \
+	xen/xen.h