diff --git a/doc/html/Makefile.am b/doc/html/Makefile.am
index 907ca9074b9c8992faa827e5405da322a6658e21..e617efcc48886f5b0e9361f7f3da156c1e18f2b4 100644
--- a/doc/html/Makefile.am
+++ b/doc/html/Makefile.am
@@ -117,6 +117,7 @@ html_DATA = \
${generated_html} \
allocation_pies.gif \
arch.gif \
+ bull.jpg \
coding_style.pdf \
configurator.html \
entities.gif \
diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index 9ef3897174661bc5aa61864390dfdc4fa4750747..519716eced66730fecde136391e9436358b7daca 100644
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -417,6 +417,7 @@ html_DATA = \
${generated_html} \
allocation_pies.gif \
arch.gif \
+ bull.jpg \
coding_style.pdf \
configurator.html \
entities.gif \
diff --git a/src/api/Makefile.am b/src/api/Makefile.am
index b03bf4eef89e5e82ecb7e48e78a3abcd0f0a7e76..336b8d09212fe1237f782e7312b2e9238516d696 100644
--- a/src/api/Makefile.am
+++ b/src/api/Makefile.am
@@ -88,7 +88,7 @@ slurmapi_src = \
config_info.c \
front_end_info.c \
init_msg.c \
- job_info.c job_info.h \
+ job_info.c \
job_step_info.c \
node_info.c \
partition_info.c \
diff --git a/src/api/Makefile.in b/src/api/Makefile.in
index 71bb6c0e565e9a3a1f30b224ec4107b98baaa2e7..78138c42b02523c2c3bbfba3987ec3eeb2f9896d 100644
--- a/src/api/Makefile.in
+++ b/src/api/Makefile.in
@@ -439,7 +439,7 @@ slurmapi_src = \
config_info.c \
front_end_info.c \
init_msg.c \
- job_info.c job_info.h \
+ job_info.c \
job_step_info.c \
node_info.c \
partition_info.c \
diff --git a/src/plugins/accounting_storage/mysql/Makefile.am b/src/plugins/accounting_storage/mysql/Makefile.am
index 1adf70244ca2c45475d2e171f4cb2a58aba4fda6..a884637904fadc302f2ef7634242bd900b784889 100644
--- a/src/plugins/accounting_storage/mysql/Makefile.am
+++ b/src/plugins/accounting_storage/mysql/Makefile.am
@@ -8,8 +8,8 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
AS_MYSQL_SOURCES = accounting_storage_mysql.c accounting_storage_mysql.h \
as_mysql_acct.c as_mysql_acct.h \
- as_mysql_archive.c as_mysql_arvhive.h \
- as_mysql_assoc.c as_mysql_accoc.h \
+ as_mysql_archive.c as_mysql_archive.h \
+ as_mysql_assoc.c as_mysql_assoc.h \
as_mysql_cluster.c as_mysql_cluster.h \
as_mysql_convert.c as_mysql_convert.h \
as_mysql_job.c as_mysql_job.h \
diff --git a/src/plugins/accounting_storage/mysql/Makefile.in b/src/plugins/accounting_storage/mysql/Makefile.in
index e13d6c434d431e327ec8485c0551cbbebcefcbe1..6f90d7e6d3ecf332cf25ee1b59abe0dab709c987 100644
--- a/src/plugins/accounting_storage/mysql/Makefile.in
+++ b/src/plugins/accounting_storage/mysql/Makefile.in
@@ -113,7 +113,7 @@ am__DEPENDENCIES_1 =
am__accounting_storage_mysql_la_SOURCES_DIST = \
accounting_storage_mysql.c accounting_storage_mysql.h \
as_mysql_acct.c as_mysql_acct.h as_mysql_archive.c \
- as_mysql_arvhive.h as_mysql_assoc.c as_mysql_accoc.h \
+ as_mysql_archive.h as_mysql_assoc.c as_mysql_assoc.h \
as_mysql_cluster.c as_mysql_cluster.h as_mysql_convert.c \
as_mysql_convert.h as_mysql_job.c as_mysql_job.h \
as_mysql_jobacct_process.c as_mysql_jobacct_process.h \
@@ -145,7 +145,7 @@ am__objects_1 = \
am__EXTRA_accounting_storage_mysql_la_SOURCES_DIST = \
accounting_storage_mysql.c accounting_storage_mysql.h \
as_mysql_acct.c as_mysql_acct.h as_mysql_archive.c \
- as_mysql_arvhive.h as_mysql_assoc.c as_mysql_accoc.h \
+ as_mysql_archive.h as_mysql_assoc.c as_mysql_assoc.h \
as_mysql_cluster.c as_mysql_cluster.h as_mysql_convert.c \
as_mysql_convert.h as_mysql_job.c as_mysql_job.h \
as_mysql_jobacct_process.c as_mysql_jobacct_process.h \
@@ -385,8 +385,8 @@ PLUGIN_FLAGS = -module -avoid-version --export-dynamic
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
AS_MYSQL_SOURCES = accounting_storage_mysql.c accounting_storage_mysql.h \
as_mysql_acct.c as_mysql_acct.h \
- as_mysql_archive.c as_mysql_arvhive.h \
- as_mysql_assoc.c as_mysql_accoc.h \
+ as_mysql_archive.c as_mysql_archive.h \
+ as_mysql_assoc.c as_mysql_assoc.h \
as_mysql_cluster.c as_mysql_cluster.h \
as_mysql_convert.c as_mysql_convert.h \
as_mysql_job.c as_mysql_job.h \
diff --git a/src/plugins/accounting_storage/pgsql/Makefile.am b/src/plugins/accounting_storage/pgsql/Makefile.am
index 8597055480f09e6b17586dff07b905d73798b363..d8b11af8d6823ded573fce3bcc5d614596a0bbdd 100644
--- a/src/plugins/accounting_storage/pgsql/Makefile.am
+++ b/src/plugins/accounting_storage/pgsql/Makefile.am
@@ -13,7 +13,7 @@ AS_PG_SOURCES= accounting_storage_pgsql.c accounting_storage_pgsql.h \
as_pg_assoc.c as_pg_assoc.h \
as_pg_cluster.c as_pg_cluster.h \
as_pg_event.c as_pg_event.h \
- as_pg_get_jobs.c as_pg_get_jobs.h \
+ as_pg_get_jobs.c \
as_pg_job.c as_pg_job.h \
as_pg_problem.c as_pg_problem.h \
as_pg_qos.c as_pg_qos.h \
diff --git a/src/plugins/accounting_storage/pgsql/Makefile.in b/src/plugins/accounting_storage/pgsql/Makefile.in
index 03aaf5098a3e8af04c6575155ac07c87363b09d9..27f945d0785bcee6d61f699daf9c5972266fc16b 100644
--- a/src/plugins/accounting_storage/pgsql/Makefile.in
+++ b/src/plugins/accounting_storage/pgsql/Makefile.in
@@ -115,11 +115,11 @@ am__accounting_storage_pgsql_la_SOURCES_DIST = \
as_pg_common.c as_pg_common.h as_pg_acct.c as_pg_acct.h \
as_pg_archive.c as_pg_archive.h as_pg_assoc.c as_pg_assoc.h \
as_pg_cluster.c as_pg_cluster.h as_pg_event.c as_pg_event.h \
- as_pg_get_jobs.c as_pg_get_jobs.h as_pg_job.c as_pg_job.h \
- as_pg_problem.c as_pg_problem.h as_pg_qos.c as_pg_qos.h \
- as_pg_resv.c as_pg_resv.h as_pg_rollup.c as_pg_rollup.h \
- as_pg_txn.c as_pg_txn.h as_pg_usage.c as_pg_usage.h \
- as_pg_user.c as_pg_user.h as_pg_wckey.c as_pg_wckey.h
+ as_pg_get_jobs.c as_pg_job.c as_pg_job.h as_pg_problem.c \
+ as_pg_problem.h as_pg_qos.c as_pg_qos.h as_pg_resv.c \
+ as_pg_resv.h as_pg_rollup.c as_pg_rollup.h as_pg_txn.c \
+ as_pg_txn.h as_pg_usage.c as_pg_usage.h as_pg_user.c \
+ as_pg_user.h as_pg_wckey.c as_pg_wckey.h
am__objects_1 = \
accounting_storage_pgsql_la-accounting_storage_pgsql.lo \
accounting_storage_pgsql_la-as_pg_common.lo \
@@ -145,11 +145,11 @@ am__EXTRA_accounting_storage_pgsql_la_SOURCES_DIST = \
as_pg_common.c as_pg_common.h as_pg_acct.c as_pg_acct.h \
as_pg_archive.c as_pg_archive.h as_pg_assoc.c as_pg_assoc.h \
as_pg_cluster.c as_pg_cluster.h as_pg_event.c as_pg_event.h \
- as_pg_get_jobs.c as_pg_get_jobs.h as_pg_job.c as_pg_job.h \
- as_pg_problem.c as_pg_problem.h as_pg_qos.c as_pg_qos.h \
- as_pg_resv.c as_pg_resv.h as_pg_rollup.c as_pg_rollup.h \
- as_pg_txn.c as_pg_txn.h as_pg_usage.c as_pg_usage.h \
- as_pg_user.c as_pg_user.h as_pg_wckey.c as_pg_wckey.h
+ as_pg_get_jobs.c as_pg_job.c as_pg_job.h as_pg_problem.c \
+ as_pg_problem.h as_pg_qos.c as_pg_qos.h as_pg_resv.c \
+ as_pg_resv.h as_pg_rollup.c as_pg_rollup.h as_pg_txn.c \
+ as_pg_txn.h as_pg_usage.c as_pg_usage.h as_pg_user.c \
+ as_pg_user.h as_pg_wckey.c as_pg_wckey.h
accounting_storage_pgsql_la_OBJECTS = \
$(am_accounting_storage_pgsql_la_OBJECTS)
accounting_storage_pgsql_la_LINK = $(LIBTOOL) --tag=CC \
@@ -385,7 +385,7 @@ AS_PG_SOURCES = accounting_storage_pgsql.c accounting_storage_pgsql.h \
as_pg_assoc.c as_pg_assoc.h \
as_pg_cluster.c as_pg_cluster.h \
as_pg_event.c as_pg_event.h \
- as_pg_get_jobs.c as_pg_get_jobs.h \
+ as_pg_get_jobs.c \
as_pg_job.c as_pg_job.h \
as_pg_problem.c as_pg_problem.h \
as_pg_qos.c as_pg_qos.h \
diff --git a/src/plugins/task/cgroup/Makefile.in b/src/plugins/task/cgroup/Makefile.in
index d7c65e7959bcf4fc8749e621116b0a9ca88eadfd..fe877952912ebe54b677fd6a099912ea65e818ff 100644
--- a/src/plugins/task/cgroup/Makefile.in
+++ b/src/plugins/task/cgroup/Makefile.in
@@ -336,7 +336,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
pkglib_LTLIBRARIES = task_cgroup.la
# cgroup task plugin.
-task_cgroup_la_SOURCES = task_cgroup.c \
+task_cgroup_la_SOURCES = task_cgroup.h task_cgroup.c \
task_cgroup_cpuset.h task_cgroup_cpuset.c \
task_cgroup_memory.h task_cgroup_memory.c \
task_cgroup_devices.h task_cgroup_devices.c
diff --git a/src/sacct/Makefile.am b/src/sacct/Makefile.am
index 5621a8607bb6eb596c7efdbfe0ed940907c3db7c..09e9d7a71639ebd2e30d9f5c43e3c2e702717921 100644
--- a/src/sacct/Makefile.am
+++ b/src/sacct/Makefile.am
@@ -12,7 +12,12 @@ sacct_LDADD = $(top_builddir)/src/db_api/libslurmdb.o -ldl
sacct_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
noinst_HEADERS = sacct.c
-sacct_SOURCES = sacct.c process.c print.c options.c
+sacct_SOURCES = \
+ options.c \
+ print.c \
+ process.c \
+ sacct.c \
+ sacct.h
force:
$(sacct_LDADD) : force
diff --git a/src/sacct/Makefile.in b/src/sacct/Makefile.in
index 82bdf53147494d23446ddbc4859bc294d89ccb25..f8648fdfb4872af2028d1cfdd0edec495513d703 100644
--- a/src/sacct/Makefile.in
+++ b/src/sacct/Makefile.in
@@ -88,8 +88,8 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS)
-am_sacct_OBJECTS = sacct.$(OBJEXT) process.$(OBJEXT) print.$(OBJEXT) \
- options.$(OBJEXT)
+am_sacct_OBJECTS = options.$(OBJEXT) print.$(OBJEXT) process.$(OBJEXT) \
+ sacct.$(OBJEXT)
sacct_OBJECTS = $(am_sacct_OBJECTS)
sacct_DEPENDENCIES = $(top_builddir)/src/db_api/libslurmdb.o
sacct_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -317,7 +317,13 @@ INCLUDES = -I$(top_srcdir)
sacct_LDADD = $(top_builddir)/src/db_api/libslurmdb.o -ldl
sacct_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
noinst_HEADERS = sacct.c
-sacct_SOURCES = sacct.c process.c print.c options.c
+sacct_SOURCES = \
+ options.c \
+ print.c \
+ process.c \
+ sacct.c \
+ sacct.h
+
all: all-am
.SUFFIXES:
diff --git a/src/sstat/Makefile.am b/src/sstat/Makefile.am
index 2d48f5ced2cbb70531825a9f210b4adafc58b70f..020f54a835a19877ea7bc86d73fa0fdb3250bb27 100644
--- a/src/sstat/Makefile.am
+++ b/src/sstat/Makefile.am
@@ -8,9 +8,12 @@ bin_PROGRAMS = sstat
sstat_LDADD = $(top_builddir)/src/api/libslurm.o -ldl
-
-noinst_HEADERS = sstat.c
-sstat_SOURCES = sstat.c process.c print.c options.c
+sstat_SOURCES = \
+ options.c \
+ print.c \
+ process.c \
+ sstat.c \
+ sstat.h
force:
$(sstat_LDADD) : force
diff --git a/src/sstat/Makefile.in b/src/sstat/Makefile.in
index d5e025609993500847d97cb128e02386a6ab411b..338a96e0e0199a4dbab3520aa986677c234475a3 100644
--- a/src/sstat/Makefile.in
+++ b/src/sstat/Makefile.in
@@ -17,7 +17,6 @@
# Makefile for sstat
-
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -40,8 +39,7 @@ host_triplet = @host@
target_triplet = @target@
bin_PROGRAMS = sstat$(EXEEXT)
subdir = src/sstat
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
$(top_srcdir)/auxdir/libtool.m4 \
@@ -88,8 +86,8 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS)
-am_sstat_OBJECTS = sstat.$(OBJEXT) process.$(OBJEXT) print.$(OBJEXT) \
- options.$(OBJEXT)
+am_sstat_OBJECTS = options.$(OBJEXT) print.$(OBJEXT) process.$(OBJEXT) \
+ sstat.$(OBJEXT)
sstat_OBJECTS = $(am_sstat_OBJECTS)
sstat_DEPENDENCIES = $(top_builddir)/src/api/libslurm.o
sstat_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -110,7 +108,6 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(sstat_SOURCES)
DIST_SOURCES = $(sstat_SOURCES)
-HEADERS = $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -314,8 +311,13 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
INCLUDES = -I$(top_srcdir)
sstat_LDADD = $(top_builddir)/src/api/libslurm.o -ldl
-noinst_HEADERS = sstat.c
-sstat_SOURCES = sstat.c process.c print.c options.c
+sstat_SOURCES = \
+ options.c \
+ print.c \
+ process.c \
+ sstat.c \
+ sstat.h
+
sstat_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
all: all-am
@@ -520,7 +522,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(PROGRAMS) $(HEADERS)
+all-am: Makefile $(PROGRAMS)
installdirs:
for dir in "$(DESTDIR)$(bindir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \