diff --git a/lib/colvars/Makefile.common b/lib/colvars/Makefile.common index 818373abe1afe77b3c48aa6742043871b210b68f..f47403f771f2095928d528d6872b3644a9a164d3 100644 --- a/lib/colvars/Makefile.common +++ b/lib/colvars/Makefile.common @@ -1,12 +1,12 @@ # Shared -*- makefile -*- for multiple architectures -# Detect settings from PYTHON package (if defined) -include ../../src/Makefile.package.settings -ifeq ($(python_SYSINC),) -COLVARS_PYTHON_INCFLAGS = -else -COLVARS_PYTHON_INCFLAGS = -DCOLVARS_PYTHON $(python_SYSINC) -endif +# # 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),) diff --git a/lib/colvars/Makefile.g++ b/lib/colvars/Makefile.g++ index cd7f72a833eb80bcdd1d0dd7f92d691b4b9f5fe7..556e39d070d78b0de98e5775a4e0179d7fdb9db2 100644 --- a/lib/colvars/Makefile.g++ +++ b/lib/colvars/Makefile.g++ @@ -11,12 +11,12 @@ AR = ar ARFLAGS = -rscv SHELL = /bin/sh -include Makefile.common - .PHONY: default clean default: $(COLVARS_LIB) Makefile.lammps +include Makefile.common + clean: -rm -f $(COLVARS_OBJS) $(COLVARS_LIB) diff --git a/lib/colvars/Makefile.mingw32-cross b/lib/colvars/Makefile.mingw32-cross index e2873ecdad552922d13151c96867c5664993577d..29c64b26a29b23924934127fc25939ac6dbda878 100644 --- a/lib/colvars/Makefile.mingw32-cross +++ b/lib/colvars/Makefile.mingw32-cross @@ -14,12 +14,12 @@ AR = i686-w64-mingw32-ar ARFLAGS = -rscv SHELL = /bin/sh -include Makefile.common - .PHONY: default clean default: $(COLVARS_OBJ_DIR) $(COLVARS_LIB) Makefile.lammps +include Makefile.common + $(COLVARS_OBJ_DIR): mkdir $(COLVARS_OBJ_DIR) diff --git a/lib/colvars/Makefile.mingw64-cross b/lib/colvars/Makefile.mingw64-cross index 09d6bd4fa971bc466b75a1658dd518145893b617..2fd1c6fc67f26a50b067965a0502a31f7d142ee2 100644 --- a/lib/colvars/Makefile.mingw64-cross +++ b/lib/colvars/Makefile.mingw64-cross @@ -14,12 +14,12 @@ AR = x86_64-w64-mingw32-ar ARFLAGS = -rscv SHELL = /bin/sh -include Makefile.common - .PHONY: default clean default: $(COLVARS_OBJ_DIR) $(COLVARS_LIB) Makefile.lammps +include Makefile.common + $(COLVARS_OBJ_DIR): mkdir $(COLVARS_OBJ_DIR) diff --git a/lib/colvars/README b/lib/colvars/README index a4f04221b3df68c04b93cc57a3088fc05b59614d..ce1d3199742f558cbc56c7883c557b5ea05e6132 100644 --- a/lib/colvars/README +++ b/lib/colvars/README @@ -18,13 +18,17 @@ For a brief description see: This directory has source files to build a library that LAMMPS links against when using the USER-COLVARS package. -This library must be built with a C++ compiler, *before* LAMMPS is built, so -that LAMMPS can link against it. You can use the provided Makefile.* files or -create your own, specific to your compiler and system. For example: - +This library must be built with a C++ compiler, *before* LAMMPS is built and +*after* packages are configured, so that LAMMPS can link against it. +You can use the provided Makefile.* files or create your own, specific to your +compiler and system. For example: + + cd src + make yes-user-colvars + cd ../lib/colvars make -f Makefile.g++ -will use the GNU C++ compiler and is a good template to start. +where Makefile.g++ uses the GNU C++ compiler and is a good template to start. **Optional**: if you use the Install.py script provided in this folder, you can give the machine name as the '-m' argument. This can be the suffix of one