pkg: remove version from include/libstick-0.1/

Having the version number explicitly in the source tree in
include/libstick-0.1 is bad: We do not want to change include directives
when we change the version, but we only want to change PACKAGE_VERSION.
Also, we want to avoid name clashes for header filenames. Hence, we put
the headers in a subdir libstick/ in include/ and install libstick/ to
include/libstick-${PACKAGE_VERSION}/, which is returned by pkg-config
for cflags.

diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index caf65242d0ddbb8ce550c776d3bf9020980367f6..abe8362a94dd07a22646b87a24358ea66bbc7a2b 100644 (file)
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -1 +1 @@
-install (DIRECTORY ./ DESTINATION include FILES_MATCHING PATTERN "*.h")
+install (DIRECTORY ./ DESTINATION include/libstick-${PACKAGE_VERSION} FILES_MATCHING PATTERN "*.h")

diff --git a/include/libstick-0.1/booleanmatrix.h b/include/libstick/booleanmatrix.h
similarity index 100%
rename from include/libstick-0.1/booleanmatrix.h
rename to include/libstick/booleanmatrix.h

diff --git a/include/libstick-0.1/booleanvector.h b/include/libstick/booleanvector.h
similarity index 100%
rename from include/libstick-0.1/booleanvector.h
rename to include/libstick/booleanvector.h

diff --git a/include/libstick-0.1/image.h b/include/libstick/image.h
similarity index 100%
rename from include/libstick-0.1/image.h
rename to include/libstick/image.h

diff --git a/include/libstick-0.1/persistence.h b/include/libstick/persistence.h
similarity index 100%
rename from include/libstick-0.1/persistence.h
rename to include/libstick/persistence.h

diff --git a/include/libstick-0.1/simplicialcomplex.h b/include/libstick/simplicialcomplex.h
similarity index 100%
rename from include/libstick-0.1/simplicialcomplex.h
rename to include/libstick/simplicialcomplex.h

diff --git a/tests/booleanmatrix.h b/tests/booleanmatrix.h
index 9e33ee02d826aa60055526660bf10cef76c5b39b..8ab71279810753c91e2c33392946442f86a0dfdf 100644 (file)
--- a/tests/booleanmatrix.h
+++ b/tests/booleanmatrix.h
@@ -4,7 +4,7 @@
 #include <cpptest.h>
 #include <cpptest-suite.h>
 
-#include <libstick-0.1/booleanmatrix.h>
+#include <libstick/booleanmatrix.h>
 
 using namespace libstick;
 

diff --git a/tests/booleanvector.h b/tests/booleanvector.h
index ebf6b9f8500108d26f5a44586affc58c4792ad16..c1ba8290e9b1d109b4b27c5368ee91d2eab281bb 100644 (file)
--- a/tests/booleanvector.h
+++ b/tests/booleanvector.h
@@ -4,7 +4,7 @@
 #include <cpptest.h>
 #include <cpptest-suite.h>
 
-#include <libstick-0.1/booleanvector.h>
+#include <libstick/booleanvector.h>
 
 using namespace libstick;
 

diff --git a/tests/image.h b/tests/image.h
index 8633a56b5859e9da8dc91fd41d4406a57a0933fb..a4d71497926c0d5c92827467ea5075ecd9c6b416 100644 (file)
--- a/tests/image.h
+++ b/tests/image.h
@@ -4,7 +4,7 @@
 #include <cpptest.h>
 #include <cpptest-suite.h>
 
-#include <libstick-0.1/image.h>
+#include <libstick/image.h>
 
 #include <cassert>
 #include <math.h>

diff --git a/tests/persistence.h b/tests/persistence.h
index 4412d33decc29437ecfaffbae948cb43b2d5e630..1028810103339d8bafeaf67491a6dc9ad52c1813 100644 (file)
--- a/tests/persistence.h
+++ b/tests/persistence.h
@@ -4,7 +4,7 @@
 #include <cpptest.h>
 #include <cpptest-suite.h>
 
-#include <libstick-0.1/persistence.h>
+#include <libstick/persistence.h>
 
 using namespace libstick;
 

diff --git a/tests/simplicialcomplex.h b/tests/simplicialcomplex.h
index 6cab051be2ca934a2ac032232a3cd6b52fc64d25..da0dfb5bd59d5e19b13a6b896615db8a4976400f 100644 (file)
--- a/tests/simplicialcomplex.h
+++ b/tests/simplicialcomplex.h
@@ -4,7 +4,7 @@
 #include <cpptest.h>
 #include <cpptest-suite.h>
 
-#include <libstick-0.1/simplicialcomplex.h>
+#include <libstick/simplicialfunction.h>
 
 using namespace libstick;