LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

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

Browse Source
This commit is contained in:
Bastian M. Wojek 2011-04-12 09:53:26 +00:00
parent 201808b055
commit f471eb2efe
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -6,6 +6,7 @@
changes since 0.9.0 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 ASCII export from musrview in case of a Fourier-Power- or Fourier-Phase-difference plot
FIXED bug in asymmetry fit with fixed background FIXED bug in asymmetry fit with fixed background

6
src/Makefile.am
View File

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

6
src/external/Makefile.am vendored
View File

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

2
src/external/nexus/Makefile.am vendored
View File

@ -17,7 +17,7 @@ CLEANFILES = *~ core
lib_LTLIBRARIES = libPNeXus.la 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_LIBADD = $(NEXUS_LIBS)
libPNeXus_la_LDFLAGS = -version-info $(PNEXUS_LIBRARY_VERSION) -release $(PNEXUS_RELEASE) $(AM_LDFLAGS) libPNeXus_la_LDFLAGS = -version-info $(PNEXUS_LIBRARY_VERSION) -release $(PNEXUS_RELEASE) $(AM_LDFLAGS)