Make tweaks

Add a 'strict' target to compile with -Werror and fix a dependency.
Reorder test suites alphabetically. The two suites that currently take
the longest to run conveniently come last.

3 files changed, 33 insertions, 21 deletions

diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
index 0e448c8912..df10c33268 100644
--- a/lib/diameter/src/Makefile
+++ b/lib/diameter/src/Makefile
@@ -109,7 +109,8 @@ ERL_COMPILE_FLAGS += \
 	+warn_unused_vars \
 	-pa $(ABS_EBIN) \
 	-I $(INCDIR) \
-	-I gen
+	-I gen \
+	$(STRICT_FLAGS)
 # -pa is to be able to include_lib from the include directory: the
 # path must contain the application name.
 
@@ -124,6 +125,13 @@ gen/diameter_gen_%.erl gen/diameter_gen_%.hrl: dict/%.dia
 
 opt: $(TARGET_FILES)
 
+# Compile with -Werror during development. Don't do this in the 'opt'
+# target so that new warnings don't break the build. It's also
+# convenient to have both targets when weeding out warnings isn't the
+# priority. (Or when they're intentional, when debugging.)
+strict:
+	$(MAKE) opt STRICT_FLAGS=-Werror
+
 # Build unofficial patches with some degree of traceability. Refuse to
 # build if there are diffs from HEAD since that defeats the purpose.
 patch:
@@ -251,13 +259,13 @@ release_docs_spec:
 # Dependencies
 # ----------------------------------------------------
 
-gen/diameter_gen_base_accounting.erl gen/diameter_gen_relay.erl \
-gen/diameter_gen_base_accounting.hrl gen/diameter_gen_relay.hrl: \
+gen/diameter_gen_base_accounting.erl gen/diameter_gen_base_accounting.hrl: \
 	$(EBIN)/diameter_gen_base_rfc3588.$(EMULATOR)
 
 gen/diameter_gen_acct_rfc6733.erl gen/diameter_gen_acct_rfc6733.hrl: \
 	$(EBIN)/diameter_gen_base_rfc6733.$(EMULATOR)
 
+gen/diameter_gen_relay.erl gen/diameter_gen_relay.hrl \
 gen/diameter_gen_base_rfc3588.erl gen/diameter_gen_base_rfc3588.hrl \
 gen/diameter_gen_base_rfc6733.erl gen/diameter_gen_base_rfc6733.hrl: \
 	$(COMPILER_MODULES:%=$(EBIN)/%.$(EMULATOR))
@@ -281,7 +289,7 @@ depend.mk: depend.sed $(MODULES:%=%.erl) Makefile
 .PHONY: debug opt release_docs_spec release_spec
 .PHONY: $(TARGET_DIRS:%/=%) $(TARGET_DIRS:%/=release_src_%)
 .PHONY: $(EXAMPLE_DIRS:%/=release_examples_%)
-.PHONY: plt dialyze patch
+.PHONY: plt dialyze patch strict
 
 # Keep intermediate files.
 .SECONDARY: $(DICT_ERLS) $(DICT_HRLS) gen/$(DICT_YRL:%=%.erl)
diff --git a/lib/diameter/test/Makefile b/lib/diameter/test/Makefile
index aa4b7eaeb1..47f84a8a42 100644
--- a/lib/diameter/test/Makefile
+++ b/lib/diameter/test/Makefile
@@ -56,7 +56,8 @@ DATA_DIRS = $(sort $(dir $(DATA)))
 ERL_COMPILE_FLAGS += +warn_export_vars \
                      +warn_unused_vars \
                      -I ../include \
-                     -I ../src/gen
+                     -I ../src/gen \
+                     $(STRICT_FLAGS)
 
 # ----------------------------------------------------
 # Targets
@@ -64,6 +65,9 @@ ERL_COMPILE_FLAGS += +warn_export_vars \
 
 all debug opt: $(TARGET_FILES)
 
+strict:
+	$(MAKE) opt STRICT_FLAGS=-Werror
+
 # Require success ...
 run: $(SUITES)
 
@@ -114,7 +118,7 @@ help:
 	@echo "        Echo some relevant variables."
 	@echo ========================================
 
-.PHONY: all any run clean debug docs help info opt realclean
+.PHONY: all any run clean debug docs help info opt realclean strict
 
 # ----------------------------------------------------
 # Special Targets
diff --git a/lib/diameter/test/modules.mk b/lib/diameter/test/modules.mk
index 32e5fb4613..c4a713fb10 100644
--- a/lib/diameter/test/modules.mk
+++ b/lib/diameter/test/modules.mk
@@ -22,28 +22,28 @@ COVER_SPEC_FILE = diameter.cover
 
 MODULES = \
 	diameter_ct \
-	diameter_util \
 	diameter_enum \
-	diameter_compiler_SUITE \
+	diameter_util \
+	diameter_3xxx_SUITE \
+	diameter_app_SUITE \
+	diameter_capx_SUITE \
 	diameter_codec_SUITE \
 	diameter_codec_test \
-	diameter_app_SUITE \
+	diameter_compiler_SUITE \
 	diameter_dict_SUITE \
-	diameter_reg_SUITE \
-	diameter_sync_SUITE \
-	diameter_stats_SUITE \
-	diameter_watchdog_SUITE \
-	diameter_gen_sctp_SUITE \
-	diameter_transport_SUITE \
-	diameter_capx_SUITE \
-	diameter_traffic_SUITE \
-	diameter_relay_SUITE \
-	diameter_tls_SUITE \
-	diameter_failover_SUITE \
 	diameter_dpr_SUITE \
 	diameter_event_SUITE \
+	diameter_failover_SUITE \
+	diameter_gen_sctp_SUITE \
 	diameter_length_SUITE \
-	diameter_3xxx_SUITE
+	diameter_reg_SUITE \
+	diameter_relay_SUITE \
+	diameter_stats_SUITE \
+	diameter_sync_SUITE \
+	diameter_tls_SUITE \
+	diameter_traffic_SUITE \
+	diameter_transport_SUITE \
+	diameter_watchdog_SUITE
 
 HRL_FILES = \
 	diameter_ct.hrl