more work towards NeXus exchange

src/Makefile.am

@@ -17,12 +17,23 @@ SUBDIRS = external/TLemRunHeader \
           external/mud \
           $(PNEXUSDIRS) \
           classes \
-          external \
-          $(EDITORDIR)
+          external
 
+if BUILD_MUSRGUI
+SUBDIRS += $(EDITORDIR)
 EXTRA_DIST = $(EDITORDIR)/Makefile
+endif
+
+if BUILD_MUSREDIT
+SUBDIRS += $(EDITORDIR)
+EXTRA_DIST = $(EDITORDIR)/Makefile
+endif
 
 bin_PROGRAMS = musrfit musrview musrt0 musrparam msr2msr msr2data any2many
+if PNEXUS_ENABLED
+bin_PROGRAMS += nexus_dump
+endif
+
 musrfit_SOURCES = musrfit.cpp
 musrview_SOURCES = musrview.cpp
 musrt0_SOURCES = musrt0.cpp
@@ -30,6 +41,9 @@ musrparam_SOURCES = musrparam.cpp
 msr2msr_SOURCES = msr2msr.cpp
 msr2data_SOURCES = msr2data.cpp
 any2many_SOURCES = any2many.cpp
+if PNEXUS_ENABLED
+nexus_dump_SOURCES = nexus_dump.cpp
+endif
 
 xmldir = $(bindir)
 xml_DATA = musrfit_startup.xml
@@ -39,6 +53,10 @@ LIBADD = $(PMUSR_LIBS) $(LEM_LIBS) $(PSIBIN_LIBS) $(MUD_LIBS) $(PNEXUS_LIBS)
 AM_CXXFLAGS = $(LOCAL_BIN_CXXFLAGS)
 AM_LDFLAGS = $(LOCAL_BIN_LDFLAGS)
 INCLUDES = $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(BOOST_CFLAGS) $(ROOT_CFLAGS)
+if PNEXUS_ENABLED
+INCLUDES += $(HDF5_CFLAGS) $(NEXUS_CFLAGS) $(PNEXUS_CXXFLAGS)
+endif
+
 LIBS = $(PMUSR_LIBS) $(USERFCN_LIBS) $(LEM_LIBS) $(PSIBIN_LIBS) $(MUD_LIBS) $(PNEXUS_LIBS) $(FFTW3_LIBS) $(GSL_LIBS) $(ROOT_LIBS)
 
 install-xmlDATA: $(xml_DATA)
@@ -72,12 +90,10 @@ uninstall-xmlDATA:
 	    read REMOVE && \
 	    if test "$$REMOVE" = "y" || test "$$REMOVE" = "Y"; then \
 	      echo "$(RM) '$(DESTDIR)$(xmldir)/$(xml_DATA)'" && \
-	      $(RM) "$(DESTDIR)$(xmldir)/$(xml_DATA)" && \
-	      rmdir "$(DESTDIR)$(xmldir)"; \
+	      $(RM) "$(DESTDIR)$(xmldir)/$(xml_DATA)"; \
 	    fi; \
 	  else \
 	    echo "$(RM) '$(DESTDIR)$(xmldir)/$(xml_DATA)'" && \
-	    $(RM) "$(DESTDIR)$(xmldir)/$(xml_DATA)" && \
-	    rmdir "$(DESTDIR)$(xmldir)"; \
+	    $(RM) "$(DESTDIR)$(xmldir)/$(xml_DATA)"; \
 	  fi; \
 	fi