Merge branch 'colvars-safer-makefiles' of... (1b704bab) · Commits · 郑智淋 / lammps

lib/colvars/Makefile.common

+7 −7

Original line number	Diff line number	Diff line
		# 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 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),)

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)