377c652a83
This update consists exclusively of bugfixes or maintenance-related changes. The following is a list of pull requests in the Colvars repository since the previous update to LAMMPS: - 532 Add XYZ trajectory reading feature https://github.com/Colvars/colvars/pull/532 (@jhenin, @giacomofiorin) - 531 Delete objects quietly, unless explicitly requested via script (including VMD) https://github.com/Colvars/colvars/pull/531 (@giacomofiorin) - 530 Append newline to log and error messages if not already present https://github.com/Colvars/colvars/pull/530 (@giacomofiorin) - 528 Forward-declare OpenMP lock https://github.com/Colvars/colvars/pull/528 (@giacomofiorin) - 527 Remove unneeded STL container https://github.com/Colvars/colvars/pull/527 (@giacomofiorin) - 526 Allow collecting configuration files and strings before setting up interface https://github.com/Colvars/colvars/pull/526 (@giacomofiorin, @jhenin) - 523 Fallback to linearCombination when customFunction is missing in customColvar https://github.com/Colvars/colvars/pull/523 (@HanatoK, @giacomofiorin) - 522 Use iostream::fail() to check for I/O error https://github.com/Colvars/colvars/pull/522 (@jhenin) - 520 Fix ref count https://github.com/Colvars/colvars/pull/520 (@giacomofiorin) - 513 Set target temperature through a common code path https://github.com/Colvars/colvars/pull/513 (@giacomofiorin, @jhenin) - 509 Safer detection of Windows with recent Microsoft Visual Studio versions https://github.com/Colvars/colvars/pull/509 (@akohlmey) - 508 Update LAMMPS patching method to reflect Lepton availability https://github.com/Colvars/colvars/pull/508 (@giacomofiorin) - 497 Increase the precision of write_multicol https://github.com/Colvars/colvars/pull/497 (@HanatoK) - 496 Only perform MTS automatic enable/disable for timeStepFactor > 1 https://github.com/Colvars/colvars/pull/496 (@giacomofiorin) - 493 Remove unused branch of quaternion input function https://github.com/Colvars/colvars/pull/493 (@giacomofiorin) - 489 Ensure there are spaces between the fields in the header https://github.com/Colvars/colvars/pull/489 (@HanatoK) - 487 Use map of output streams, and return references to its elements https://github.com/Colvars/colvars/pull/487 (@giacomofiorin, @jhenin) - 486 Remember first step of moving restraint https://github.com/Colvars/colvars/pull/486 (@jhenin) - 485 Add decoupling option for moving restraints https://github.com/Colvars/colvars/pull/485 (@jhenin) - 483 Update Lepton via patching procedure https://github.com/Colvars/colvars/pull/483 (@giacomofiorin) - 481 Make file-reading operations of input data abstractable https://github.com/Colvars/colvars/pull/481 (@giacomofiorin) Authors: @akohlmey, @giacomofiorin, @HanatoK, @jhenin
98 lines
2.4 KiB
Makefile
98 lines
2.4 KiB
Makefile
# Shared -*- makefile -*- for multiple architectures
|
|
|
|
# # Detect settings from PYTHON package (if defined)
|
|
# sinclude ../../src/Makefile.package.settings
|
|
# ifeq ($(python_SYSINC),)
|
|
# COLVARS_PYTHON_INCFLAGS =
|
|
# else
|
|
# COLVARS_PYTHON_INCFLAGS = -DCOLVARS_PYTHON $(python_SYSINC)
|
|
# endif
|
|
|
|
# Detect debug settings
|
|
ifeq ($(COLVARS_DEBUG),)
|
|
COLVARS_DEBUG_INCFLAGS =
|
|
else
|
|
COLVARS_DEBUG_INCFLAGS = -DCOLVARS_DEBUG
|
|
endif
|
|
|
|
COLVARS_INCFLAGS = -DCOLVARS_LAMMPS $(COLVARS_DEBUG_INCFLAGS) $(COLVARS_PYTHON_INCFLAGS) -I../../src
|
|
|
|
|
|
.SUFFIXES:
|
|
.SUFFIXES: .cpp .o
|
|
|
|
|
|
COLVARS_SRCS = \
|
|
colvaratoms.cpp \
|
|
colvarbias_abf.cpp \
|
|
colvarbias_alb.cpp \
|
|
colvarbias.cpp \
|
|
colvarbias_histogram.cpp \
|
|
colvarbias_histogram_reweight_amd.cpp \
|
|
colvarbias_meta.cpp \
|
|
colvarbias_restraint.cpp \
|
|
colvarcomp_alchlambda.cpp \
|
|
colvarcomp_angles.cpp \
|
|
colvarcomp_apath.cpp \
|
|
colvarcomp_coordnums.cpp \
|
|
colvarcomp.cpp \
|
|
colvarcomp_distances.cpp \
|
|
colvarcomp_gpath.cpp \
|
|
colvarcomp_neuralnetwork.cpp \
|
|
colvarcomp_combination.cpp \
|
|
colvarcomp_protein.cpp \
|
|
colvarcomp_rotations.cpp \
|
|
colvarcomp_volmaps.cpp \
|
|
colvar.cpp \
|
|
colvardeps.cpp \
|
|
colvargrid.cpp \
|
|
colvarmodule.cpp \
|
|
colvarparams.cpp \
|
|
colvarparse.cpp \
|
|
colvarproxy.cpp \
|
|
colvarproxy_io.cpp \
|
|
colvarproxy_replicas.cpp \
|
|
colvarproxy_system.cpp \
|
|
colvarproxy_tcl.cpp \
|
|
colvarproxy_volmaps.cpp \
|
|
colvarscript.cpp \
|
|
colvarscript_commands.cpp \
|
|
colvarscript_commands_bias.cpp \
|
|
colvarscript_commands_colvar.cpp \
|
|
colvartypes.cpp \
|
|
colvarvalue.cpp \
|
|
colvar_neuralnetworkcompute.cpp
|
|
|
|
# Allow to selectively turn off Lepton
|
|
ifeq ($(COLVARS_LEPTON),no)
|
|
|
|
LEPTON_INCFLAGS =
|
|
|
|
else
|
|
|
|
LEPTON_DIR = ../lepton
|
|
include $(LEPTON_DIR)/Settings.mk
|
|
LEPTON_INCFLAGS = $(LEPTON_INC) $(LEPTON_DEF)
|
|
|
|
endif
|
|
|
|
COLVARS_OBJS = $(COLVARS_SRCS:.cpp=.o)
|
|
|
|
%.o: %.cpp
|
|
$(CXX) $(CXXFLAGS) $(COLVARS_INCFLAGS) $(LEPTON_INCFLAGS) -c -o $@ $<
|
|
|
|
$(COLVARS_LIB): Makefile.deps $(COLVARS_OBJS)
|
|
$(AR) $(ARFLAGS) $(COLVARS_LIB) $(COLVARS_OBJS)
|
|
|
|
|
|
Makefile.deps: $(COLVARS_SRCS)
|
|
@echo > $@
|
|
@for src in $^ ; do \
|
|
obj=`basename $$src .cpp`.o ; \
|
|
$(CXX) $(CXXFLAGS) -MM $(COLVARS_INCFLAGS) $(LEPTON_INCFLAGS) \
|
|
-MT '$$(COLVARS_OBJ_DIR)'$$obj $$src >> $@ ; \
|
|
done
|
|
|
|
include Makefile.deps
|
|
|