FIXED Makefiles so that the NeXus support will not be built if it has not been enabled during the configure stage

ChangeLog

@@ -6,6 +6,7 @@
 
 changes since 0.9.0
 ===================================
+FIXED Makefiles so that the NeXus support will not be built if it has not been enabled during the configure stage
 FIXED ASCII export from musrview in case of a Fourier-Power- or Fourier-Phase-difference plot
 FIXED bug in asymmetry fit with fixed background
 

src/Makefile.am

@@ -1,9 +1,13 @@
 ## Process this file with automake to create Makefile.in
 
+if PNEXUS_ENABLED
+  PNEXUSDIRS = external/nexus
+endif
+
 SUBDIRS = external/TLemRunHeader \
           external/MuSR_software \
           external/mud \
-	  external/nexus \
+          $(PNEXUSDIRS) \
           classes \
           external
 

src/external/Makefile.am

@@ -1,9 +1,5 @@
 ## $Id$
 
-if PNEXUS_ENABLED
-  PNEXUSDIRS = nexus
-endif
-
 if BUILD_ASLIBS
   ASDIRS = Nonlocal \
            MagProximity
@@ -21,4 +17,4 @@ if BUILD_BMWLIBS
             libCalcMeanFieldsLEM
 endif
 
-SUBDIRS = $(PNEXUSDIR) $(ASDIRS) $(CUBADIRS) $(BMWDIRS)
+SUBDIRS = $(ASDIRS) $(CUBADIRS) $(BMWDIRS)

src/external/nexus/Makefile.am

@@ -17,7 +17,7 @@ CLEANFILES = *~ core
 
 lib_LTLIBRARIES = libPNeXus.la
 
-libPNeXus_la_SOURCES = $(h_sources) $(cpp_sources) 
+libPNeXus_la_SOURCES = $(h_sources) $(cpp_sources)
 libPNeXus_la_LIBADD = $(NEXUS_LIBS)
 libPNeXus_la_LDFLAGS = -version-info $(PNEXUS_LIBRARY_VERSION) -release $(PNEXUS_RELEASE) $(AM_LDFLAGS)