Makefile.in (c-options.c, [...]): Parallel make safe.

* Makefile.in (c-options.c, c-options.h): Parallel make safe.
	* c.opt: End in blank line.
	* opts.sh: Take AWK from environment if available; use C locale.

From-SVN: r67305

gcc/ChangeLog

@@ -1,3 +1,9 @@
+2003-06-01  Neil Booth  <neil@daikokuya.co.uk>
+
+	* Makefile.in (c-options.c, c-options.h): Parallel make safe.
+	* c.opt: End in blank line.
+	* opts.sh: Take AWK from environment if available; use C locale.
+
 2003-06-01  Andreas Schwab  <schwab@suse.de>
 
 	* config/m68k/linux.h: Remove code protected by USE_GNULIBC_1.

gcc/Makefile.in

@@ -1320,9 +1320,12 @@ c-opts.o : c-opts.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
 		$< $(OUTPUT_OPTION) @TARGET_SYSTEM_ROOT_DEFINE@
 
-c-options.h c-options.c: c.opt $(srcdir)/opts.sh
+c-options.c: c.opt $(srcdir)/opts.sh
 	$(SHELL) $(srcdir)/opts.sh c-options.c c-options.h $(srcdir)/c.opt
 
+c-options.h: c-options.c
+	@true
+
 c-cppbuiltin.o : c-cppbuiltin.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
 	$(TREE_H) $(C_COMMON_H) c-pragma.h flags.h toplev.h langhooks.h \
 	output.h except.h real.h $(TM_P_H)

gcc/c.opt

@@ -598,3 +598,5 @@ C ObjC C++ ObjC++
 
 w
 C ObjC C++ ObjC++
+
+; This comment is to ensure we retain the blank line above.

gcc/opts.sh

@@ -19,7 +19,15 @@
 #
 # Usage: opts.sh outfile.c outfile.h file1.opt [file2.opt, ...]
 
-AWK=/usr/bin/awk
+# Always operate in the C locale.
+LANG=C
+LANGUAGE=C
+LC_ALL=C
+export LANG LANGUAGE LC_ALL
+
+# Set AWK if environment has not already set it.
+AWK=${AWK-awk}
+
 SORT=sort		# Could be /bin/sort or /usr/bin/sort
 
 C_FILE=$1; shift
@@ -30,7 +38,7 @@ cat "$@" | ${AWK} '
 	# Ignore comments and blank lines
 	/^[ \t]*(;|$)/	{ next }
 	/^[^ \t]/ 	{ gsub ("\n", "\034", $0); print }
-' | LANG=C ${SORT} | ${AWK} '
+' | ${SORT} | ${AWK} '
     function switch_flags (langs,   flags)
     {
 	langs = ":" langs ":"