Update README, BSD license only.

4 files changed, 5 insertions, 28 deletions

diff --git a/README.txt b/README.txt
index 2f11858..4a132fd 100644
--- a/README.txt
+++ b/README.txt
@@ -4,10 +4,9 @@ See Michael Kerber, Dmitriy Morozov, and Arnur Nigmetov,
 "Geometry Helps to Compare Persistence Diagrams.", ALENEX 2016.
 http://dx.doi.org/10.1137/1.9781611974317.9
 
-The two parts of the library come with different licenses. The bottleneck 
-part (geom_bottleneck/) is licensed under LGPL (because it uses ANN library), 
-the Wasserstein part (in geom_matching/) is licensed under a less restrictive 
-BSD license. If you are going to use this software for research purposes,
+The software is licensed under
+BSD license, see license.txt file.
+If you are going to use this software for research purposes,
 you probably do not need to worry about that.
 
-See README files in subdirectories for usage and building.
\ No newline at end of file
+See README files in subdirectories for usage and building.
diff --git a/geom_matching/README b/geom_matching/README
index fd987a1..5228d63 100644
--- a/geom_matching/README
+++ b/geom_matching/README
@@ -81,7 +81,7 @@ See also code in wasserstein/example/wasserstein_dist.cpp.
 
 # License
 
-See wasserstein/license.txt
+See ../license.txt
 
 # Building
 
diff --git a/geom_matching/wasserstein/license.txt b/geom_matching/wasserstein/license.txt
deleted file mode 100644
index 8f7e4f5..0000000
--- a/geom_matching/wasserstein/license.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2015, M. Kerber, D. Morozov, A. Nigmetov
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-You are under no obligation whatsoever to provide any bug fixes, patches, or
-upgrades to the features, functionality or performance of the source code
-(Enhancements) to anyone; however, if you choose to make your Enhancements
-available either publicly, or directly to copyright holder,
-without imposing a separate written license agreement for such Enhancements,
-then you hereby grant the following license: a  non-exclusive, royalty-free
-perpetual license to install, use, modify, prepare derivative works, incorporate
-into other computer software, distribute, and sublicense such enhancements or
-derivative works thereof, in binary and source code form.
diff --git a/geom_bottleneck/license.txt b/license.txt
index 8f7e4f5..8f7e4f5 100644
--- a/geom_bottleneck/license.txt
+++ b/license.txt