lijiext
/
lammps
mirror of https://github.com/lammps/lammps.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'colvars-safer-makefiles' of https://github.com/giacomofiorin/lammps into colvars-quickfix

This commit is contained in:
Axel Kohlmeyer 2017-07-20 15:59:23 -04:00
parent 9d0d90c038 c98f6140e7
commit 1b704bab18
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/colvars/Makefile.common
View File

@ -1,12 +1,12 @@
# Shared -*- makefile -*- for multiple architectures # Shared -*- makefile -*- for multiple architectures
# Detect settings from PYTHON package (if defined) # # Detect settings from PYTHON package (if defined)
sinclude ../../src/Makefile.package.settings # sinclude ../../src/Makefile.package.settings
ifeq ($(python_SYSINC),) # ifeq ($(python_SYSINC),)
COLVARS_PYTHON_INCFLAGS = # COLVARS_PYTHON_INCFLAGS =
else # else
COLVARS_PYTHON_INCFLAGS = -DCOLVARS_PYTHON $(python_SYSINC) # COLVARS_PYTHON_INCFLAGS = -DCOLVARS_PYTHON $(python_SYSINC)
endif # endif
# Detect debug settings # Detect debug settings
ifeq ($(COLVARS_DEBUG),) ifeq ($(COLVARS_DEBUG),)

4
lib/colvars/Makefile.g++
View File

@ -11,12 +11,12 @@ AR = ar
ARFLAGS = -rscv ARFLAGS = -rscv
SHELL = /bin/sh SHELL = /bin/sh
include Makefile.common
.PHONY: default clean .PHONY: default clean
default: $(COLVARS_LIB) Makefile.lammps default: $(COLVARS_LIB) Makefile.lammps
include Makefile.common
clean: clean:
-rm -f $(COLVARS_OBJS) $(COLVARS_LIB) -rm -f $(COLVARS_OBJS) $(COLVARS_LIB)

4
lib/colvars/Makefile.mingw32-cross
View File

@ -14,12 +14,12 @@ AR = i686-w64-mingw32-ar
ARFLAGS = -rscv ARFLAGS = -rscv
SHELL = /bin/sh SHELL = /bin/sh
include Makefile.common
.PHONY: default clean .PHONY: default clean
default: $(COLVARS_OBJ_DIR) $(COLVARS_LIB) Makefile.lammps default: $(COLVARS_OBJ_DIR) $(COLVARS_LIB) Makefile.lammps
include Makefile.common
$(COLVARS_OBJ_DIR): $(COLVARS_OBJ_DIR):
mkdir $(COLVARS_OBJ_DIR) mkdir $(COLVARS_OBJ_DIR)

4
lib/colvars/Makefile.mingw64-cross
View File

@ -14,12 +14,12 @@ AR = x86_64-w64-mingw32-ar
ARFLAGS = -rscv ARFLAGS = -rscv
SHELL = /bin/sh SHELL = /bin/sh
include Makefile.common
.PHONY: default clean .PHONY: default clean
default: $(COLVARS_OBJ_DIR) $(COLVARS_LIB) Makefile.lammps default: $(COLVARS_OBJ_DIR) $(COLVARS_LIB) Makefile.lammps
include Makefile.common
$(COLVARS_OBJ_DIR): $(COLVARS_OBJ_DIR):
mkdir $(COLVARS_OBJ_DIR) mkdir $(COLVARS_OBJ_DIR)