restore GNU make build capability for ML-PACE

akohlmey · Oct 10, 2023 · 2b1985f · 2b1985f
1 parent c0ace4a
commit 2b1985f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/pace/Makefile b/lib/pace/Makefile
@@ -1,4 +1,5 @@
 SHELL = /bin/sh
+CMAKE= cmake
 
 # ------ FILES ------
 
@@ -35,7 +36,7 @@ lib: $(OBJ) lib-yaml-cpp
 
 
 lib-yaml-cpp:
-	cd $(YAML_CPP_PATH) && $(MAKE) lib
+	cd $(YAML_CPP_PATH) && $(CMAKE) . && $(MAKE) all
 
 # ------ COMPILE RULES ------
 
@@ -45,9 +46,8 @@ lib-yaml-cpp:
 # ------ CLEAN ------
 clean-all:
 	-rm -f *~ $(OBJ) $(LIB)
-	cd $(YAML_CPP_PATH) && $(MAKE) clean-all
+	cd $(YAML_CPP_PATH) && $(MAKE) clean
 
 clean-build:
 	-rm -f *~ $(OBJ)
-	cd $(YAML_CPP_PATH) && $(MAKE) clean-build
 
diff --git a/lib/pace/Makefile.lammps b/lib/pace/Makefile.lammps
@@ -1,3 +1,3 @@
 pace_SYSINC =-I../../lib/pace/src/ML-PACE -I../../lib/pace/src/yaml-cpp/include -I../../lib/pace/src/wigner-cpp/include -DEXTRA_C_PROJECTIONS
-pace_SYSLIB = -L../../lib/pace/ -lpace -L../../lib/pace/src/yaml-cpp/ -lyaml-cpp
+pace_SYSLIB = -L../../lib/pace/ -lpace -L../../lib/pace/src/yaml-cpp/ -lyaml-cpp-pace
 pace_SYSPATH =