Merge branch 'develop' into feature-quadcount

cburstedde · Aug 30, 2023 · 1b93575 · 1b93575
2 parents ed9fbf9 + 5170b82
commit 1b93575
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 25 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -75,7 +75,7 @@ include example/spheres/Makefile.am
 include example/steps/Makefile.am
 include example/tetgen/Makefile.am
 include example/timings/Makefile.am
-include example/balance_seeds/Makefile.am
+include example/balance/Makefile.am
 include example/search/Makefile.am
 
 ## This was only used for our lint code, which needs to be replaced.

diff --git a/example/balance/Makefile.am b/example/balance/Makefile.am
@@ -0,0 +1,24 @@
+
+# This file is part of p4est.
+# Makefile.am in example/balance
+# included non-recursively from toplevel directory
+
+if P4EST_ENABLE_BUILD_2D
+bin_PROGRAMS += example/balance/p4est_balance_seeds
+
+example_balance_p4est_balance_seeds_SOURCES = \
+        example/balance/balance_seeds2.c
+
+LINT_CSOURCES += \
+        $(example_balance_p4est_balance_seeds_SOURCES)
+endif
+
+if P4EST_ENABLE_BUILD_3D
+bin_PROGRAMS += example/balance/p8est_balance_seeds
+
+example_balance_p8est_balance_seeds_SOURCES = \
+        example/balance/balance_seeds3.c
+
+LINT_CSOURCES += \
+        $(example_balance_p8est_balance_seeds_SOURCES)
+endif
diff --git a/example/balance_seeds/balance_seeds2.c → example/balance/balance_seeds2.c b/example/balance_seeds/balance_seeds2.c → example/balance/balance_seeds2.c
diff --git a/example/balance_seeds/balance_seeds3.c → example/balance/balance_seeds3.c b/example/balance_seeds/balance_seeds3.c → example/balance/balance_seeds3.c
diff --git a/example/balance_seeds/Makefile.am b/example/balance_seeds/Makefile.am