|
Philip Kovacs |
a3fb7f |
diff --git a/contribs/Makefile.am b/contribs/Makefile.am
|
|
Philip Kovacs |
188ee2 |
index 3f6fac0a85..6c466b4eb5 100644
|
|
Philip Kovacs |
a3fb7f |
--- a/contribs/Makefile.am
|
|
Philip Kovacs |
a3fb7f |
+++ b/contribs/Makefile.am
|
|
Philip Kovacs |
188ee2 |
@@ -1 +1 @@
|
|
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 |
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_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 |
188ee2 |
|
|
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 |
188ee2 |
index 38bae0ff5c..ca7133f43f 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 |
188ee2 |
|
|
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 |
188ee2 |
|
|
Philip Kovacs |
b8027d |
# Each plugin here needs a plugin_id.
|
|
Philip Kovacs |
b8027d |
# Here are the current plugin_ids for each plugin.
|
|
Philip Kovacs |
b8cc3a |
diff --git a/src/plugins/switch/Makefile.am b/src/plugins/switch/Makefile.am
|
|
Philip Kovacs |
188ee2 |
index 365f5b8d93..dc56a01a55 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 |
188ee2 |
SUBDIRS = 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 |
188ee2 |
index f79282f3e6..356cdcd500 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 |
188ee2 |
-SUBDIRS = affinity cray_aries none
|
|
Philip Kovacs |
188ee2 |
+SUBDIRS = affinity none
|
|
Philip Kovacs |
b8cc3a |
|
|
Philip Kovacs |
188ee2 |
if WITH_CGROUP
|
|
Philip Kovacs |
188ee2 |
SUBDIRS += cgroup
|