From f471eb2efedfe8bffba52ff851907c6a5af4ed39 Mon Sep 17 00:00:00 2001
From: "Bastian M. Wojek" <basti@kth.se>
Date: Tue, 12 Apr 2011 09:53:26 +0000
Subject: [PATCH] FIXED Makefiles so that the NeXus support will not be built
 if it has not been enabled during the configure stage

---
 ChangeLog                      | 1 +
 src/Makefile.am                | 6 +++++-
 src/external/Makefile.am       | 6 +-----
 src/external/nexus/Makefile.am | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 69c1040b..7bb81397 100644
--- a/ChangeLog
+++ b/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
 
diff --git a/src/Makefile.am b/src/Makefile.am
index b1411f2b..945bd0b8 100644
--- a/src/Makefile.am
+++ b/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
 
diff --git a/src/external/Makefile.am b/src/external/Makefile.am
index c33f9a3f..ad090ce6 100644
--- a/src/external/Makefile.am
+++ b/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)
diff --git a/src/external/nexus/Makefile.am b/src/external/nexus/Makefile.am
index ff27f374..23be2465 100644
--- a/src/external/nexus/Makefile.am
+++ b/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)