[project @ 2001-04-03 16:50:11 by rrt]

Cleanup.

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 31dd776..dc252ee 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -485,6 +485,21 @@ endif
 #
 #      SRC_HC_OPTS += -O
 
+# These flags make flex 8-bit
+SRC_FLEX_OPTS  += -8
+
+SRC_INSTALL_BIN_OPTS   += -s
+
+# lint gets all CPP's flags too
+SRC_LINT_OPTS          += -axz -DLINT $(SRC_CPP_OPTS)
+WAY$(_way)_LINT_OPTS   += WAY$(_way)_CPP_OPTS
+
+# Default fptools options for dllwrap.
+SRC_BLD_DLL_OPTS += -mno-cygwin --target=i386-mingw32
+
+# Flags for CPP when running GreenCard on .pgc files
+GC_CPP_OPTS += -P -E -x c -traditional -D__GLASGOW_HASKELL__
+
 
 ################################################################################
 #

diff --git a/mk/opts.mk b/mk/opts.mk
index 36f0c7d..cbfe1ee 100644 (file)
--- a/mk/opts.mk
+++ b/mk/opts.mk
@@ -5,10 +5,14 @@
 #      This file defines Make variables for the
 #      option flags for each utility program
 #
-#      $Id: opts.mk,v 1.20 2001/04/03 16:43:28 rrt Exp $
+#      $Id: opts.mk,v 1.21 2001/04/03 16:50:11 rrt Exp $
 #
 #################################################################################
 
+#
+# N.B. This is *NOT* the place to put extra options of ANY SORT!
+#
+
 # Exports:     Define P_OPTS for the most important utility programs, P, namely
 #
 #              AR AS CPP CTAGS C FLEX HC HSTAGS LD LINT 
@@ -44,28 +48,6 @@
 
 #################################################################################
 #
-#              Global option flags for utilities
-#
-#################################################################################
-
-# These flags make flex 8-bit
-SRC_FLEX_OPTS  += -8
-
-SRC_INSTALL_BIN_OPTS   += -s
-
-# lint gets all CPP's flags too
-SRC_LINT_OPTS          += -axz -DLINT $(SRC_CPP_OPTS)
-WAY$(_way)_LINT_OPTS   += WAY$(_way)_CPP_OPTS
-
-# Default fptools options for dllwrap.
-SRC_BLD_DLL_OPTS += -mno-cygwin --target=i386-mingw32
-
-# Flags for CPP when running GreenCard on .pgc files
-GC_CPP_OPTS += -P -E -x c -traditional -D__GLASGOW_HASKELL__
-
-
-#################################################################################
-#
 #              Absolutely standard glue
 #
 #################################################################################