copyright clarifications

darcs-hash:20081110225841-c8de0-230aaa8216cbf845c5345f99cf9bb05edcb147ce.gz

diff --git a/COPYING b/COPYING
index 73df965b34ffe8a46822b0fd13a9c26ba8044612..c54a8dd0fe8a0d6f0b79cd70d0f2ff4080104532 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -3,6 +3,18 @@ libraries by various authors.  See the COPYING, COPYRIGHT, and README
 files in the subdirectories for the original copyright and licensing
 information of these packages.
 
+The compiled NLopt library, i.e. the combined work of all of the
+included optimization routines, is licensed under the conjunction of
+all of these licensing terms.  Currently, the most restrictive terms
+are for the code in the "luksan" directory, which is licensed under
+the GNU Lesser General Public License (GNU LGPL), version 2.1 or
+later (see luksan/COPYRIGHT).
+
+That means that the compiled NLopt library is governed by the terms of
+the LGPL.
+
+---------------------------------------------------------------------------
+
 Other portions of NLopt, including any modifications to the abovementioned
 packages, are licensed under the standard "MIT License:"
 

diff --git a/Makefile.am b/Makefile.am
index 17cab5583ca640bd3014f67e3049a86e5bde3c24..9ddb4709acb6dee856789ac404af24b5ded0145b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,8 +8,8 @@ CXX_DIRS = stogo
 CXX_LIBS = stogo/libstogo.la
 endif
 
-SUBDIRS= util direct cdirect $(CXX_DIRS) praxis luksan crs mlsl mma cobyla newuoa lbfgs neldermead api . octave test
-EXTRA_DIST=COPYRIGHT autogen.sh nlopt.pc.in m4
+SUBDIRS = util direct cdirect $(CXX_DIRS) praxis luksan crs mlsl mma cobyla newuoa lbfgs neldermead api . octave test
+EXTRA_DIST = autogen.sh nlopt.pc.in m4
 
 if WITH_NOCEDAL
 NOCEDAL_LBFGS=lbfgs/liblbfgs.la