Merge pull request #64 from geodynamics/baagaard/fix-makefile-dist

Update Makefile.am files for distribution
geodynamics · Jun 6, 2022 · 547ba25 · 547ba25
2 parents d1017eb + 2f03b18
commit 547ba25
Show file tree

Hide file tree

Showing 8 changed files with 569 additions and 62 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -2,7 +2,8 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = \
 	bin \
-	libsrc 
+	libsrc \
+	pythia
 
 if ENABLE_MPI
   SUBDIRS += nemesis
@@ -27,18 +28,17 @@ EXTRA_DIST = \
 	docker/debian-testing \
 	docker/ubuntu-18.04 \
 	docker/ubuntu-20.04 \
-	docker/ubuntu-21.04 \
-	docker/fedora-33 \
+	docker/ubuntu-22.04 \
 	docker/fedora-34 \
-	docker/centos-8 \
+	docker/fedora-35 \
+	docker/fedora-36 \
+	docker/rockylinux-8 \
+	docker/pythia-testenv \
+	developer/uncrustify.cfg \
 	ci-config/run_tests.sh \
 	ci-config/codecov.yml
 
 
-install-exec-local:
-	$(PYTHON) -m pip install $(top_srcdir)
-
-
 .PHONY: coverage-libtests coverage-pytests coverage-html clean-coverage
 
 if ENABLE_TEST_COVERAGE

diff --git a/configure.ac b/configure.ac
@@ -92,6 +92,7 @@ AC_CONFIG_FILES([
   bin/Makefile
   libsrc/Makefile
   libsrc/pythia/Makefile
+  pythia/Makefile
   tests/Makefile
   tests/pytests/Makefile
   tests/libtests/Makefile

diff --git a/docker/centos-8 b/docker/centos-8
diff --git a/docker/ubuntu-21.04 → docker/endoflife/ubuntu-21.04 b/docker/ubuntu-21.04 → docker/endoflife/ubuntu-21.04
diff --git a/docker/ubuntu-21.10 → docker/endoflife/ubuntu-21.10 b/docker/ubuntu-21.10 → docker/endoflife/ubuntu-21.10
diff --git a/nemesis/Makefile.am b/nemesis/Makefile.am
@@ -11,4 +11,12 @@ nemesis_SOURCES = nemesis.c
 mpinemesis_SOURCES = nemesis.c
 mpinemesis_CFLAGS = -DUSE_MPI
 
+EXTRA_DIST = \
+    _mpi.c \
+    _mpi.pxd \
+    _mpi.pyx \
+    cmpi.pxd \
+    mpi.pxd \
+    pympi.h
+
 # End of file