FIXED Makefiles so that the NeXus support will not be built if it has not been enabled during the configure stage
This commit is contained in:
6
src/external/Makefile.am
vendored
6
src/external/Makefile.am
vendored
@ -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)
|
||||
|
2
src/external/nexus/Makefile.am
vendored
2
src/external/nexus/Makefile.am
vendored
@ -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)
|
||||
|
||||
|
Reference in New Issue
Block a user