Remove EXTRA_DIST and run autoreconf.

SchedMD · Jul 3, 2020 · 29df16f · 29df16f
1 parent 2c0d846
commit 29df16f
Show file tree

Hide file tree

Showing 38 changed files with 4 additions and 1,594 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -3,30 +3,6 @@ AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I auxdir
 SUBDIRS    = auxdir src testsuite doc etc
 
-EXTRA_DIST =			\
-	etc/cgroup.conf.example \
-	etc/cgroup_allowed_devices_file.conf.example \
-	etc/init.d.slurm.in	\
-	etc/init.d.slurmdbd.in	\
-	etc/layouts.d.power.conf.example \
-	etc/layouts.d.power_cpufreq.conf.example \
-	etc/layouts.d.unit.conf.example \
-	etc/slurm.conf.example	\
-	etc/slurmctld.service.in \
-	etc/slurmd.service.in	\
-	etc/slurmdbd.conf.example \
-	etc/slurmdbd.service.in	\
-	slurm.spec		\
-	README.rst		\
-	RELEASE_NOTES		\
-	DISCLAIMER		\
-	COPYING			\
-	AUTHORS			\
-	INSTALL			\
-	LICENSE.OpenSSL		\
-	NEWS			\
-	META
-
 pkginclude_HEADERS =		\
 	slurm/pmi.h		\
 	slurm/slurm.h 		\

diff --git a/Makefile.in b/Makefile.in
@@ -492,30 +492,6 @@ top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I auxdir
 SUBDIRS = auxdir src testsuite doc etc
-EXTRA_DIST = \
-	etc/cgroup.conf.example \
-	etc/cgroup_allowed_devices_file.conf.example \
-	etc/init.d.slurm.in	\
-	etc/init.d.slurmdbd.in	\
-	etc/layouts.d.power.conf.example \
-	etc/layouts.d.power_cpufreq.conf.example \
-	etc/layouts.d.unit.conf.example \
-	etc/slurm.conf.example	\
-	etc/slurmctld.service.in \
-	etc/slurmd.service.in	\
-	etc/slurmdbd.conf.example \
-	etc/slurmdbd.service.in	\
-	slurm.spec		\
-	README.rst		\
-	RELEASE_NOTES		\
-	DISCLAIMER		\
-	COPYING			\
-	AUTHORS			\
-	INSTALL			\
-	LICENSE.OpenSSL		\
-	NEWS			\
-	META
-
 pkginclude_HEADERS = \
 	slurm/pmi.h		\
 	slurm/slurm.h 		\

diff --git a/auxdir/Makefile.am b/auxdir/Makefile.am
@@ -1,42 +1,3 @@
 ##****************************************************************************
 ## Process this file with automake to produce Makefile.in.
 ##****************************************************************************
-
-EXTRA_DIST = \
-    ax_check_zlib.m4 \
-    ax_gcc_builtin.m4 \
-    ax_lib_hdf5.m4 \
-    ax_pthread.m4 \
-    slurm.m4 \
-    slurmrestd.m4 \
-    test-driver \
-    x_ac_affinity.m4 \
-    x_ac_bluegene.m4 \
-    x_ac_c99.m4 \
-    x_ac_cgroup.m4 \
-    x_ac_cray.m4 \
-    x_ac_curl.m4 \
-    x_ac_databases.m4 \
-    x_ac_debug.m4 \
-    x_ac_dlfcn.m4 \
-    x_ac_env.m4 \
-    x_ac_gpl_licensed.m4 \
-    x_ac_http_parser.m4 \
-    x_ac_hwloc.m4 \
-    x_ac_json.m4 \
-    x_ac_jwt.m4 \
-    x_ac_lua.m4 \
-    x_ac_man2html.m4 \
-    x_ac_munge.m4 \
-    x_ac_netloc.m4 \
-    x_ac_nvml.m4 \
-    x_ac_pam.m4 \
-    x_ac_printf_null.m4 \
-    x_ac_ptrace.m4 \
-    x_ac_readline.m4 \
-    x_ac_rsmi.m4 \
-    x_ac_setproctitle.m4 \
-    x_ac_slurm_ssl.m4 \
-    x_ac_systemd.m4 \
-    x_ac_uid_gid_size.m4 \
-    x_ac_yaml.m4
diff --git a/auxdir/Makefile.in b/auxdir/Makefile.in
@@ -418,45 +418,6 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = \
-    ax_check_zlib.m4 \
-    ax_gcc_builtin.m4 \
-    ax_lib_hdf5.m4 \
-    ax_pthread.m4 \
-    slurm.m4 \
-    slurmrestd.m4 \
-    test-driver \
-    x_ac_affinity.m4 \
-    x_ac_bluegene.m4 \
-    x_ac_c99.m4 \
-    x_ac_cgroup.m4 \
-    x_ac_cray.m4 \
-    x_ac_curl.m4 \
-    x_ac_databases.m4 \
-    x_ac_debug.m4 \
-    x_ac_dlfcn.m4 \
-    x_ac_env.m4 \
-    x_ac_gpl_licensed.m4 \
-    x_ac_http_parser.m4 \
-    x_ac_hwloc.m4 \
-    x_ac_json.m4 \
-    x_ac_jwt.m4 \
-    x_ac_lua.m4 \
-    x_ac_man2html.m4 \
-    x_ac_munge.m4 \
-    x_ac_netloc.m4 \
-    x_ac_nvml.m4 \
-    x_ac_pam.m4 \
-    x_ac_printf_null.m4 \
-    x_ac_ptrace.m4 \
-    x_ac_readline.m4 \
-    x_ac_rsmi.m4 \
-    x_ac_setproctitle.m4 \
-    x_ac_slurm_ssl.m4 \
-    x_ac_systemd.m4 \
-    x_ac_uid_gid_size.m4 \
-    x_ac_yaml.m4
-
 all: all-am
 
 .SUFFIXES:

diff --git a/contribs/Makefile.am b/contribs/Makefile.am
@@ -1,11 +1 @@
 SUBDIRS = cray lua mic nss_slurm openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque
-
-EXTRA_DIST = \
-	make-3.81.slurm.patch	\
-	make-4.0.slurm.patch	\
-	sgather			\
-	skilling.c		\
-	sjstat			\
-	spank_core.c		\
-	time_login.c		\
-	README
diff --git a/contribs/Makefile.in b/contribs/Makefile.in
@@ -453,16 +453,6 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = cray lua mic nss_slurm openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque
-EXTRA_DIST = \
-	make-3.81.slurm.patch	\
-	make-4.0.slurm.patch	\
-	sgather			\
-	skilling.c		\
-	sjstat			\
-	spank_core.c		\
-	time_login.c		\
-	README
-
 all: all-recursive
 
 .SUFFIXES:

diff --git a/contribs/cray/Makefile.am b/contribs/cray/Makefile.am
@@ -22,19 +22,8 @@ capmc_suspend_LDFLAGS  = -export-dynamic $(JSON_LDFLAGS)
 capmc_resume_SOURCES   = capmc_resume.c
 capmc_resume_LDADD     = $(convenience_libs)
 capmc_resume_LDFLAGS   = -export-dynamic $(JSON_LDFLAGS)
-else
-NATIVE_EXTRA_DIST = capmc_suspend.c capmc_resume.c
 endif
 
-EXTRA_DIST = \
-	$(NATIVE_EXTRA_DIST)		\
-	etc_sysconfig_slurm		\
-	opt_modulefiles_slurm.in	\
-	pam_job.c 			\
-	plugstack.conf.template		\
-	slurm.conf.template		\
-	slurmconfgen.py.in
-
 # Don't rely on autoconf to replace variables outside of makefiles
 opt_modulefiles_slurm: opt_modulefiles_slurm.in Makefile
 	sed -e 's|@prefix[@]|$(prefix)|g' \

diff --git a/contribs/cray/Makefile.in b/contribs/cray/Makefile.in
@@ -551,16 +551,6 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(JSON_CPPFLAGS)
 @WITH_JSON_PARSER_TRUE@capmc_resume_SOURCES = capmc_resume.c
 @WITH_JSON_PARSER_TRUE@capmc_resume_LDADD = $(convenience_libs)
 @WITH_JSON_PARSER_TRUE@capmc_resume_LDFLAGS = -export-dynamic $(JSON_LDFLAGS)
-@WITH_JSON_PARSER_FALSE@NATIVE_EXTRA_DIST = capmc_suspend.c capmc_resume.c
-EXTRA_DIST = \
-	$(NATIVE_EXTRA_DIST)		\
-	etc_sysconfig_slurm		\
-	opt_modulefiles_slurm.in	\
-	pam_job.c 			\
-	plugstack.conf.template		\
-	slurm.conf.template		\
-	slurmconfgen.py.in
-
 all: all-recursive
 
 .SUFFIXES:

diff --git a/contribs/cray/csm/Makefile.am b/contribs/cray/csm/Makefile.am
@@ -1,9 +1,3 @@
 #
 # Makefile for cray/csm scripts
 #
-
-EXTRA_DIST = \
-	gres.conf.j2			\
-	slurm.conf.j2			\
-	slurmconfgen_smw.py		\
-	slurm_playbook.yaml
diff --git a/contribs/cray/csm/Makefile.in b/contribs/cray/csm/Makefile.in
@@ -13,10 +13,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
-#
-# Makefile for cray/csm scripts
-#
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
@@ -422,12 +418,6 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = \
-	gres.conf.j2			\
-	slurm.conf.j2			\
-	slurmconfgen_smw.py		\
-	slurm_playbook.yaml
-
 all: all-am
 
 .SUFFIXES:
@@ -589,6 +579,10 @@ uninstall-am:
 .PRECIOUS: Makefile
 
 
+#
+# Makefile for cray/csm scripts
+#
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/contribs/lua/Makefile.am b/contribs/lua/Makefile.am
@@ -1,3 +0,0 @@
-EXTRA_DIST = \
-	job_submit.license.lua	\
-	job_submit.lua

diff --git a/contribs/lua/Makefile.in b/contribs/lua/Makefile.in
@@ -418,10 +418,6 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = \
-	job_submit.license.lua	\
-	job_submit.lua
-
 all: all-am
 
 .SUFFIXES:

diff --git a/contribs/mic/Makefile.am b/contribs/mic/Makefile.am
@@ -1,2 +0,0 @@
-EXTRA_DIST = \
-	mpirun-mic

diff --git a/contribs/mic/Makefile.in b/contribs/mic/Makefile.in
@@ -418,9 +418,6 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = \
-	mpirun-mic
-
 all: all-am
 
 .SUFFIXES:

diff --git a/contribs/perlapi/Makefile.am b/contribs/perlapi/Makefile.am
@@ -1,2 +1 @@
 SUBDIRS = libslurm libslurmdb
-EXTRA_DIST = common/msg.h
diff --git a/contribs/perlapi/Makefile.in b/contribs/perlapi/Makefile.in
@@ -453,7 +453,6 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = libslurm libslurmdb
-EXTRA_DIST = common/msg.h
 all: all-recursive
 
 .SUFFIXES:

diff --git a/contribs/perlapi/libslurm/Makefile.am b/contribs/perlapi/libslurm/Makefile.am
@@ -50,9 +50,6 @@ 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/libslurm/Makefile.in b/contribs/perlapi/libslurm/Makefile.in
@@ -471,7 +471,6 @@ test_sources = \
 	$(perl_dir)/t/22-list.t \
 	$(perl_dir)/t/23-bitstr.t
 
-EXTRA_DIST = $(perl_sources) $(test_sources)
 AM_CPPFLAGS = \
 	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir) \

diff --git a/contribs/perlapi/libslurmdb/Makefile.am b/contribs/perlapi/libslurmdb/Makefile.am
@@ -21,8 +21,6 @@ test_sources = \
 	       $(perl_dir)/t/06-jobs_get.t \
 	       $(perl_dir)/t/07-qos_get.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.in b/contribs/perlapi/libslurmdb/Makefile.in
@@ -441,7 +441,6 @@ test_sources = \
 	       $(perl_dir)/t/06-jobs_get.t \
 	       $(perl_dir)/t/07-qos_get.t
 
-EXTRA_DIST = $(perl_sources) $(test_sources)
 AM_CPPFLAGS = \
 	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir) \

diff --git a/contribs/sgi/Makefile.am b/contribs/sgi/Makefile.am
@@ -6,16 +6,9 @@ AUTOMAKE_OPTIONS = foreign
 
 if HAVE_NETLOC
 
-EXTRA_DIST = README.txt
 bin_PROGRAMS = netloc_to_topology
 netloc_to_topology_SOURCES  = netloc_to_topology.c
 netloc_to_topology_CPPFLAGS = $(NETLOC_CPPFLAGS) $(HWLOC_CPPFLAGS)
 netloc_to_topology_LDFLAGS  = $(NETLOC_LDFLAGS) $(NETLOC_LIBS) $(HWLOC_LDFLAGS) $(HWLOC_LIBS)
 
-else
-
-EXTRA_DIST = \
-	netloc_to_topology.c	\
-	README.txt
-
 endif
diff --git a/contribs/sgi/Makefile.in b/contribs/sgi/Makefile.in
@@ -480,11 +480,6 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
-@HAVE_NETLOC_FALSE@EXTRA_DIST = \
-@HAVE_NETLOC_FALSE@	netloc_to_topology.c	\
-@HAVE_NETLOC_FALSE@	README.txt
-
-@HAVE_NETLOC_TRUE@EXTRA_DIST = README.txt
 @HAVE_NETLOC_TRUE@netloc_to_topology_SOURCES = netloc_to_topology.c
 @HAVE_NETLOC_TRUE@netloc_to_topology_CPPFLAGS = $(NETLOC_CPPFLAGS) $(HWLOC_CPPFLAGS)
 @HAVE_NETLOC_TRUE@netloc_to_topology_LDFLAGS = $(NETLOC_LDFLAGS) $(NETLOC_LIBS) $(HWLOC_LDFLAGS) $(HWLOC_LIBS)

diff --git a/doc/html/Makefile.am b/doc/html/Makefile.am
@@ -151,8 +151,6 @@ html_DATA = \
 
 MOSTLYCLEANFILES = ${generated_html}
 
-EXTRA_DIST = $(html_DATA)
-
 SUFFIXES = .html
 
 .shtml.html:

diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
@@ -597,7 +597,6 @@ html_DATA = \
 	usage_pies.gif
 
 MOSTLYCLEANFILES = ${generated_html}
-EXTRA_DIST = $(html_DATA)
 SUFFIXES = .html
 all: all-am
 

diff --git a/doc/man/man1/Makefile.am b/doc/man/man1/Makefile.am
@@ -28,8 +28,6 @@ if BUILD_SVIEW
 man1_MANS += sview.1
 endif
 
-EXTRA_DIST = $(man1_MANS)
-
 if HAVE_MAN2HTML
 
 html_DATA = \
@@ -61,8 +59,6 @@ endif
 
 MOSTLYCLEANFILES = ${html_DATA}
 
-EXTRA_DIST += $(html_DATA)
-
 SUFFIXES = .html
 
 .1.html: