diff options
| author | Anders Svensson <[email protected]> | 2013-02-12 12:52:05 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-02-12 12:52:05 +0100 |
| commit | 117005a3ad1ddfd82891c13e65953dc8db9ae0d9 (patch) | |
| tree | d94a93ddcb84e76ad6d01bfbe89b8901ea7043f5 /lib/diameter/src/Makefile | |
| parent | 1e7b3534eeea4761bb45ff31bcdaf57cd66a7cb7 (diff) | |
| parent | 05a6cc1c996acb8e8dfe168cb029b2a7a4fdbc3d (diff) | |
| download | otp-117005a3ad1ddfd82891c13e65953dc8db9ae0d9.tar.gz otp-117005a3ad1ddfd82891c13e65953dc8db9ae0d9.tar.bz2 otp-117005a3ad1ddfd82891c13e65953dc8db9ae0d9.zip | |
Merge branch 'anders/diameter/rfc6733_dictionaries/OTP-10760'
* anders/diameter/rfc6733_dictionaries/OTP-10760:
Remove trailing whitespace
Tweak service interface towards diameter_peer
Split message handling in diameter_service into diameter_traffic
Simplify request record
Move failover out of service process
Update traffic suite to test both RFC 3588 and 6733 dictionaries
Update capx suite to test both RFC 3588 and 6733 dictionaries
Add exprecs '#new-'/1 clause taking list argument
Add exprecs '#get-'/1 for transforming records into lists
Document the existence of the RFC 6733 dictionaries
Don't hardcode common dictionary
Add RFC 6733 dictionaries
Diffstat (limited to 'lib/diameter/src/Makefile')
| -rw-r--r-- | lib/diameter/src/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile index 2b02f1de2b..0e448c8912 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2010-2012. All Rights Reserved. +# Copyright Ericsson AB 2010-2013. All Rights Reserved. # # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in @@ -255,7 +255,11 @@ gen/diameter_gen_base_accounting.erl gen/diameter_gen_relay.erl \ gen/diameter_gen_base_accounting.hrl gen/diameter_gen_relay.hrl: \ $(EBIN)/diameter_gen_base_rfc3588.$(EMULATOR) -gen/diameter_gen_base_rfc3588.erl gen/diameter_gen_base_rfc3588.hrl: \ +gen/diameter_gen_acct_rfc6733.erl gen/diameter_gen_acct_rfc6733.hrl: \ + $(EBIN)/diameter_gen_base_rfc6733.$(EMULATOR) + +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)) $(DICT_MODULES:gen/%=$(EBIN)/%.$(EMULATOR)): \ |