restore GNU make build capability for ML-PACE
This commit is contained in:
@ -1,4 +1,5 @@
|
|||||||
SHELL = /bin/sh
|
SHELL = /bin/sh
|
||||||
|
CMAKE= cmake
|
||||||
|
|
||||||
# ------ FILES ------
|
# ------ FILES ------
|
||||||
|
|
||||||
@ -35,7 +36,7 @@ lib: $(OBJ) lib-yaml-cpp
|
|||||||
|
|
||||||
|
|
||||||
lib-yaml-cpp:
|
lib-yaml-cpp:
|
||||||
cd $(YAML_CPP_PATH) && $(MAKE) lib
|
cd $(YAML_CPP_PATH) && $(CMAKE) . && $(MAKE) all
|
||||||
|
|
||||||
# ------ COMPILE RULES ------
|
# ------ COMPILE RULES ------
|
||||||
|
|
||||||
@ -45,9 +46,8 @@ lib-yaml-cpp:
|
|||||||
# ------ CLEAN ------
|
# ------ CLEAN ------
|
||||||
clean-all:
|
clean-all:
|
||||||
-rm -f *~ $(OBJ) $(LIB)
|
-rm -f *~ $(OBJ) $(LIB)
|
||||||
cd $(YAML_CPP_PATH) && $(MAKE) clean-all
|
cd $(YAML_CPP_PATH) && $(MAKE) clean
|
||||||
|
|
||||||
clean-build:
|
clean-build:
|
||||||
-rm -f *~ $(OBJ)
|
-rm -f *~ $(OBJ)
|
||||||
cd $(YAML_CPP_PATH) && $(MAKE) clean-build
|
|
||||||
|
|
||||||
|
|||||||
@ -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_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 =
|
pace_SYSPATH =
|
||||||
|
|||||||
Reference in New Issue
Block a user