diff options
| author | Dan Gudmundsson <[email protected]> | 2012-03-29 09:32:44 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2012-03-29 09:32:44 +0200 |
| commit | b26b7487259ada76a47ffefe21a3069d9e70ba4c (patch) | |
| tree | 05dd0166dd91abac2baf717362e0d9d50b133b2f /lib/Makefile | |
| parent | c068f4fa2b59cbdef069d826749186675c3d0ea5 (diff) | |
| parent | 472a3d910595d7de1e49f241c1d241827b5c0bf4 (diff) | |
| download | otp-b26b7487259ada76a47ffefe21a3069d9e70ba4c.tar.gz otp-b26b7487259ada76a47ffefe21a3069d9e70ba4c.tar.bz2 otp-b26b7487259ada76a47ffefe21a3069d9e70ba4c.zip | |
Merge branch 'maint'
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 |