|
Philip Kovacs |
a3fb7f |
diff --git a/contribs/Makefile.am b/contribs/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
index da96aa070d..2a2d1f2c82 100644
|
|
Philip Kovacs |
a3fb7f |
--- a/contribs/Makefile.am
|
|
Philip Kovacs |
a3fb7f |
+++ b/contribs/Makefile.am
|
|
Philip Kovacs |
a3fb7f |
@@ -1,4 +1,4 @@
|
|
Philip Kovacs |
b8cc3a |
-SUBDIRS = cray lua mic nss_slurm openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque
|
|
Philip Kovacs |
b8cc3a |
+SUBDIRS = lua mic nss_slurm openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque
|
|
Philip Kovacs |
a3fb7f |
|
|
Philip Kovacs |
a3fb7f |
EXTRA_DIST = \
|
|
Philip Kovacs |
b8cc3a |
make-3.81.slurm.patch \
|
|
Philip Kovacs |
b8cc3a |
diff --git a/src/plugins/acct_gather_energy/Makefile.am b/src/plugins/acct_gather_energy/Makefile.am
|
|
Philip Kovacs |
d315fd |
index 937808035f..2abce6efdc 100644
|
|
Philip Kovacs |
b8cc3a |
--- a/src/plugins/acct_gather_energy/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
+++ b/src/plugins/acct_gather_energy/Makefile.am
|
|
Philip Kovacs |
d315fd |
@@ -1,6 +1,6 @@
|
|
Philip Kovacs |
b8cc3a |
# Makefile for accounting gather energy plugins
|
|
Philip Kovacs |
b8cc3a |
|
|
Philip Kovacs |
b8cc3a |
-SUBDIRS = cray_aries rapl ibmaem ipmi none xcc
|
|
Philip Kovacs |
b8cc3a |
+SUBDIRS = rapl ibmaem ipmi none xcc
|
|
Philip Kovacs |
d315fd |
|
|
Philip Kovacs |
d315fd |
if BUILD_RSMI
|
|
Philip Kovacs |
d315fd |
SUBDIRS += rsmi
|
|
Philip Kovacs |
b8cc3a |
diff --git a/src/plugins/core_spec/Makefile.am b/src/plugins/core_spec/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
index 44b1ed67c0..f06bc541d7 100644
|
|
Philip Kovacs |
b8cc3a |
--- a/src/plugins/core_spec/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
+++ b/src/plugins/core_spec/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
@@ -1,3 +1,3 @@
|
|
Philip Kovacs |
b8cc3a |
# Makefile for core specialization plugins
|
|
Philip Kovacs |
b8cc3a |
|
|
Philip Kovacs |
b8cc3a |
-SUBDIRS = cray_aries none
|
|
Philip Kovacs |
b8cc3a |
+SUBDIRS = none
|
|
Philip Kovacs |
b8cc3a |
diff --git a/src/plugins/job_container/Makefile.am b/src/plugins/job_container/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
index 8e1960a456..529a9d581d 100644
|
|
Philip Kovacs |
b8cc3a |
--- a/src/plugins/job_container/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
+++ b/src/plugins/job_container/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
@@ -1,3 +1,3 @@
|
|
Philip Kovacs |
b8cc3a |
# Makefile for job_container plugins
|
|
Philip Kovacs |
b8cc3a |
|
|
Philip Kovacs |
b8cc3a |
-SUBDIRS = cncu none
|
|
Philip Kovacs |
b8cc3a |
+SUBDIRS = none
|
|
Philip Kovacs |
b8cc3a |
diff --git a/src/plugins/job_submit/Makefile.am b/src/plugins/job_submit/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
index e393bcfb1c..b98cf2e000 100644
|
|
Philip Kovacs |
b8cc3a |
--- a/src/plugins/job_submit/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
+++ b/src/plugins/job_submit/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
@@ -2,7 +2,6 @@
|
|
Philip Kovacs |
b8cc3a |
|
|
Philip Kovacs |
b8cc3a |
SUBDIRS = \
|
|
Philip Kovacs |
b8cc3a |
all_partitions \
|
|
Philip Kovacs |
b8cc3a |
- cray_aries \
|
|
Philip Kovacs |
b8cc3a |
defaults \
|
|
Philip Kovacs |
b8cc3a |
logging \
|
|
Philip Kovacs |
b8cc3a |
lua \
|
|
Philip Kovacs |
d315fd |
diff --git a/src/plugins/mpi/Makefile.am b/src/plugins/mpi/Makefile.am
|
|
Philip Kovacs |
d315fd |
index 4d055e2030..1a44dfb2ab 100644
|
|
Philip Kovacs |
d315fd |
--- a/src/plugins/mpi/Makefile.am
|
|
Philip Kovacs |
d315fd |
+++ b/src/plugins/mpi/Makefile.am
|
|
Philip Kovacs |
d315fd |
@@ -1,6 +1,6 @@
|
|
Philip Kovacs |
d315fd |
# Makefile for mpi plugins
|
|
Philip Kovacs |
d315fd |
|
|
Philip Kovacs |
d315fd |
-SUBDIRS = cray_shasta none pmi2
|
|
Philip Kovacs |
d315fd |
+SUBDIRS = none pmi2
|
|
Philip Kovacs |
d315fd |
if HAVE_PMIX
|
|
Philip Kovacs |
d315fd |
SUBDIRS += pmix
|
|
Philip Kovacs |
d315fd |
endif
|
|
Philip Kovacs |
b8cc3a |
diff --git a/src/plugins/node_features/Makefile.am b/src/plugins/node_features/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
index f5ef036303..d955c51ba1 100644
|
|
Philip Kovacs |
b8cc3a |
--- a/src/plugins/node_features/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
+++ b/src/plugins/node_features/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
@@ -1,3 +1,3 @@
|
|
Philip Kovacs |
b8cc3a |
# Makefile for node_features plugins
|
|
Philip Kovacs |
b8cc3a |
|
|
Philip Kovacs |
b8cc3a |
-SUBDIRS = knl_cray knl_generic
|
|
Philip Kovacs |
b8cc3a |
+SUBDIRS = knl_generic
|
|
Philip Kovacs |
b8cc3a |
diff --git a/src/plugins/power/Makefile.am b/src/plugins/power/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
index ccde44c322..c6171740c1 100644
|
|
Philip Kovacs |
b8cc3a |
--- a/src/plugins/power/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
+++ b/src/plugins/power/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
@@ -1,3 +1,3 @@
|
|
Philip Kovacs |
b8cc3a |
# Makefile for power management plugins
|
|
Philip Kovacs |
b8cc3a |
|
|
Philip Kovacs |
b8cc3a |
-SUBDIRS = common cray_aries none
|
|
Philip Kovacs |
b8cc3a |
+SUBDIRS = common none
|
|
Philip Kovacs |
b8cc3a |
diff --git a/src/plugins/select/Makefile.am b/src/plugins/select/Makefile.am
|
|
Philip Kovacs |
d315fd |
index 74606481ff..bebf728529 100644
|
|
Philip Kovacs |
b8cc3a |
--- a/src/plugins/select/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
+++ b/src/plugins/select/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
@@ -1,7 +1,7 @@
|
|
Philip Kovacs |
b8cc3a |
# Makefile for node selection plugins
|
|
Philip Kovacs |
d315fd |
|
|
Philip Kovacs |
b8cc3a |
# NOTE: other must be in the list before cray_aries lest the build break
|
|
Philip Kovacs |
d315fd |
-SUBDIRS = other cons_common cons_res cons_tres cray_aries linear
|
|
Philip Kovacs |
d315fd |
+SUBDIRS = other cons_common cons_res cons_tres linear
|
|
Philip Kovacs |
d315fd |
|
|
Philip Kovacs |
b8cc3a |
# Each plugin here needs a plugin_id, here are the currect plug_ids
|
|
Philip Kovacs |
b8cc3a |
# for each plugin.
|
|
Philip Kovacs |
b8cc3a |
diff --git a/src/plugins/switch/Makefile.am b/src/plugins/switch/Makefile.am
|
|
Philip Kovacs |
c00dbe |
index c58f51329d..39a2b3eb7f 100644
|
|
Philip Kovacs |
b8cc3a |
--- a/src/plugins/switch/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
+++ b/src/plugins/switch/Makefile.am
|
|
Philip Kovacs |
c00dbe |
@@ -1,7 +1,3 @@
|
|
Philip Kovacs |
b8cc3a |
# Makefile for switch plugins
|
|
Philip Kovacs |
b8cc3a |
|
|
Philip Kovacs |
c00dbe |
SUBDIRS = generic none
|
|
Philip Kovacs |
c00dbe |
-
|
|
Philip Kovacs |
c00dbe |
-if WITH_SWITCH_CRAY_ARIES
|
|
Philip Kovacs |
c00dbe |
-SUBDIRS += cray_aries
|
|
Philip Kovacs |
c00dbe |
-endif
|
|
Philip Kovacs |
b8cc3a |
diff --git a/src/plugins/task/Makefile.am b/src/plugins/task/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
index 8d2a36eb68..607af1cb7c 100644
|
|
Philip Kovacs |
b8cc3a |
--- a/src/plugins/task/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
+++ b/src/plugins/task/Makefile.am
|
|
Philip Kovacs |
b8cc3a |
@@ -1,6 +1,6 @@
|
|
Philip Kovacs |
b8cc3a |
# Makefile for task plugins
|
|
Philip Kovacs |
b8cc3a |
|
|
Philip Kovacs |
b8cc3a |
-SUBDIRS = cray_aries none
|
|
Philip Kovacs |
b8cc3a |
+SUBDIRS = none
|
|
Philip Kovacs |
b8cc3a |
|
|
Philip Kovacs |
b8cc3a |
if HAVE_SCHED_SETAFFINITY
|
|
Philip Kovacs |
b8cc3a |
SUBDIRS += affinity
|