diff options
| author | Erlang/OTP <[email protected]> | 2014-08-07 17:36:24 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2014-08-07 17:36:24 +0200 |
| commit | f68b689662dcfba7f6e82bad03938eeb3a48a300 (patch) | |
| tree | 7f81f133ec0c8f439083239aec468cc5351f8055 /lib/orber/src/Makefile | |
| parent | 934b6de4d2ab6c31c5217e1ba4779ade9e37cc83 (diff) | |
| parent | b1d3fd0943df21a4928ace4101404be97609556d (diff) | |
| download | otp-f68b689662dcfba7f6e82bad03938eeb3a48a300.tar.gz otp-f68b689662dcfba7f6e82bad03938eeb3a48a300.tar.bz2 otp-f68b689662dcfba7f6e82bad03938eeb3a48a300.zip | |
Merge branch 'lars/orber/dual_ipv6_and_ipv4' into maint-17
* lars/orber/dual_ipv6_and_ipv4:
[orber] Fix bug in testcase
[orber] Fix malformed macros
[orber] Add test suite for ORB with dual ipv4/ipv6 configuration
[orber] Update documentation and fix testcase for IPv4/IPv6
[orber] Update testcases and fixed some minor faults
[orber] Remove unused file corba_request.erl
[orber] Remove a define of ORBVSN when compiling orbers erlang modules
[orber] Add possibilty to configure orber to run in both IPv4 and IPv6
Diffstat (limited to 'lib/orber/src/Makefile')
| -rw-r--r-- | lib/orber/src/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile index d96350f4d5..398e481138 100644 --- a/lib/orber/src/Makefile +++ b/lib/orber/src/Makefile @@ -194,8 +194,7 @@ ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/orber/ebin ERL_COMPILE_FLAGS += $(ERL_IDL_FLAGS) \ -I$(ERL_TOP)/lib/orber/include \ +'{parse_transform,sys_pre_attributes}' \ - +'{attribute,insert,app_vsn,"orber_$(ORBER_VSN)"}' \ - -D'ORBVSN="$(ORBER_VSN)"' + +'{attribute,insert,app_vsn,"orber_$(ORBER_VSN)"}' ASN_FLAGS = -bber +der +compact_bit_string +nowarn_unused_record |