diff options
| author | Anders Svensson <[email protected]> | 2013-02-19 16:03:38 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-02-19 16:03:38 +0100 |
| commit | f6f7f67b60b3b67e79a2a4d23542bf5c74542fd3 (patch) | |
| tree | 1bc6dddc3a0911dfb8b53cbbaeeb0659ead2348e /lib/diameter/src/Makefile | |
| parent | e6613acf5a29c882d4673c6a8371e03523f9590c (diff) | |
| parent | 44023a32d66a0eb98f3c7bd50fa1407ac4ffdb5a (diff) | |
| download | otp-f6f7f67b60b3b67e79a2a4d23542bf5c74542fd3.tar.gz otp-f6f7f67b60b3b67e79a2a4d23542bf5c74542fd3.tar.bz2 otp-f6f7f67b60b3b67e79a2a4d23542bf5c74542fd3.zip | |
Merge branch 'anders/diameter/R16B_release/OTP-10835'
* anders/diameter/R16B_release/OTP-10835:
vsn -> 1.4.1
Update appup for diameter-1.4.1 in R16B
Add cover target to test/Makefile
Make tweaks
Remove dialyzer nowarn_unused_function workaround
Diffstat (limited to 'lib/diameter/src/Makefile')
| -rw-r--r-- | lib/diameter/src/Makefile | 16 |
1 files changed, 12 insertions, 4 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) |