Merge branch 'compilation' into 'master'

Make out-of-tree build work

See merge request !63

.gitlab-ci.yml

@@ -42,6 +42,27 @@ make:generic:
       - config.log
       - tests/*.log
 
+make:out-of-tree:
+  stage: build
+  except:
+    - /^wip.*/
+    - /^WIP.*/
+  variables:
+    CFLAGS: "-std=c99 -pedantic -Wall -Wextra -Werror -Wno-unused-but-set-parameter"
+  script:
+    - ./autogen.sh
+    - mkdir out
+    - cd out
+    - mkdir build
+    - ../configure --prefix=`pwd`/build
+    - make
+    - make check
+  artifacts:
+    when: on_failure
+    paths:
+      - config.log
+      - tests/*.log
+
 make:knl:
   stage: build
   except:
@@ -60,6 +81,7 @@ make:knl:
   artifacts:
     when: on_failure
     paths:
+      - config.log
       - tests/*.log
 
 readthedocs:

AUTHORS

@@ -3,3 +3,4 @@ Kamil Iskra <iskra@mcs.anl.gov>
 Brian Suchy <briansuchy2022@u.northwestern.edu>
 Valentin Reis <fre@freux.fr>
 Nicolas Denoyelle <ndenoyelle@anl.gov>
+Clement Foyer <cfoyer@cray.com>

doc/Makefile.am

@@ -6,9 +6,14 @@ if BUILD_DOCS
 build-docs:
 	$(DOXYGEN) aml.doxy
 	$(SPHINXBUILD) -b html -a . $(SPHINX_BUILD_DIR)
+
+dist-hook: build-docs
+	cp -r $(SPHINX_BUILD_DIR) $(distdir)
 else
 build-docs:
-	echo "not building documentation"
+	@echo "not building documentation"
+
+dist-hook: build-docs
 endif
 
 create-doc-dir:
@@ -26,7 +31,4 @@ uninstall-local:
 clean-local:
 	rm -rf $(DOXYGEN_BUILD_DIR) $(SPHINX_BUILD_DIR)
 
-dist-hook: build-docs
-	cp -r $(SPHINX_BUILD_DIR) $(distdir)
-
 EXTRA_DIST= aml.doxy conf.py pages index.rst img

src/Makefile.am

-AM_CFLAGS = -I$(top_srcdir)/include $(PTHREAD_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/include $(PTHREAD_CFLAGS)
 AM_LDFLAGS = $(PTHREAD_LIBS)