Add more options into the conf/options and i386/conf/options.i386 files

and the #include hooks so that 'make depend' is more useful.  This
covers most of the options I regularly use (but not all) and some other
easy ones.

16 files changed, 80 insertions, 16 deletions

diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index b8bf0a6..067d4e7 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.173 1996/01/27 02:33:08 bde Exp $
+ *	$Id: machdep.c,v 1.174 1996/02/13 10:30:36 phk Exp $
  */
 
 #include "npx.h"
@@ -43,6 +43,7 @@
 #include "opt_sysvipc.h"
 #include "opt_ddb.h"
 #include "opt_bounce.h"
+#include "opt_machdep.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/conf/options b/sys/conf/options
index 63889ed..786cb06 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,14 +1,51 @@
+# Option name	filename
 BOUNCE_BUFFERS	opt_bounce.h
 DDB
+KTRACE
 FDESC		opt_staticfs.h
 KERNFS		opt_staticfs.h
-KTRACE
 NULLFS		opt_staticfs.h
 PORTAL		opt_staticfs.h
 PROCFS		opt_staticfs.h
+UMAPFS		opt_staticfs.h
+UNION		opt_staticfs.h
 QUOTA
 SYSVSHM		opt_sysvipc.h
 SYSVSEM		opt_sysvipc.h
 SYSVMSG		opt_sysvipc.h
-UMAPFS		opt_staticfs.h
-UNION		opt_staticfs.h
+UCONSOLE
+# Begin options used only in param.c
+NMBCLUSTERS	opt_param.h
+SHMMAXPGS	opt_param.h
+SHMMAX		opt_param.h
+SHMMIN		opt_param.h
+SHMMNI		opt_param.h
+SHMSEG		opt_param.h
+SHMALL		opt_param.h
+SEMMAP		opt_param.h
+SEMMNI		opt_param.h
+SEMMNS		opt_param.h
+SEMMNU		opt_param.h
+SEMMSL		opt_param.h
+SEMOPM		opt_param.h
+SEMUME		opt_param.h
+SEMUSZ		opt_param.h
+SEMVMX		opt_param.h
+SEMAEM		opt_param.h
+MSGMAX		opt_param.h
+MSGMNI		opt_param.h
+MSGMNB		opt_param.h
+MSGTQL		opt_param.h
+MSGSSZ		opt_param.h
+MSGSEG		opt_param.h
+NBUF		opt_param.h
+# end param.c options
+# generic SCSI options
+SCSI_REPORT_GEOMETRY	opt_scsi.h
+SCSI_DELAY		opt_scsi.h
+# Resource limits
+CHILD_MAX	opt_rlimit.h
+OPEN_MAX	opt_rlimit.h
+# Net stuff
+MROUTING	opt_mrouting.h
+GATEWAY		opt_defunct.h
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 39039ec..b48ef2c 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -2,3 +2,9 @@ BOUNCEPAGES		opt_bounce.h
 USER_LDT
 MATH_EMULATE		opt_math_emulate.h
 GPL_MATH_EMULATE	opt_math_emulate.h
+MAXCONS			opt_syscons.h
+IBCS2			opt_ibcs2.h
+SHOW_BUSYBUFS		opt_machdep.h
+PANIC_REBOOT_WAIT_TIME	opt_machdep.h
+LARGEMEM		opt_machdep.h
+MAXMEM			opt_machdep.h
diff --git a/sys/conf/param.c b/sys/conf/param.c
index b99f78a..5e5b64b 100644
--- a/sys/conf/param.c
+++ b/sys/conf/param.c
@@ -36,10 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.c	8.2 (Berkeley) 1/21/94
- * $Id: param.c,v 1.13 1995/12/10 13:44:55 phk Exp $
+ * $Id: param.c,v 1.14 1996/01/04 20:28:02 wollman Exp $
  */
 
 #include "opt_sysvipc.h"
+#include "opt_param.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 33dded3..3fe78da 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,12 +25,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.141 1996/02/08 06:30:31 pst Exp $
+ *  $Id: syscons.c,v 1.142 1996/02/13 14:15:13 phk Exp $
  */
 
 #include "sc.h"
 #include "apm.h"
 #include "opt_ddb.h"
+#include "opt_syscons.h"
 
 #if NSC > 0
 #include <sys/param.h>
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index 39039ec..b48ef2c 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -2,3 +2,9 @@ BOUNCEPAGES		opt_bounce.h
 USER_LDT
 MATH_EMULATE		opt_math_emulate.h
 GPL_MATH_EMULATE	opt_math_emulate.h
+MAXCONS			opt_syscons.h
+IBCS2			opt_ibcs2.h
+SHOW_BUSYBUFS		opt_machdep.h
+PANIC_REBOOT_WAIT_TIME	opt_machdep.h
+LARGEMEM		opt_machdep.h
+MAXMEM			opt_machdep.h
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index b8bf0a6..067d4e7 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.173 1996/01/27 02:33:08 bde Exp $
+ *	$Id: machdep.c,v 1.174 1996/02/13 10:30:36 phk Exp $
  */
 
 #include "npx.h"
@@ -43,6 +43,7 @@
 #include "opt_sysvipc.h"
 #include "opt_ddb.h"
 #include "opt_bounce.h"
+#include "opt_machdep.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index 33dded3..3fe78da 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/syscons.c
@@ -25,12 +25,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.141 1996/02/08 06:30:31 pst Exp $
+ *  $Id: syscons.c,v 1.142 1996/02/13 14:15:13 phk Exp $
  */
 
 #include "sc.h"
 #include "apm.h"
 #include "opt_ddb.h"
+#include "opt_syscons.h"
 
 #if NSC > 0
 #include <sys/param.h>
diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c
index 33dded3..3fe78da 100644
--- a/sys/isa/syscons.c
+++ b/sys/isa/syscons.c
@@ -25,12 +25,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.141 1996/02/08 06:30:31 pst Exp $
+ *  $Id: syscons.c,v 1.142 1996/02/13 14:15:13 phk Exp $
  */
 
 #include "sc.h"
 #include "apm.h"
 #include "opt_ddb.h"
+#include "opt_syscons.h"
 
 #if NSC > 0
 #include <sys/param.h>
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index cfd8918..4fb0fdd 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -39,9 +39,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)init_main.c	8.9 (Berkeley) 1/21/94
- * $Id: init_main.c,v 1.37 1996/01/19 03:57:59 dyson Exp $
+ * $Id: init_main.c,v 1.38 1996/02/23 19:44:10 peter Exp $
  */
 
+#include "opt_rlimit.h"
+
 #include <sys/param.h>
 #include <sys/filedesc.h>
 #include <sys/errno.h>
diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c
index b99f78a..5e5b64b 100644
--- a/sys/kern/subr_param.c
+++ b/sys/kern/subr_param.c
@@ -36,10 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.c	8.2 (Berkeley) 1/21/94
- * $Id: param.c,v 1.13 1995/12/10 13:44:55 phk Exp $
+ * $Id: param.c,v 1.14 1996/01/04 20:28:02 wollman Exp $
  */
 
 #include "opt_sysvipc.h"
+#include "opt_param.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 03998fb..7fe9e22 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.c	8.8 (Berkeley) 1/21/94
- * $Id: tty.c,v 1.77 1995/12/15 02:18:06 bde Exp $
+ * $Id: tty.c,v 1.78 1995/12/16 21:45:02 bde Exp $
  */
 
 /*-
@@ -68,6 +68,7 @@
  */
 
 #include "snp.h"
+#include "opt_uconsole.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/net/route.c b/sys/net/route.c
index 60ed085..06691fd 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.c	8.2 (Berkeley) 11/15/93
- *	$Id: route.c,v 1.29 1995/12/14 09:53:27 phk Exp $
+ *	$Id: route.c,v 1.30 1996/01/24 20:27:19 wollman Exp $
  */
 
+#include "opt_mrouting.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 8d8742da..90db6b6 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -9,9 +9,10 @@
  * Modified by Bill Fenner, PARC, April 1995
  *
  * MROUTING Revision: 3.5
- * $Id: ip_mroute.c,v 1.26 1995/12/02 19:38:03 bde Exp $
+ * $Id: ip_mroute.c,v 1.27 1995/12/14 09:53:43 phk Exp $
  */
 
+#include "opt_mrouting.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/scsi/od.c b/sys/scsi/od.c
index 9d76c43..9897d36 100644
--- a/sys/scsi/od.c
+++ b/sys/scsi/od.c
@@ -28,7 +28,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: od.c,v 1.11 1996/01/05 20:12:42 wollman Exp $
+ *	$Id: od.c,v 1.12 1996/01/27 04:18:00 bde Exp $
  */
 
 /*
@@ -37,6 +37,7 @@
  */
 
 #include "opt_bounce.h"
+#include "opt_scsi.h"
 
 #define SPLOD splbio
 #include <sys/types.h>
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index b9f1f96..b9fe20e 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -14,10 +14,11 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
  *
- *      $Id: sd.c,v 1.83 1996/01/05 20:12:49 wollman Exp $
+ *      $Id: sd.c,v 1.84 1996/01/27 04:18:02 bde Exp $
  */
 
 #include "opt_bounce.h"
+#include "opt_scsi.h"
 
 #define SPLSD splbio
 #include <sys/param.h>