It appears that 'make dist' isn't kept up to date with changes. Several
files were removed, but EXTRA_DIST and SUBDIRS variables were not
updated. I was able to get a successful configure/make dist/rpmbuild
cycle with the following patch on master (excluding my run of autogen.sh
and hand modifying slurm.spec with META file values). I am not sure I
fully understand the reason for the special treatment of contribs, but
the resulting build/tarball/RPMs seemed OK.
Cheers,
Daniel Pou
SGI MPI Team
diff --git a/Makefile.am b/Makefile.am
index 18f4188..7d43ebd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I auxdir
-SUBDIRS = auxdir src testsuite doc
+SUBDIRS = auxdir src testsuite doc contribs
EXTRA_DIST = \
etc/bluegene.conf.example \
@@ -57,11 +57,6 @@ mrproper: distclean-local clean
-find $(top_srcdir)/src -name "Makefile" -exec rm {} \;
-find $(top_srcdir) -depth -name ".deps" -exec rm -rf {} \;
-contrib:
- @cd contribs && \
- $(MAKE) && \
- cd ..;
-
install-contrib:
@cd contribs && \
$(MAKE) DESTDIR=$(DESTDIR) install && \
diff --git a/auxdir/Makefile.am b/auxdir/Makefile.am
index e493002..54a67d2 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 69c6395..80b49c2 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 0c6d028..a2640c7 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/perlapi/Makefile.am b/contribs/perlapi/Makefile.am
index 40c6a98..b6736a9 100644
--- a/contribs/perlapi/Makefile.am
+++ b/contribs/perlapi/Makefile.am
@@ -1 +1,2 @@
SUBDIRS = libslurm libslurmdb
+EXTRA_DIST = common/msg.h
diff --git a/contribs/perlapi/libslurm/Makefile.am
b/contribs/perlapi/libslurm/Makefile.am
index 7441df6..251015b 100644
--- a/contribs/perlapi/libslurm/Makefile.am
+++ b/contribs/perlapi/libslurm/Makefile.am
@@ -53,6 +53,9 @@ test_sources = \
$(perl_dir)/t/22-list.t \
$(perl_dir)/t/23-bitstr.t
+EXTRA_DIST = $(perl_sources) $(test_sources)
+
+
$(perl_dir)/Makefile: $(perl_dir)/Makefile.PL
@if test "x${top_srcdir}" != "x${top_builddir}"; then \
for f in ${perl_sources}; do \
diff --git a/contribs/perlapi/libslurmdb/Makefile.am
b/contribs/perlapi/libslurmdb/Makefile.am
index 7119a15..9275446 100644
--- a/contribs/perlapi/libslurmdb/Makefile.am
+++ b/contribs/perlapi/libslurmdb/Makefile.am
@@ -11,6 +11,16 @@ perl_sources = \
$(perl_dir)/slurmdb-perl.h \
$(perl_dir)/cluster.c
+test_sources = \
+ $(perl_dir)/t/00-use.t \
+ $(perl_dir)/t/01-clusters_get.t \
+ $(perl_dir)/t/02-report_cluster_account_by_user.t \
+ $(perl_dir)/t/03-report_cluster_user_by_account.t \
+ $(perl_dir)/t/04-report_job_sizes_grouped_by_top_account.t \
+ $(perl_dir)/t/05-report_user_top_usage.t
+
+EXTRA_DIST = $(perl_sources) $(test_sources)
+
$(perl_dir)/Makefile: $(perl_dir)/Makefile.PL
@if test "x${top_srcdir}" != "x${top_builddir}"; then \
for f in ${perl_sources}; do \
diff --git a/contribs/pmi2/Makefile.am b/contribs/pmi2/Makefile.am
index 8ebff51..d614be0 100644
--- a/contribs/pmi2/Makefile.am
+++ b/contribs/pmi2/Makefile.am
@@ -4,6 +4,7 @@
AUTOMAKE_OPTIONS = foreign
pkginclude_HEADERS = slurm/pmi2.h
+noinst_HEADERS = pmi2_util.h
if WITH_GNU_LD
PMI2_VERSION_SCRIPT = \
diff --git a/contribs/slurmdb-direct/Makefile.am
b/contribs/slurmdb-direct/Makefile.am
index 210ff14..f30993a 100644
--- a/contribs/slurmdb-direct/Makefile.am
+++ b/contribs/slurmdb-direct/Makefile.am
@@ -5,6 +5,7 @@ AUTOMAKE_OPTIONS = foreign
sbin_SCRIPTS = moab_2_slurmdb
extra = config.slurmdb.pl
+EXTRA_DIST = $(extra)
moab_2_slurmdb:
diff --git a/src/plugins/jobacct_gather/Makefile.am
b/src/plugins/jobacct_gather/Makefile.am
index 21525a1..3c675eb 100644
--- a/src/plugins/jobacct_gather/Makefile.am
+++ b/src/plugins/jobacct_gather/Makefile.am
@@ -1,3 +1,3 @@
# Makefile for jobacct plugins
-SUBDIRS = linux aix cgroup none
+SUBDIRS = linux aix cgroup none common
diff --git a/src/plugins/launch/slurm/Makefile.am
b/src/plugins/launch/slurm/Makefile.am
index cd585bd..6671141 100644
--- a/src/plugins/launch/slurm/Makefile.am
+++ b/src/plugins/launch/slurm/Makefile.am
@@ -8,6 +8,6 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = launch_slurm.la
-launch_slurm_la_SOURCES = launch_slurm.c task_state.c
+launch_slurm_la_SOURCES = launch_slurm.c task_state.c task_state.h
launch_slurm_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
diff --git a/src/sview/Makefile.am b/src/sview/Makefile.am
index 683d59c..942093d 100644
--- a/src/sview/Makefile.am
+++ b/src/sview/Makefile.am
@@ -11,7 +11,7 @@ bin_PROGRAMS = sview
sview_LDADD = $(top_builddir)/src/db_api/libslurmdb.o $(DL_LIBS)
-noinst_HEADERS = sview.h
+noinst_HEADERS = sview.h gthread_helper.h
sview_SOURCES = sview.c popups.c grid.c part_info.c job_info.c \
block_info.c front_end_info.c node_info.c resv_info.c \
submit_info.c admin_info.c common.c \
diff --git a/testsuite/expect/Makefile.am b/testsuite/expect/Makefile.am
index 8977678..e5fc5c2 100644
--- a/testsuite/expect/Makefile.am
+++ b/testsuite/expect/Makefile.am
@@ -101,7 +101,6 @@ EXTRA_DIST = \
test1.82 \
test1.83 \
test1.84 \
- test1.84.bash \
test1.85 \
test1.86 \
test1.87 \
@@ -514,16 +513,12 @@ EXTRA_DIST = \
test32.12 \
test33.1 \
test33.1.prog.c \
- etc.33.1.1/slurm.conf \
etc.33.1.1/testcases \
etc.33.1.1/topology.conf \
- etc.33.1.2/slurm.conf \
etc.33.1.2/testcases \
etc.33.1.2/topology.conf \
- etc.33.1.3/slurm.conf \
etc.33.1.3/testcases \
etc.33.1.3/topology.conf \
- etc.33.1.4/slurm.conf \
etc.33.1.4/testcases \
etc.33.1.4/topology.conf \
test34.1 \
diff --git a/testsuite/expect/Makefile.in b/testsuite/expect/Makefile.in
index 17c208c..8105d4b 100644
--- a/testsuite/expect/Makefile.in
+++ b/testsuite/expect/Makefile.in
@@ -485,7 +485,6 @@ EXTRA_DIST = \
test1.82 \
test1.83 \
test1.84 \
- test1.84.bash \
test1.85 \
test1.86 \
test1.87 \
@@ -898,16 +897,12 @@ EXTRA_DIST = \
test32.12 \
test33.1 \
test33.1.prog.c \
- etc.33.1.1/slurm.conf \
etc.33.1.1/testcases \
etc.33.1.1/topology.conf \
- etc.33.1.2/slurm.conf \
etc.33.1.2/testcases \
etc.33.1.2/topology.conf \
- etc.33.1.3/slurm.conf \
etc.33.1.3/testcases \
etc.33.1.3/topology.conf \
- etc.33.1.4/slurm.conf \
etc.33.1.4/testcases \
etc.33.1.4/topology.conf \
test34.1 \
