Merged muonspin/musrfit:root6 into master

src/external/libBNMR/libLineProfile/CMakeLists.txt

@@ -4,18 +4,18 @@
 set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include)
 
 root_generate_dictionary(
-  libLineProfileDict 
+  LineProfileDict 
   -I${FFTW3_INCLUDE_DIR} 
   -I${MUSRFIT_INC}
-  libLineProfile.h 
-  LINKDEF libLineProfileLinkDef.h
-  MODULE libLineProfile
+  LineProfile.h 
+  LINKDEF LineProfileLinkDef.h
+  MODULE LineProfile
 )
 
 #--- lib creation -------------------------------------------------------------
 add_library(LineProfile SHARED
-  libLineProfile.cpp
-  libLineProfileDict.cxx
+  LineProfile.cpp
+  LineProfileDict.cxx
 )
 
 #--- make sure that the include directory is found ----------------------------
@@ -48,7 +48,7 @@ install(
 #--- install libLineProfile header ---------------------------------------------------
 install( 
   FILES 
-    libLineProfile.h
+    LineProfile.h
   DESTINATION 
     include
 )

src/external/libBNMR/libLineProfile/LineProfile.cpp

@@ -20,7 +20,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
 
-#include "libLineProfile.h"
+#include "LineProfile.h"
 #include <iostream> //for testing purposes
 
 //Implement helperfunctions

src/external/libBNMR/libLineProfile/Makefile.am

@@ -1,19 +1,19 @@
 ## Process this file with automake to create Makefile.in
 
 h_sources = \
-  libLineProfile.h 
+  LineProfile.h 
 
 h_linkdef = \
-  libLineProfile.h
+  LineProfile.h
 
 dict_h_sources = \
-  libLineProfileDict.h
+  LineProfileDict.h
 
 cpp_sources = \
-  libLineProfile.cpp
+  LineProfile.cpp
 
 dict_cpp_sources = \
-  libLineProfileDict.cpp
+  LineProfileDict.cpp
 
 include_HEADERS = $(h_sources)
 noinst_HEADERS = $(h_linkdef) $(dict_h_sources)