summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bushnell <thomas@gnu.org>1999-04-26 05:03:53 +0000
committerThomas Bushnell <thomas@gnu.org>1999-04-26 05:03:53 +0000
commite16ae12555c7dd7167069208dd598c605510a9a0 (patch)
tree17b4ca44af4bc30cb762bd9038c82ce24876bfca
parent02ee93554353c526042c1afe44d37122193b5018 (diff)
1999-04-14 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
* version.c (version): Update to 1.1.92. 1999-03-01 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> Version 1.1.91. * version.c (version): Update to 1.1.91. 1999-02-28 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> * Makefile.in (clean): Don't move device-drivers.h, because it is not in the top directory any longer. (distclean): Remove config.cache and config.log. * i386/Makefile.in (distclean): Remove config.status, config.log and Makefile. * i386/linux/Makefile.in (distclean): Remove config.status, config.log, Makefile and device-drivers.h. 1999-02-27 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> * Makefile.in: Omit to detect if com or lpr is used, and don't use linux.o. (objfiles): Add $(systype)/sysdep.o. (clean): Chain the target to $(systype). (distclean): Likewise. (mostlyclean): Likewise. (maintainer-clean): Likewise. (install-headers): Likewise. (install-kernel): Likewise. * configure.in: AC_CONFIG_SUBDIRS ${systype} instead of linux. (--disable-linuxdev): Deleted. (--disable-com): Likewise. (--enable-lpr): Likewise. * i386/Makefile.in: New file. * i386/configure.in: Likewise. * i386/Makefrag (DEFINES): Add -DLINUX_DEV. (objfiles): Always add com.o. If MACH_LPR is defined, then add lpr.o. * linux/Drivers.in: Moved to ... * i386/linux/Drivers.in: ... here. Include ../../aclocal.m4. (mkdir_p): New function to create the linux include dirs. * linux/Makefile.in: Moved to ... * i386/linux/Makefile.in: ... here, and modify so that paths are valid. (clean): New target. (distclean): Likewise. (mostlyclean): Likewise. (maintainer-clean): Likewise. * linux/src/include/linux/autoconf.h: Removed. * linux/dev/include/linux/autoconf.h: Moved to ... * i386/linux/dev/include/linux/autoconf.h: ... here. * linux/dev/arch/i386/linux_emul.h: Moved to ... * i386/linux/dev/include/linux_emul.h: ... here. * linux/device-drivers.h.in: Moved to ... * i386/linux/device-drivers.h.in: ... here. * linux/aclocal.m4: Removed. * linux/configure: Likewise. 1999-02-05 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> Version 1.1.90. * version.c (version): Update to 1.1.90. 1999-02-14 Gordon Matzigkeit <gord@trick.fig.org> * Makefile.in (install-kernel): Be sure that $(bootdir) is created before installing the kernel. 1999-02-06 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> * configure.in: Enable com by default, because current kbd and mouse can't be linked without com. Reported by M. Meiarashi <mes@st.rim.or.jp>. 1999-02-01 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> * linux/dev/glue/block.c (dev_getstat): Fix a missing `struct'. * device/cons.c (cninit): Don't call kmsginit. * kmsg.c (kmsg_buffer): Defined as static. (kmsg_write_offset): Likewise. (kmsg_read_offset): Likewise. (kmsg_read_queue): Likewise. (kmsg_in_use): Likewise. (kmsg_lock): Likewise. (kmsginit): Likewise, and call queue_init instead of setting PREV and NEXT manually. (kmsg_done_init): New variable. (kmsg_putchar): Call kmsginit if not initialized yet. (kmsggetstat): New function. * kmsg.h (kmsggetstat): Add the prototype. * i386/i386at/kd_event.c (kbdgetstat): Handle DEV_GET_SIZE. (kbdread): Check if the amount a user specify is a multiple of sizeof(kd_event). * i386/i386at/kd_mouse.c (mousegetstat): New function. (mouseread): Check if the amount a user specify is a multiple of sizeof(kd_event). * i386/i386at/conf.c (dev_name_list): Set the mouse getstat entry to mousegetstat and the kmsg getstat entry to kmsggetstat. Use MACH_COM instead of NCOM to determine if com is used. Use MACH_LPR instead of NLPR to determine if lpr is used. * configure.in (--enable-com): New option. (--enable-lpr): Likewise. * Makefile.in (enable_com): New variable. (enable_lpr): Likewise. * i386/Makefrag (i386at-files): Remove com.c. (objfiles): Add com.o if enable_com is yes, and lpr.o if enable_lpr is yes. 1999-01-25 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> * Makefile.in (install-headers): New target for installing only the headers. (install-kernel): New target for installing only the kernel. (mkheaderdirs): New target for making the headers installation directories. (mkkerneldirs): New target for making the kernel installation directory. (install): Do nothing by itself, but depend on install-kernel and install-headers. 1999-01-24 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> * device/kmsg.h (KMSGBUFSIZE): Deleted. * device/kmsg.c: Rewritten completely to provide stream interface. * linux/dev/glue/block.c (device_getstat): Added V_GETPARMS support. * config.guess: New version from automake-1.4. * config.sub: Likewise. * install-sh: Likewise. 1999-01-24 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> * Makefile.in (clean): Don't hang if device-drivers.h doesn't exist. * linux/Makefile.in (CPPFLAGS): Fix a typo. 1999-01-16 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> * device/kmsg.c: Fixed the copyright notice. (MACH_KMSG): Removed. * Makefile.in (enable_kmsg): New variable. (objfiles): Add kmsg.o, if and only if enable_kmsg is yes. 1998-12-18 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> * Makefile.in (objfiles): Add kmsg.o. * device/cons.c: Include <device/io_req.h>. * device/kmsg.c: Rewritten almost entirely. 1998-12-02 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> * configure.in: Fix linuxdev option handling. * linux/Drivers.in: Remove linuxdev option and fix linking files. * linux/Makefile.in: Replace @DEFS@ with -DLINUX_DEV. * linux/dev/arch/i386/kernel/irq.c: Include missing header files. * linux/dev/arch/i386/kernel/setup.c: Include <device-drivers.h>. * linux/dev/glue/kmem.c: Add printf declaration. * linux/dev/glue/misc.c: Include <linux/types.h>. * linux/dev/init/main.c: Call linux_sched_init instead of sched_init. * linux/dev/kernel/sched.c: Add timer_bh declaration. (tqueue_bh): Fix the argument. (linux_sched_init): Renamed from sched_init. 1998-12-06 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> Add kmsg device. * Makefile.in (device-files): Add kmsg.c and kmsg.h. * configure.in (--enable-kmsg): New option. * device/cons.c: Include kmsg.h. (cninit): Call kmsginit if MACH_KMSG is defined. (cnputc): Call kmsg_putchar if MACH_KMSG is defined. * device/kmsg.c: New file. * device/kmsg.h: Likewise. * i386/i386at/conf.c (dev_name_list): Add kmsg entry. 1998-12-01 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> * i386/i386at/i386at_ds_routines.c: Include <linux/device-drivers.h> only if LINUX_DEV is defined. Reported by UCHIYAMA Yasushi <uch@nop.or.jp>. * device/ds_routines.c: Likewise. * configure.in: AC_CONFIG_SUBDIRS(linux) instead of linuxdev. (--disable-linuxdev): New option. * linux/Makefile.in (CPPFLAGS): Remove -DLINUX_DEV, and add @DEFS@. (objfiles): Add linux.o only if LINUX_DEV is defined. * linux/Drivers.in (--disable-linuxdev): New option. * i386/Makefrag (DEFINES): Remove -DLINUX_DEV. 1998-11-30 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> Clean up linux emulation code to make it architecture-independent as much as possible. * linux: Renamed from linuxdev. * Makefile.in (objfiles): Add linux.o instead of linuxdev.o. (MAKE): New variable. Used for the linux.o target. * configure.in: Add AC_CHECK_TOOL(MAKE, make). * i386/i386/spl.h: Include <i386/ipl.h>, for compatibility with OSF Mach 3.0. Suggested by Elgin Lee <ehl@funghi.com>. * linux/src: Renamed from linux/linux. * linux/dev: Renamed from linux/mach. * linux/Drivers.in (AC_INIT): Use dev/include/linux/autoconf.h, instead of mach/include/linux/autoconf.h. * Makefile.in (all): Target ../linux.o instead of ../linuxdev.o. * linux/dev/drivers/block/genhd.c: Include <machine/spl.h> instead of <i386/ipl.h>. * linux/dev/drivers/net/auto_irq.c: Remove unneeded header files, <i386/ipl.h> and <i386/pic.h>. * linux/dev/init/main.c: Many i386-dependent codes moved to ... * linux/dev/arch/i386/irq.c: ... here. * linux/dev/arch/i386/setup.c: New file. * linux/dev/arch/i386/linux_emul.h: Likewise. * linux/dev/arch/i386/glue/timer.c: Merged into sched.c. * linux/dev/arch/i386/glue/sched.c: Include <machine/spl.h> instead of <i386/ipl.h>, and moved to ... * linux/dev/kernel/sched.c: ... here. * linux/dev/arch/i386/glue/block.c: Include <machine/spl.h> and <linux_emul.h>, instead of i386-dependent header files, and moved to ... * linux/dev/glue/blocl.c: ... here. * linux/dev/arch/i386/glue/net.c: Include <machine/spl.h> and <linux_emul.h>, instead of i386-dependent header files, and moved to ... * linux/dev/glue/net.c: ... here. * linux/dev/arch/i386/glue/misc.c: Remove `x86' and moved to ... * linux/dev/glue/misc.c: ... here. * linux/dev/arch/i386/glue/kmem.c: Moved to ... * linux/dev/glue/kmem.c: ... here. 1998-11-24 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> * linuxdev: Heavily changed. It becomes more Linux-like file hierarchy as suggested by Roland McGrath <roland@frob.com>. * linuxdev/linux: Contain original Linux source files. * linuxdev/mach: Contain modified source files for Mach. * linuxdev/mach/arch/i386/glue: XXX Contain files that are not easy to segregate. * Makefile.in: Call `make -C linuxdev all', instead of include linuxdev/Makefrag. 1998-11-14 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> * Makefile.in (clib-routines.o): Add -L option to search libc.a. Reported by TAKEUCHI Yoji <ytakeuch@po.iijnet.or.jp>. 1998-11-06 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> * i386/i386at/gpl/linux: Moved to ... * linuxdev: ... here. * i386/Makefrag: Linux drivers specific code moved to ... * linuxdev/Makefrag: ... here. * i386/Files: Recreated. * i386/Subdirs: Likewise. * linuxdev/drivers: New directory. * linuxdev/arch: Likewise. * linuxdev/arch/i386: Likewise. * linuxdev/{block,scsi,net,pci}: Moved to ... * linuxdev/drivers/{block,scsi,net,pci}: ... here. * i386/{Drivers.in,device-drivers.h.in,driverlist.in}: Moved to ... * linuxdev/{Drivers.in,device-drivers.h.in,driverlist.in}: ... here. * linuxdev/{linux_emul.h,linux_*.c}: Moved to ... * linuxdev/arch/i386/{linux_emul.h,linux_*.c}: ... here. * linuxdev/arch/i386/linux_block.c: Include <linux_emul.h>, instead of <i386at/gpl/linux/linux_emul.h>. * linuxdev/arch/i386/linux_init.c: Likewise. * linuxdev/arch/i386/linux_kmem.c: Likewise. * linuxdev/arch/i386/linux_misc.c: Likewise. * linuxdev/arch/i386/linux_net.c: Likewise. * linuxdev/arch/i386/linux_sched.c: Likewise. * device/ds_routines.c: Include <linuxdev/device-drivers.h>, instead of <i386/device-drivers.h>. * linuxdev/arch/i386/linux_init.c: Likewise. * linuxdev/include/linux/autoconf.h: Likewise. * Makefile.in: Include $(srcdir)/linuxdev/Makefrag. * linuxdev/Drivers.in (AC_INIT): Use include/linux/autoconf.h, instead of i386/i386asm.sym.
-rw-r--r--Makefile.in54
1 files changed, 41 insertions, 13 deletions
diff --git a/Makefile.in b/Makefile.in
index 2b5582d..f74a8ed 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
# Makefile for Mach 4 kernel directory
-# Copyright 1997 Free Software Foundation, Inc.
+# Copyright 1997, 1999 Free Software Foundation, Inc.
#
# Permission to use, copy, modify and distribute this software and its
# documentation is hereby granted, provided that both the copyright
@@ -36,6 +36,13 @@ else
enable_kdb=no
endif
+# Detect if the user wants KMSG
+ifeq ($(findstring -DMACH_KMSG,@DEFS@),-DMACH_KMSG)
+enable_kmsg=yes
+else
+enable_kmsg=no
+endif
+
# Programs found by configure.
AWK = @AWK@
INSTALL = @INSTALL@
@@ -43,6 +50,7 @@ CC = @CC@
LD = @LD@
NM = @NM@
MIG = @MIG@
+MAKE = @MAKE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
@@ -111,7 +119,7 @@ device-files = blkio.c chario.c cirbuf.c cons.c dev_lookup.c dev_name.c \
dev_pager.c device_init.c dk_label.c ds_routines.c net_io.c subrs.c \
buf.h cirbuf.h conf.h cons.h dev_hdr.h dev_master.h device_port.h \
device_types_kernel.h ds_routines.h errno.h if_ether.h if_hdr.h \
- io_req.h net_io.h param.h tty.h memory_object_reply.cli \
+ io_req.h kmsg.c kmsg.h net_io.h param.h tty.h memory_object_reply.cli \
dev_forward.defs device_pager.srv device_reply.cli device.srv
# IPC implementation
@@ -171,6 +179,9 @@ vpath %.c $(srcdir)/ipc $(srcdir)/kern $(srcdir)/util $(srcdir)/vm
# XXX functions in device/subrs.c should each be moved elsewhere
objfiles += cons.o dev_lookup.o dev_name.o dev_pager.o device_init.o \
ds_routines.o subrs.o net_io.o blkio.o chario.o
+ifeq ($(enable_kmsg),yes)
+objfiles += kmsg.o
+endif
vpath %.c $(srcdir)/device
# DDB support -- eventually to die. Please.
@@ -232,7 +243,8 @@ endif
Wl-u = -Wl,-u,
clib-routines.o: Makefile
$(CC) -o $@ -r -nostartfiles -nostdlib -static -x c /dev/null \
- $(addprefix $(Wl-u),$(clib-routines)) -lc
+ $(addprefix $(Wl-u),$(clib-routines)) \
+ -L`dirname \`$(CC) --print-file-name=libc.a\`` -lc
# This rule checks clib-routines and makes sure it doesn't have any
# extra symbols.
@@ -292,6 +304,10 @@ INCLUDES += -I. -I$(srcdir) -I$(srcdir)/include \
include $(sysdep)/Makefrag
+objfiles += $(systype)/sysdep.o
+$(systype)/sysdep.o: $(systype)
+ cd $(systype) && $(MAKE) all
+
CPPFLAGS += -nostdinc $(DEFINES) $(INCLUDES)
MIGFLAGS += $(CPPFLAGS)
@@ -302,18 +318,20 @@ MIGFLAGS += $(CPPFLAGS)
all: kernel
clean:
- mv device-drivers.h FOO
+ cd $(systype) && $(MAKE) clean
rm -f *.o *.d kernel
rm -f *.symc *.symc.o *_user.c *_server.c *.h
rm -f *.migs_d *.migsh_d *.migu_d *.miguh_d
- mv FOO device-drivers.h
distclean: clean
- rm -f config.status Makefile driverlist
+ cd $(systype) && $(MAKE) distclean
+ rm -f config.status config.cache config.log Makefile driverlist
mostlyclean: distclean
+ cd $(systype) && $(MAKE) mostlyclean
maintainer-clean: mostlyclean
+ cd $(systype) && $(MAKE) maintainer-clean
rm -f $(srcdir)/configure $(all-archs-configures)
check:
@@ -334,9 +352,7 @@ kernel: $(objfiles)
#
installed-headers-names = $(addprefix $(includedir)/,$(installed-headers))
installed-sysdep-headers-names = $(addprefix $(includedir)/,$($(systype)-installed-headers))
-install: mkinstalldirs kernel $(installed-headers-names) $(installed-sysdep-headers-names)
- $(INSTALL_PROGRAM) kernel $(bootdir)/gnumach
- ln -sf $(systype) $(includedir)/mach/machine
+install: install-headers install-kernel
$(installed-headers-names): $(includedir)/%: $(srcdir)/include/%
$(INSTALL_DATA) $< $@
@@ -344,10 +360,22 @@ $(installed-headers-names): $(includedir)/%: $(srcdir)/include/%
$(installed-sysdep-headers-names): $(includedir)/%: $(sysdep)/include/%
$(INSTALL_DATA) $< $@
-mkinstalldirs:
- mkdir -p $(bootdir) $(includedir) $(includedir)/device \
- $(includedir)/mach $(includedir)/mach/$(systype) \
- $(libexecdir) $(includedir)/mach/exec $(bindir)
+install-headers: mkheaderdirs $(installed-headers-names) $(installed-sysdep-headers-names)
+ ln -sf $(systype) $(includedir)/mach/machine
+ cd $(systype) && $(MAKE) install-headers
+
+install-kernel: kernel mkkerneldirs
+ $(INSTALL_PROGRAM) kernel $(bootdir)/gnumach
+ cd $(systype) && $(MAKE) install-kernel
+
+# Note: The `-p' option to mkdir is not compliant with
+# the GNU Coding Standards. -- okuji
+mkheaderdirs:
+ mkdir -p $(includedir) $(includedir)/device $(includedir)/mach \
+ $(includedir)/mach/$(systype) $(includedir)/mach/exec
+
+mkkerneldirs:
+ mkdir -p $(bootdir)
#