diff options
| author | Dan Gudmundsson <[email protected]> | 2012-03-29 09:29:43 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2012-03-29 09:29:58 +0200 |
| commit | 472a3d910595d7de1e49f241c1d241827b5c0bf4 (patch) | |
| tree | 6a8af070bf98697cd0e08823722176c72beffbc7 /lib/Makefile | |
| parent | ccc9e16381244760b3013e11b6fe8f1fe2a0a809 (diff) | |
| parent | 1ff967c2a574161aef4c88177da534b45d9ebd80 (diff) | |
| download | otp-472a3d910595d7de1e49f241c1d241827b5c0bf4.tar.gz otp-472a3d910595d7de1e49f241c1d241827b5c0bf4.tar.bz2 otp-472a3d910595d7de1e49f241c1d241827b5c0bf4.zip | |
Merge branch 'dgud/eldap' into maint
* dgud/eldap:
[eldap] Fix parse_port error handling
[eldap] Add rudimentary docs
[eldap] Add asn.1 compilation options
[eldap] Add dereference options in search
[eldap] Remove broken functionality
[eldap] Add infrastructure
[eldap] Initial copy of Tobbe's eldap client
OTP-10034
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Makefile b/lib/Makefile index aa4e074830..3753bd165b 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1996-2011. All Rights Reserved. +# Copyright Ericsson AB 1996-2012. 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 @@ -31,7 +31,7 @@ ifdef BUILD_ALL cosTransactions cosEvent cosTime cosNotification \ cosProperty cosFileTransfer cosEventDomain et megaco webtool \ xmerl edoc eunit ssh inviso typer erl_docgen \ - percept dialyzer hipe + percept eldap dialyzer hipe EXTRA_FILE := $(wildcard EXTRA-APPLICATIONS) EXTRA_APPLICATIONS := $(if $(EXTRA_FILE),$(shell cat $(EXTRA_FILE))) endif |