From a2874de145acfef7b3d981bb4873aa5c12b647a9 Mon Sep 17 00:00:00 2001
From: David Bigagli <david@schedmd.com>
Date: Mon, 3 Nov 2014 15:58:02 -0800
Subject: [PATCH] Minor changes to the makefiles.
---
auxdir/Makefile.am | 3 +--
auxdir/Makefile.in | 3 +--
contribs/Makefile.am | 2 +-
contribs/Makefile.in | 2 +-
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/auxdir/Makefile.am b/auxdir/Makefile.am
index e4930024885..54a67d28619 100644
--- a/auxdir/Makefile.am
+++ b/auxdir/Makefile.am
@@ -5,7 +5,7 @@
##****************************************************************************
EXTRA_DIST = \
- acx_pthread.m4 \
+ ax_pthread.m4 \
slurm.m4 \
test-driver \
type_socklen_t.m4 \
@@ -37,6 +37,5 @@ EXTRA_DIST = \
x_ac_setproctitle.m4 \
x_ac_sgi_job.m4 \
x_ac_slurm_ssl.m4 \
- x_ac_srun.m4 \
x_ac_sun_const.m4 \
x_ac_xcpu.m4
diff --git a/auxdir/Makefile.in b/auxdir/Makefile.in
index 69c63957063..80b49c2f6bb 100644
--- a/auxdir/Makefile.in
+++ b/auxdir/Makefile.in
@@ -386,7 +386,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = \
- acx_pthread.m4 \
+ ax_pthread.m4 \
slurm.m4 \
test-driver \
type_socklen_t.m4 \
@@ -418,7 +418,6 @@ EXTRA_DIST = \
x_ac_setproctitle.m4 \
x_ac_sgi_job.m4 \
x_ac_slurm_ssl.m4 \
- x_ac_srun.m4 \
x_ac_sun_const.m4 \
x_ac_xcpu.m4
diff --git a/contribs/Makefile.am b/contribs/Makefile.am
index 0c6d0287d50..a2640c7e2b8 100644
--- a/contribs/Makefile.am
+++ b/contribs/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = cray lua pam perlapi torque sgather sjobexit slurmdb-direct pmi2
+SUBDIRS = cray lua pam perlapi torque sgather sjobexit slurmdb-direct pmi2 mic phpext
EXTRA_DIST = \
env_cache_builder.c \
diff --git a/contribs/Makefile.in b/contribs/Makefile.in
index b9fedf0e8dd..4bd2849d67f 100644
--- a/contribs/Makefile.in
+++ b/contribs/Makefile.in
@@ -444,7 +444,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = cray lua pam perlapi torque sgather sjobexit slurmdb-direct pmi2
+SUBDIRS = cray lua pam perlapi torque sgather sjobexit slurmdb-direct pmi2 mic phpext
EXTRA_DIST = \
env_cache_builder.c \
make-3.81.slurm.patch \
--
GitLab