Fix ci

.github/workflows/main.yml

@@ -78,7 +78,7 @@ jobs:
       run: |
         mkdir -p build/${{matrix.compiler}}
         cd build/${{matrix.compiler}}
-        $WITH_SHELL 'make -j$NJ -C extern/yamlcpp'
+        $WITH_SHELL 'make -j$NJ -C extern/yaml-cpp'
 
     - name: Extern
       run: |

.gitignore

@@ -1,5 +1,8 @@
 README.rst
 docs/manual.rst
+extern/**/src
+extern/**/lib
+extern/**/include
 
 *spec.yaml
 cqc

configure.ac

@@ -100,7 +100,7 @@ AC_ARG_WITH(yamlcpp,
             [BUILD_YAML=YES
              external_cppflags_add "yaml-cpp/include/"
              external_ldflags_add "yaml-cpp/lib/libyaml-cpp.a"
-             EXTERNAL_DEPENDENCIES="yamlcpp ${EXTERNAL_DEPENDENCIES}"])
+             EXTERNAL_DEPENDENCIES="yaml-cpp ${EXTERNAL_DEPENDENCIES}"])
 
 AC_ARG_WITH([clang-check],
             [AS_HELP_STRING([--with-clang-check],

extern/ctf/Makefile.am

@@ -1,12 +1,11 @@
 CTF_GIT_REPOSITORY ?= https://gitlab.cc4s.org/cc4s/ctf.git
-CPPFLAGS           += $(CTF_CPPFLAGS)
 
 CTF_BUILD_PATH     ?= $(builddir)/src/$(CTF_COMMIT)/build
 CTF_SRC_PATH       ?= $(builddir)/src/$(CTF_COMMIT)/src
 
-CTF_CONFIG_FLAGS = CXX="$(CXX)" \
+CTF_CONFIG_FLAGS = CXX="$(MPICXX)" \
                    LIB_PATH="$(LDFLAGS)" \
-                   LIBS="-lmpi" \
+                   LIBS="${LIBS}" \
                    CXXFLAGS="$(CXXFLAGS)" \
                    --no-dynamic
 
@@ -48,13 +47,12 @@ $(CTF_STATIC_LIB): $(CTF_BUILD_PATH)/Makefile
 
 ################################################################################
 
-
-ctf: $(CTF_STATIC_LIB)
-
 clean-local:
 	-rm -rf include
 	-rm -rf lib
 
+ctf: $(CTF_STATIC_LIB)
+
 fetch: $(CTF_CONFIGURE)
 
-.PHONY: ctf
+.PHONY: ctf fetch

extern/yaml-cpp/Makefile.am

@@ -47,7 +47,7 @@ $(YAML_STATIC_LIB): $(YAML_MAKE)
 
 ################################################################################
 
-yamlcpp: $(YAML_STATIC_LIB)
+yaml-cpp: $(YAML_STATIC_LIB)
 
 clean-local:
 	rm -rf $(YAML_BUILD_PATH)
@@ -57,4 +57,4 @@ clean-local:
 
 fetch: $(YAML_CMAKE)
 
-.PHONY: yamlcpp fetch
+.PHONY: yaml-cpp fetch