BUILD: makefile: drop the SMALL_OPTS settings

These settings were appended to the final build CFLAGS and used to
contain a mix of obsolete settings that can equally be passed in one
of the many other variables such as DEFINE or more recently CFLAGS.
Let's just drop the obsolete comment about it, and check if anything
was forced there, then emit a warning suggesting to move that to other
variables such as DEFINE or CFLAGS, so as to be kind to package
maintainers.

diff --git a/INSTALL b/INSTALL
index f94cc0bb846f9d5e0b076c39fd7f3819787751fe..afb08a5c12bd58d7982c7e51ce819513273795f3 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -577,10 +577,7 @@ one of the following choices to the CPU variable :
   - generic : any other processor or no CPU-specific optimization. (default)
 
 Alternatively, you may just set the CPU_CFLAGS value to the optimal GCC options
-for your platform. A second variable named SMALL_OPTS also supports passing a
-number of defines and compiler options usually for small systems. For better
-clarity it's recommended to pass the options which result in a smaller binary
-(like memory limits or -Os) into this variable.
+for your platform.
 
 A generic CFLAGS variable may be set to append any option to pass to the C
 compiler. These flags are passed last so the variable may be used to override

diff --git a/Makefile b/Makefile
index 40d89cbb9a83553b3f67d6b37e555683beb6059f..944161b94a48317ea1b7674e7ea6bbc3056901ab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,6 @@
 #   CFLAGS may be used to append any flags for the C compiler.
 #   LDFLAGS is automatically set to -g and may be overridden.
 #   DEP may be cleared to ignore changes to include files during development
-#   SMALL_OPTS may be used to specify some options to shrink memory usage.
 #   DEBUG may be used to set some internal debugging options.
 #   ERR may be set to non-empty to pass -Werror to the compiler
 #   ADDINC may be used to complete the include path in the form -Ipath.
@@ -207,16 +206,13 @@ ifneq ($(ERR),)
   SPEC_CFLAGS += -Werror
 endif
 
-#### Memory usage tuning
-# If small memory footprint is required, you can reduce the buffer size. There
-# are 2 buffers per concurrent session, so 16 kB buffers will eat 32 MB memory
-# with 1000 concurrent sessions. Putting it slightly lower than a page size
-# will prevent the additional parameters to go beyond a page. 8030 bytes is
-# exactly 5.5 TCP segments of 1460 bytes and is generally good. Useful tuning
-# macros include :
-#    SYSTEM_MAXCONN, BUFSIZE, MAXREWRITE, REQURI_LEN, CAPTURE_LEN.
-# Example: SMALL_OPTS = -DBUFSIZE=8030 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=1024
+#### No longer used
 SMALL_OPTS =
+ifneq ($(SMALL_OPTS),)
+$(warning Warning: SMALL_OPTS was forced to "$(SMALL_OPTS)" but is no longer \
+  used and will be ignored. Please check if this setting are still relevant, \
+  and move it either to DEFINE or to CFLAGS instead.)
+endif
 
 #### Debug settings
 # You can enable debugging on specific code parts by setting DEBUG=-DDEBUG_xxx.
@@ -841,10 +837,10 @@ endif
 $(collect_opts_flags)
 
 #### Global compile options
-VERBOSE_CFLAGS = $(ARCH_FLAGS) $(CPU_CFLAGS) $(DEBUG_CFLAGS) $(SPEC_CFLAGS) $(TARGET_CFLAGS) $(SMALL_OPTS) $(CFLAGS) $(DEFINE)
+VERBOSE_CFLAGS = $(ARCH_FLAGS) $(CPU_CFLAGS) $(DEBUG_CFLAGS) $(SPEC_CFLAGS) $(TARGET_CFLAGS) $(CFLAGS) $(DEFINE)
 COPTS  = -Iinclude
 
-COPTS += $(ARCH_FLAGS) $(CPU_CFLAGS) $(DEBUG_CFLAGS) $(SPEC_CFLAGS) $(TARGET_CFLAGS) $(SMALL_OPTS) $(DEFINE) $(SILENT_DEFINE)
+COPTS += $(ARCH_FLAGS) $(CPU_CFLAGS) $(DEBUG_CFLAGS) $(SPEC_CFLAGS) $(TARGET_CFLAGS) $(DEFINE) $(SILENT_DEFINE)
 COPTS += $(DEBUG) $(OPTIONS_CFLAGS) $(CFLAGS) $(ADDINC)
 
 ifneq ($(VERSION)$(SUBVERS)$(EXTRAVERSION),)