change flag -xs to -i, -xm to -m

util/cpp/cpp.6

@@ -49,10 +49,10 @@ If \fIfile\fP is given, generate preprocessor output on standard output,
 and generate the list of makefile dependencies on file \fIfile\fP.
 .IP -\fBA\fR[\fIfile\fR]
 identical to the -d option.
-.IP -\fBxs\fR
+.IP -\fBi\fR
 when generating makefile dependencies, do not include files from
 /usr/include.
-.IP -\fBxm\fR
+.IP -\fBm\fR
 when generating makefile dependencies, generate them in the following format:
 .RS
 .IP "file.o: file1.h"

util/cpp/main.c

@@ -140,7 +140,7 @@ add_dependency(s)
 dependency(s, source)
 	char *s, *source;
 {
-	if (options['s'] && !strncmp(s, "/usr/include/", 13)) {
+	if (options['i'] && !strncmp(s, "/usr/include/", 13)) {
 		return;
 	}
 	if (options['m'] && source) {

util/cpp/options.c

@@ -28,7 +28,6 @@ do_option(text)
 {
 	switch(*text++)	{
 	case '-':
-	case 'x':
 		options[*text] = 1;
 		break;
 	case 'u':
@@ -54,6 +53,11 @@ do_option(text)
 			do_preprocess = 0;
 		}
 		break;
+	case 'm':
+	case 'i':
+		options[*(text-1)] = 1;
+		break;
+
 	case 'D' :	/* -Dname :	predefine name		*/
 	{
 		register char *cp = text, *name, *mactext;