Restructured the interdependencies within the BMWlibs (maybe other commits will follow)

src/external/libLFRelaxation/Makefile.am

@@ -1,10 +1,7 @@
 ## Process this file with automake to create Makefile.in
 
-integrator_path = ../BMWIntegrator
-
 h_sources = \
-  TLFRelaxation.h \
-  $(integrator_path)/BMWIntegrator.h
+  TLFRelaxation.h
 
 h_linkdef = \
   TLFRelaxationLinkDef.h
@@ -13,8 +10,7 @@ dict_h_sources = \
   TLFRelaxationDict.h
 
 cpp_sources = \
-  TLFRelaxation.cpp \
-  $(integrator_path)/BMWIntegrator.cpp
+  TLFRelaxation.cpp
 
 dict_cpp_sources = \
   TLFRelaxationDict.cpp
@@ -22,12 +18,12 @@ dict_cpp_sources = \
 include_HEADERS = $(h_sources)
 noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
 
-INCLUDES = -I$(top_srcdir)/src/include $(BMWSTARTUP_CFLAGS) $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(ROOT_CFLAGS) $(CUBA_CFLAGS)
+INCLUDES = -I$(top_srcdir)/src/include $(BMWTOOLS_CFLAGS) $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(ROOT_CFLAGS) $(CUBA_CFLAGS)
 AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
 
 BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
 AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
-CLEANFILES = $(integrator_path)/*~ *Dict.cpp *Dict.h *~ core
+CLEANFILES = *Dict.cpp *Dict.h *~ core
 
 %Dict.cpp %Dict.h: %.h %LinkDef.h
 	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^
@@ -35,7 +31,7 @@ CLEANFILES = $(integrator_path)/*~ *Dict.cpp *Dict.h *~ core
 lib_LTLIBRARIES = libLFRelaxation.la
 
 libLFRelaxation_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources)
-libLFRelaxation_la_LIBADD = $(BMWSTARTUP_LIBS) $(PMUSR_LIBS) $(FFTW3_LIBS) $(GSL_LIBS) $(ROOT_LIBS) $(CUBA_LIBS)
+libLFRelaxation_la_LIBADD = $(BMWTOOLS_LIBS) $(PMUSR_LIBS) $(FFTW3_LIBS) $(GSL_LIBS) $(ROOT_LIBS) $(CUBA_LIBS)
 libLFRelaxation_la_LDFLAGS = -version-info $(PLUGIN_LIBRARY_VERSION) -release $(PLUGIN_RELEASE) $(AM_LDFLAGS)
 
 ## For the moment do not build pkgconfig files for musrfit plug-ins...

src/external/libLFRelaxation/TLFRelaxation.cpp

@@ -43,7 +43,7 @@
 #endif
 
 #include <TSAXParser.h>
-#include "../BMWIntegrator/BMWIntegrator.h"
+#include "BMWIntegrator.h"
 #include "BMWStartupHandler.h"
 #include "TLFRelaxation.h"
 

src/external/libLFRelaxation/TLFRelaxation.h

@@ -49,7 +49,7 @@ using namespace std;
 //#include "TMath.h"
 #include "PUserFcnBase.h"
 #include "fftw3.h"
-#include "../BMWIntegrator/BMWIntegrator.h"
+#include "BMWIntegrator.h"
 
 //-----------------------------------------------------------------------------------------------------------------
 /**