src/api/Makefile.am | 3 +-- src/api/Makefile.in | 3 +-- src/plugins/accounting_storage/filetxt/Makefile.am | 4 ++++ src/plugins/accounting_storage/mysql/Makefile.am | 4 ++++ src/plugins/accounting_storage/none/Makefile.am | 4 ++++ src/plugins/accounting_storage/pgsql/Makefile.am | 4 ++++ .../accounting_storage/slurmdbd/Makefile.am | 5 +++-- src/plugins/auth/none/Makefile.am | 4 ++++ src/plugins/checkpoint/blcr/Makefile.am | 4 ++++ src/plugins/checkpoint/ompi/Makefile.am | 4 ++++ src/plugins/checkpoint/xlch/Makefile.am | 4 ++++ src/plugins/checkpoint/xlch/checkpoint_xlch.c | 1 + src/plugins/crypto/openssl/Makefile.am | 5 ++++- src/plugins/jobacct_gather/aix/Makefile.am | 3 +++ src/plugins/jobacct_gather/linux/Makefile.am | 3 +++ src/plugins/jobacct_gather/none/Makefile.am | 4 ++++ src/plugins/jobcomp/filetxt/Makefile.am | 4 ++++ src/plugins/jobcomp/mysql/Makefile.am | 4 ++++ src/plugins/jobcomp/pgsql/Makefile.am | 4 ++++ src/plugins/jobcomp/script/Makefile.am | 4 ++++ src/plugins/mpi/lam/Makefile.am | 4 ++++ src/plugins/mpi/mpich1_p4/Makefile.am | 4 ++++ src/plugins/mpi/mpich1_shmem/Makefile.am | 4 ++++ src/plugins/mpi/mpichgm/Makefile.am | 4 ++++ src/plugins/mpi/mpichmx/Makefile.am | 4 ++++ src/plugins/mpi/mvapich/Makefile.am | 4 ++++ src/plugins/mpi/none/Makefile.am | 4 ++++ src/plugins/mpi/openmpi/Makefile.am | 4 ++++ src/plugins/priority/basic/Makefile.am | 4 ++++ src/plugins/priority/multifactor/Makefile.am | 5 ++++- src/plugins/proctrack/linuxproc/Makefile.am | 5 +++++ src/plugins/sched/backfill/Makefile.am | 4 ++++ src/plugins/sched/builtin/Makefile.am | 4 ++++ src/plugins/sched/gang/Makefile.am | 4 ++++ src/plugins/sched/hold/Makefile.am | 4 ++++ src/plugins/sched/wiki/Makefile.am | 4 ++++ src/plugins/sched/wiki2/Makefile.am | 4 ++++ src/plugins/select/cons_res/Makefile.am | 4 ++++ src/plugins/select/linear/Makefile.am | 3 +++ src/plugins/switch/none/Makefile.am | 4 ++++ src/plugins/task/affinity/Makefile.am | 4 ++++ src/plugins/task/none/Makefile.am | 4 ++++ src/plugins/topology/3d_torus/Makefile.am | 4 ++++ src/plugins/topology/none/Makefile.am | 4 ++++ src/plugins/topology/tree/Makefile.am | 4 ++++ src/sacct/Makefile.am | 2 +- src/sacct/Makefile.in | 4 ++-- src/sacctmgr/Makefile.am | 2 +- src/sacctmgr/Makefile.in | 4 ++-- src/salloc/Makefile.am | 2 +- src/salloc/Makefile.in | 4 ++-- src/sattach/Makefile.am | 2 +- src/sattach/Makefile.in | 4 ++-- src/sbatch/Makefile.am | 2 +- src/sbatch/Makefile.in | 4 ++-- src/sbcast/Makefile.am | 2 +- src/sbcast/Makefile.in | 4 ++-- src/scancel/Makefile.am | 2 +- src/scancel/Makefile.in | 4 ++-- src/scontrol/Makefile.am | 2 +- src/scontrol/Makefile.in | 4 ++-- src/scontrol/update_job.c | 4 ++-- src/sinfo/Makefile.am | 2 +- src/sinfo/Makefile.in | 4 ++-- src/slurmctld/Makefile.am | 2 +- src/slurmctld/Makefile.in | 4 ++-- src/slurmd/slurmd/Makefile.am | 2 +- src/slurmd/slurmd/Makefile.in | 4 ++-- src/slurmd/slurmstepd/Makefile.am | 2 +- src/slurmd/slurmstepd/Makefile.in | 4 ++-- src/slurmdbd/Makefile.am | 2 +- src/slurmdbd/Makefile.in | 4 ++-- src/smap/Makefile.am | 2 +- src/smap/Makefile.in | 4 ++-- src/squeue/Makefile.am | 2 +- src/squeue/Makefile.in | 4 ++-- src/sreport/Makefile.am | 2 +- src/sreport/Makefile.in | 4 ++-- src/srun/Makefile.am | 2 +- src/srun/Makefile.in | 4 ++-- src/srun_cr/Makefile.am | 2 +- src/srun_cr/Makefile.in | 4 ++-- src/srun_cr/srun_cr.c | 2 +- src/sshare/Makefile.am | 2 +- src/sshare/Makefile.in | 4 ++-- src/sstat/Makefile.am | 2 +- src/sstat/Makefile.in | 4 ++-- src/strigger/Makefile.am | 2 +- src/strigger/Makefile.in | 4 ++-- src/sview/Makefile.am | 2 +- src/sview/Makefile.in | 4 ++-- 91 files changed, 237 insertions(+), 77 deletions(-) diff --git a/src/api/Makefile.am b/src/api/Makefile.am index 762c91d..b873862 100644 --- a/src/api/Makefile.am +++ b/src/api/Makefile.am @@ -8,8 +8,7 @@ INCLUDES = -I$(top_srcdir) if WITH_GNU_LD VERSION_SCRIPT = \ version.map -OTHER_FLAGS = \ - -Wl,--version-script=$(VERSION_SCRIPT) +OTHER_FLAGS = PMI_VERSION_SCRIPT = \ pmi_version.map PMI_OTHER_FLAGS = \ diff --git a/src/api/Makefile.in b/src/api/Makefile.in index 09ac0ed..910a1b0 100644 --- a/src/api/Makefile.in +++ b/src/api/Makefile.in @@ -322,8 +322,7 @@ INCLUDES = -I$(top_srcdir) @WITH_GNU_LD_TRUE@VERSION_SCRIPT = \ @WITH_GNU_LD_TRUE@ version.map -@WITH_GNU_LD_TRUE@OTHER_FLAGS = \ -@WITH_GNU_LD_TRUE@ -Wl,--version-script=$(VERSION_SCRIPT) +@WITH_GNU_LD_TRUE@OTHER_FLAGS = @WITH_GNU_LD_TRUE@PMI_VERSION_SCRIPT = \ @WITH_GNU_LD_TRUE@ pmi_version.map diff --git a/src/plugins/accounting_storage/filetxt/Makefile.am b/src/plugins/accounting_storage/filetxt/Makefile.am index b05f7f6..f836427 100644 --- a/src/plugins/accounting_storage/filetxt/Makefile.am +++ b/src/plugins/accounting_storage/filetxt/Makefile.am @@ -11,3 +11,7 @@ pkglib_LTLIBRARIES = accounting_storage_filetxt.la accounting_storage_filetxt_la_SOURCES = accounting_storage_filetxt.c \ filetxt_jobacct_process.c filetxt_jobacct_process.h accounting_storage_filetxt_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +accounting_storage_filetxt_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/accounting_storage/mysql/Makefile.am b/src/plugins/accounting_storage/mysql/Makefile.am index 78233a8..d8fe73e 100644 --- a/src/plugins/accounting_storage/mysql/Makefile.am +++ b/src/plugins/accounting_storage/mysql/Makefile.am @@ -16,8 +16,12 @@ accounting_storage_mysql_la_SOURCES = accounting_storage_mysql.c \ accounting_storage_mysql_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) accounting_storage_mysql_la_CFLAGS = $(MYSQL_CFLAGS) accounting_storage_mysql_la_LIBADD = \ + ../../../api/libslurm.la \ $(top_builddir)/src/database/libslurm_mysql.la $(MYSQL_LIBS) +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la + force: $(accounting_storage_mysql_la_LIBADD) : force @cd `dirname $@` && $(MAKE) `basename $@` diff --git a/src/plugins/accounting_storage/none/Makefile.am b/src/plugins/accounting_storage/none/Makefile.am index 122e92c..3e88300 100644 --- a/src/plugins/accounting_storage/none/Makefile.am +++ b/src/plugins/accounting_storage/none/Makefile.am @@ -10,3 +10,7 @@ pkglib_LTLIBRARIES = accounting_storage_none.la accounting_storage_none_la_SOURCES = accounting_storage_none.c accounting_storage_none_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +accounting_storage_none_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/accounting_storage/pgsql/Makefile.am b/src/plugins/accounting_storage/pgsql/Makefile.am index b4d649b..89a632b 100644 --- a/src/plugins/accounting_storage/pgsql/Makefile.am +++ b/src/plugins/accounting_storage/pgsql/Makefile.am @@ -15,8 +15,12 @@ accounting_storage_pgsql_la_SOURCES = accounting_storage_pgsql.c \ accounting_storage_pgsql_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) accounting_storage_pgsql_la_CFLAGS = $(PGSQL_CFLAGS) accounting_storage_pgsql_la_LIBADD = \ + ../../../api/libslurm.la \ $(top_builddir)/src/database/libslurm_pgsql.la $(PGSQL_LIBS) +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la + force: $(accounting_storage_pgsql_la_LIBADD) : force @cd `dirname $@` && $(MAKE) `basename $@` diff --git a/src/plugins/accounting_storage/slurmdbd/Makefile.am b/src/plugins/accounting_storage/slurmdbd/Makefile.am index ab90155..3f763ec 100644 --- a/src/plugins/accounting_storage/slurmdbd/Makefile.am +++ b/src/plugins/accounting_storage/slurmdbd/Makefile.am @@ -11,6 +11,7 @@ pkglib_LTLIBRARIES = accounting_storage_slurmdbd.la # Null job completion logging plugin. accounting_storage_slurmdbd_la_SOURCES = accounting_storage_slurmdbd.c accounting_storage_slurmdbd_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +accounting_storage_slurmdbd_la_LIBADD = ../../../api/libslurm.la - - +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/auth/none/Makefile.am b/src/plugins/auth/none/Makefile.am index 89f5203..df02c03 100644 --- a/src/plugins/auth/none/Makefile.am +++ b/src/plugins/auth/none/Makefile.am @@ -11,3 +11,7 @@ pkglib_LTLIBRARIES = auth_none.la # Null authentication plugin. auth_none_la_SOURCES = auth_none.c auth_none_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +auth_none_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/checkpoint/blcr/Makefile.am b/src/plugins/checkpoint/blcr/Makefile.am index bf629b6..7ad0454 100644 --- a/src/plugins/checkpoint/blcr/Makefile.am +++ b/src/plugins/checkpoint/blcr/Makefile.am @@ -10,6 +10,10 @@ if WITH_BLCR pkglib_LTLIBRARIES = checkpoint_blcr.la checkpoint_blcr_la_SOURCES = checkpoint_blcr.c checkpoint_blcr_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +checkpoint_blcr_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la dist_bin_SCRIPTS = cr_checkpoint.sh cr_restart.sh diff --git a/src/plugins/checkpoint/ompi/Makefile.am b/src/plugins/checkpoint/ompi/Makefile.am index b80b0d1..ac56bf2 100644 --- a/src/plugins/checkpoint/ompi/Makefile.am +++ b/src/plugins/checkpoint/ompi/Makefile.am @@ -11,3 +11,7 @@ pkglib_LTLIBRARIES = checkpoint_ompi.la # OpenMPI checkpoint plugin. checkpoint_ompi_la_SOURCES = checkpoint_ompi.c checkpoint_ompi_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +checkpoint_ompi_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/checkpoint/xlch/Makefile.am b/src/plugins/checkpoint/xlch/Makefile.am index 67c1f5c..2d5506c 100644 --- a/src/plugins/checkpoint/xlch/Makefile.am +++ b/src/plugins/checkpoint/xlch/Makefile.am @@ -9,6 +9,10 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common pkglib_LTLIBRARIES = checkpoint_xlch.la checkpoint_xlch_la_SOURCES = checkpoint_xlch.c checkpoint_xlch_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +checkpoint_xlch_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la force: diff --git a/src/plugins/checkpoint/xlch/checkpoint_xlch.c b/src/plugins/checkpoint/xlch/checkpoint_xlch.c index f2afc85..9852e1e 100644 --- a/src/plugins/checkpoint/xlch/checkpoint_xlch.c +++ b/src/plugins/checkpoint/xlch/checkpoint_xlch.c @@ -530,6 +530,7 @@ static void *_ckpt_agent_thr(void *arg) slurm_mutex_unlock(&ckpt_agent_mutex); list_iterator_destroy(iter); } + return NULL; } /* Queue a checkpoint request timeout */ diff --git a/src/plugins/crypto/openssl/Makefile.am b/src/plugins/crypto/openssl/Makefile.am index b55b6a3..10337f9 100644 --- a/src/plugins/crypto/openssl/Makefile.am +++ b/src/plugins/crypto/openssl/Makefile.am @@ -18,7 +18,10 @@ if HAVE_OPENSSL crypto_openssl_la_SOURCES = crypto_openssl.c crypto_openssl_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) $(SSL_LDFLAGS) -crypto_openssl_la_LIBADD = $(SSL_LIBS) +crypto_openssl_la_LIBADD = $(SSL_LIBS) ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la else EXTRA_crypto_openssl_la_SOURCES = crypto_openssl.c diff --git a/src/plugins/jobacct_gather/aix/Makefile.am b/src/plugins/jobacct_gather/aix/Makefile.am index 4ceb3a6..e86ed65 100644 --- a/src/plugins/jobacct_gather/aix/Makefile.am +++ b/src/plugins/jobacct_gather/aix/Makefile.am @@ -14,4 +14,7 @@ jobacct_gather_aix_la_SOURCES = jobacct_gather_aix.c \ $(top_builddir)/src/slurmd/common/proctrack.h jobacct_gather_aix_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +jobacct_gather_aix_la_LIBADD = ../../../api/libslurm.la +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/jobacct_gather/linux/Makefile.am b/src/plugins/jobacct_gather/linux/Makefile.am index 8a94517..2e7d0a3 100644 --- a/src/plugins/jobacct_gather/linux/Makefile.am +++ b/src/plugins/jobacct_gather/linux/Makefile.am @@ -14,4 +14,7 @@ jobacct_gather_linux_la_SOURCES = jobacct_gather_linux.c \ $(top_builddir)/src/slurmd/common/proctrack.h jobacct_gather_linux_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +jobacct_gather_linux_la_LIBADD = ../../../api/libslurm.la +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/jobacct_gather/none/Makefile.am b/src/plugins/jobacct_gather/none/Makefile.am index 08c8420..748f3b6 100644 --- a/src/plugins/jobacct_gather/none/Makefile.am +++ b/src/plugins/jobacct_gather/none/Makefile.am @@ -11,3 +11,7 @@ pkglib_LTLIBRARIES = jobacct_gather_none.la # Null job completion logging plugin. jobacct_gather_none_la_SOURCES = jobacct_gather_none.c jobacct_gather_none_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +jobacct_gather_none_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/jobcomp/filetxt/Makefile.am b/src/plugins/jobcomp/filetxt/Makefile.am index 0967681..05ddddd 100644 --- a/src/plugins/jobcomp/filetxt/Makefile.am +++ b/src/plugins/jobcomp/filetxt/Makefile.am @@ -13,3 +13,7 @@ jobcomp_filetxt_la_SOURCES = jobcomp_filetxt.c \ filetxt_jobcomp_process.c filetxt_jobcomp_process.h jobcomp_filetxt_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +jobcomp_filetxt_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/jobcomp/mysql/Makefile.am b/src/plugins/jobcomp/mysql/Makefile.am index 5b01a39..7b69969 100644 --- a/src/plugins/jobcomp/mysql/Makefile.am +++ b/src/plugins/jobcomp/mysql/Makefile.am @@ -15,8 +15,12 @@ jobcomp_mysql_la_SOURCES = jobcomp_mysql.c \ jobcomp_mysql_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) jobcomp_mysql_la_CFLAGS = $(MYSQL_CFLAGS) jobcomp_mysql_la_LIBADD = $(top_builddir)/src/database/libslurm_mysql.la \ + ../../../api/libslurm.la \ $(MYSQL_LIBS) jobcomp_mysql_la_DEPENDENCIES = $(top_builddir)/src/database/libslurm_mysql.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la else EXTRA_jobcomp_mysql_la_SOURCES = jobcomp_mysql.c \ mysql_jobcomp_process.c mysql_jobcomp_process.h diff --git a/src/plugins/jobcomp/pgsql/Makefile.am b/src/plugins/jobcomp/pgsql/Makefile.am index 6c78796..ef7f248 100644 --- a/src/plugins/jobcomp/pgsql/Makefile.am +++ b/src/plugins/jobcomp/pgsql/Makefile.am @@ -16,8 +16,12 @@ jobcomp_pgsql_la_SOURCES = jobcomp_pgsql.c \ jobcomp_pgsql_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) jobcomp_pgsql_la_CFLAGS = $(PGSQL_CFLAGS) jobcomp_pgsql_la_LIBADD = $(top_builddir)/src/database/libslurm_pgsql.la \ + ../../../api/libslurm.la \ $(PGSQL_LIBS) jobcomp_pgsql_la_DEPENDENCIES = $(top_builddir)/src/database/libslurm_pgsql.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la else EXTRA_jobcomp_pgsql_la_SOURCES = jobcomp_pgsql.c \ pgsql_jobcomp_process.c pgsql_jobcomp_process.h diff --git a/src/plugins/jobcomp/script/Makefile.am b/src/plugins/jobcomp/script/Makefile.am index eae162b..7cb1b73 100644 --- a/src/plugins/jobcomp/script/Makefile.am +++ b/src/plugins/jobcomp/script/Makefile.am @@ -11,3 +11,7 @@ pkglib_LTLIBRARIES = jobcomp_script.la # Text file job completion logging plugin. jobcomp_script_la_SOURCES = jobcomp_script.c jobcomp_script_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +jobcomp_script_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/mpi/lam/Makefile.am b/src/plugins/mpi/lam/Makefile.am index 1129817..3002538 100644 --- a/src/plugins/mpi/lam/Makefile.am +++ b/src/plugins/mpi/lam/Makefile.am @@ -10,3 +10,7 @@ pkglib_LTLIBRARIES = mpi_lam.la mpi_lam_la_SOURCES = mpi_lam.c lam.h mpi_lam_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +mpi_lam_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/mpi/mpich1_p4/Makefile.am b/src/plugins/mpi/mpich1_p4/Makefile.am index 3bfd2f2..0afe9a5 100644 --- a/src/plugins/mpi/mpich1_p4/Makefile.am +++ b/src/plugins/mpi/mpich1_p4/Makefile.am @@ -11,3 +11,7 @@ pkglib_LTLIBRARIES = mpi_mpich1_p4.la # Null MPI plugin. mpi_mpich1_p4_la_SOURCES = mpich1_p4.c mpi_mpich1_p4_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +mpi_mpich1_p4_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/mpi/mpich1_shmem/Makefile.am b/src/plugins/mpi/mpich1_shmem/Makefile.am index 99c1ba0..204b8cb 100644 --- a/src/plugins/mpi/mpich1_shmem/Makefile.am +++ b/src/plugins/mpi/mpich1_shmem/Makefile.am @@ -10,3 +10,7 @@ pkglib_LTLIBRARIES = mpi_mpich1_shmem.la mpi_mpich1_shmem_la_SOURCES = mpich1_shmem.c mpi_mpich1_shmem_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +mpi_mpich1_shmem_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/mpi/mpichgm/Makefile.am b/src/plugins/mpi/mpichgm/Makefile.am index 8e281e6..8f364f5 100644 --- a/src/plugins/mpi/mpichgm/Makefile.am +++ b/src/plugins/mpi/mpichgm/Makefile.am @@ -12,3 +12,7 @@ pkglib_LTLIBRARIES = mpi_mpichgm.la mpi_mpichgm_la_SOURCES = mpi_mpichgm.c mpichgm.c mpichgm.h\ $(top_srcdir)/src/common/mpi.h mpi_mpichgm_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +mpi_mpichgm_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/mpi/mpichmx/Makefile.am b/src/plugins/mpi/mpichmx/Makefile.am index c0bbfaf..9f54009 100644 --- a/src/plugins/mpi/mpichmx/Makefile.am +++ b/src/plugins/mpi/mpichmx/Makefile.am @@ -12,3 +12,7 @@ pkglib_LTLIBRARIES = mpi_mpichmx.la mpi_mpichmx_la_SOURCES = mpi_mpichmx.c mpichmx.c mpichmx.h\ $(top_srcdir)/src/common/mpi.h mpi_mpichmx_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +mpi_mpichmx_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/mpi/mvapich/Makefile.am b/src/plugins/mpi/mvapich/Makefile.am index 69d6d69..ed96b68 100644 --- a/src/plugins/mpi/mvapich/Makefile.am +++ b/src/plugins/mpi/mvapich/Makefile.am @@ -12,3 +12,7 @@ mpi_mvapich_la_SOURCES = mpi_mvapich.c mvapich.c mvapich.h\ $(top_srcdir)/src/common/mpi.h mpi_mvapich_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +mpi_mvapich_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/mpi/none/Makefile.am b/src/plugins/mpi/none/Makefile.am index f3551be..1313d40 100644 --- a/src/plugins/mpi/none/Makefile.am +++ b/src/plugins/mpi/none/Makefile.am @@ -11,3 +11,7 @@ pkglib_LTLIBRARIES = mpi_none.la # Null MPI plugin. mpi_none_la_SOURCES = mpi_none.c mpi_none_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +mpi_none_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/mpi/openmpi/Makefile.am b/src/plugins/mpi/openmpi/Makefile.am index 2db28cf..ad24814 100644 --- a/src/plugins/mpi/openmpi/Makefile.am +++ b/src/plugins/mpi/openmpi/Makefile.am @@ -11,3 +11,7 @@ pkglib_LTLIBRARIES = mpi_openmpi.la # OpenMPI MPI plugin. mpi_openmpi_la_SOURCES = mpi_openmpi.c mpi_openmpi_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +mpi_openmpi_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/priority/basic/Makefile.am b/src/plugins/priority/basic/Makefile.am index 48a2a7b..abbdaa9 100644 --- a/src/plugins/priority/basic/Makefile.am +++ b/src/plugins/priority/basic/Makefile.am @@ -11,3 +11,7 @@ pkglib_LTLIBRARIES = priority_basic.la # basic priority logging plugin. priority_basic_la_SOURCES = priority_basic.c priority_basic_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +priority_basic_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/priority/multifactor/Makefile.am b/src/plugins/priority/multifactor/Makefile.am index 1fd4972..75722f6 100644 --- a/src/plugins/priority/multifactor/Makefile.am +++ b/src/plugins/priority/multifactor/Makefile.am @@ -11,4 +11,7 @@ pkglib_LTLIBRARIES = priority_multifactor.la # Null priority logging plugin. priority_multifactor_la_SOURCES = priority_multifactor.c priority_multifactor_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) -priority_multifactor_la_LIBADD = -lm +priority_multifactor_la_LIBADD = -lm ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/proctrack/linuxproc/Makefile.am b/src/plugins/proctrack/linuxproc/Makefile.am index 4ae166c..18fa59e 100644 --- a/src/plugins/proctrack/linuxproc/Makefile.am +++ b/src/plugins/proctrack/linuxproc/Makefile.am @@ -14,3 +14,8 @@ proctrack_linuxproc_la_SOURCES = \ kill_tree.c \ kill_tree.h proctrack_linuxproc_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +proctrack_linuxproc_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la + diff --git a/src/plugins/sched/backfill/Makefile.am b/src/plugins/sched/backfill/Makefile.am index c1a316b..7a001aa 100644 --- a/src/plugins/sched/backfill/Makefile.am +++ b/src/plugins/sched/backfill/Makefile.am @@ -14,3 +14,7 @@ sched_backfill_la_SOURCES = backfill_wrapper.c \ backfill.c \ backfill.h sched_backfill_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +sched_backfill_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/sched/builtin/Makefile.am b/src/plugins/sched/builtin/Makefile.am index 7fa480d..25aa7e4 100644 --- a/src/plugins/sched/builtin/Makefile.am +++ b/src/plugins/sched/builtin/Makefile.am @@ -12,3 +12,7 @@ pkglib_LTLIBRARIES = sched_builtin.la sched_builtin_la_SOURCES = builtin_wrapper.c sched_builtin_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +sched_builtin_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/sched/gang/Makefile.am b/src/plugins/sched/gang/Makefile.am index ec41427..aa4164c 100644 --- a/src/plugins/sched/gang/Makefile.am +++ b/src/plugins/sched/gang/Makefile.am @@ -15,3 +15,7 @@ sched_gang_la_SOURCES = \ gang.h \ sched_gang.c sched_gang_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +sched_gang_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/sched/hold/Makefile.am b/src/plugins/sched/hold/Makefile.am index 2058f2b..f02cf9b 100644 --- a/src/plugins/sched/hold/Makefile.am +++ b/src/plugins/sched/hold/Makefile.am @@ -12,3 +12,7 @@ pkglib_LTLIBRARIES = sched_hold.la sched_hold_la_SOURCES = hold_wrapper.c sched_hold_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +sched_hold_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/sched/wiki/Makefile.am b/src/plugins/sched/wiki/Makefile.am index ba05420..745f08c 100644 --- a/src/plugins/sched/wiki/Makefile.am +++ b/src/plugins/sched/wiki/Makefile.am @@ -25,3 +25,7 @@ sched_wiki_la_SOURCES = \ start_job.c \ suspend_job.c sched_wiki_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +sched_wiki_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/sched/wiki2/Makefile.am b/src/plugins/sched/wiki2/Makefile.am index 24a3526..ced857d 100644 --- a/src/plugins/sched/wiki2/Makefile.am +++ b/src/plugins/sched/wiki2/Makefile.am @@ -33,3 +33,7 @@ sched_wiki2_la_SOURCES = \ start_job.c \ suspend_job.c sched_wiki2_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +sched_wiki2_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/select/cons_res/Makefile.am b/src/plugins/select/cons_res/Makefile.am index 631d2dc..45898e9 100644 --- a/src/plugins/select/cons_res/Makefile.am +++ b/src/plugins/select/cons_res/Makefile.am @@ -13,3 +13,7 @@ select_cons_res_la_SOURCES = select_cons_res.c select_cons_res.h \ dist_tasks.c dist_tasks.h \ job_test.c job_test.h select_cons_res_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +select_cons_res_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/select/linear/Makefile.am b/src/plugins/select/linear/Makefile.am index b398747..cb21a3b 100644 --- a/src/plugins/select/linear/Makefile.am +++ b/src/plugins/select/linear/Makefile.am @@ -11,4 +11,7 @@ pkglib_LTLIBRARIES = select_linear.la # Linear node selection plugin. select_linear_la_SOURCES = select_linear.c select_linear.h select_linear_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +select_linear_la_LIBADD = ../../../api/libslurm.la +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/switch/none/Makefile.am b/src/plugins/switch/none/Makefile.am index 58a8ad4..74249f2 100644 --- a/src/plugins/switch/none/Makefile.am +++ b/src/plugins/switch/none/Makefile.am @@ -11,3 +11,7 @@ pkglib_LTLIBRARIES = switch_none.la # Null switch plugin. switch_none_la_SOURCES = switch_none.c switch_none_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +switch_none_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/task/affinity/Makefile.am b/src/plugins/task/affinity/Makefile.am index 8fa3663..b214902 100644 --- a/src/plugins/task/affinity/Makefile.am +++ b/src/plugins/task/affinity/Makefile.am @@ -16,6 +16,10 @@ task_affinity_la_SOURCES = \ schedutils.c \ task_affinity.c task_affinity_la_LDFLAGS = $(SO_LDFLAGS) $(NUMA_LIBS) $(PLPA_LIBS) $(PLUGIN_FLAGS) +task_affinity_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la else pkglib_LTLIBRARIES = diff --git a/src/plugins/task/none/Makefile.am b/src/plugins/task/none/Makefile.am index 186541c..8e0b548 100644 --- a/src/plugins/task/none/Makefile.am +++ b/src/plugins/task/none/Makefile.am @@ -11,3 +11,7 @@ pkglib_LTLIBRARIES = task_none.la # Null task plugin. task_none_la_SOURCES = task_none.c task_none_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +task_none_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/topology/3d_torus/Makefile.am b/src/plugins/topology/3d_torus/Makefile.am index 4763af1..6307c3f 100644 --- a/src/plugins/topology/3d_torus/Makefile.am +++ b/src/plugins/topology/3d_torus/Makefile.am @@ -15,3 +15,7 @@ topology_3d_torus_la_SOURCES = \ hilbert_slurm.c \ topology_3d_torus.c topology_3d_torus_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +topology_3d_torus_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/topology/none/Makefile.am b/src/plugins/topology/none/Makefile.am index 58d8f0e..7764abd 100644 --- a/src/plugins/topology/none/Makefile.am +++ b/src/plugins/topology/none/Makefile.am @@ -11,3 +11,7 @@ pkglib_LTLIBRARIES = topology_none.la # Null topology plugin. topology_none_la_SOURCES = topology_none.c topology_none_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +topology_none_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/plugins/topology/tree/Makefile.am b/src/plugins/topology/tree/Makefile.am index 5fd70e7..47beaff 100644 --- a/src/plugins/topology/tree/Makefile.am +++ b/src/plugins/topology/tree/Makefile.am @@ -12,3 +12,7 @@ pkglib_LTLIBRARIES = topology_tree.la # Null topology plugin. topology_tree_la_SOURCES = topology_tree.c topology_tree_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) +topology_tree_la_LIBADD = ../../../api/libslurm.la + +../../../api/libslurm.la: + $(MAKE) -C ../../../api libslurm.la diff --git a/src/sacct/Makefile.am b/src/sacct/Makefile.am index 46a22ae..348c069 100644 --- a/src/sacct/Makefile.am +++ b/src/sacct/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir) bin_PROGRAMS = sacct -sacct_LDADD = $(top_builddir)/src/api/libslurm.o -ldl +sacct_LDADD = $(top_builddir)/src/api/libslurm.la -ldl sacct_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) diff --git a/src/sacct/Makefile.in b/src/sacct/Makefile.in index 47dcb6f..2c13692 100644 --- a/src/sacct/Makefile.in +++ b/src/sacct/Makefile.in @@ -85,7 +85,7 @@ PROGRAMS = $(bin_PROGRAMS) am_sacct_OBJECTS = sacct.$(OBJEXT) process.$(OBJEXT) print.$(OBJEXT) \ options.$(OBJEXT) sacct_OBJECTS = $(am_sacct_OBJECTS) -sacct_DEPENDENCIES = $(top_builddir)/src/api/libslurm.o +sacct_DEPENDENCIES = $(top_builddir)/src/api/libslurm.la sacct_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(sacct_LDFLAGS) \ $(LDFLAGS) -o $@ @@ -290,7 +290,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* INCLUDES = -I$(top_srcdir) -sacct_LDADD = $(top_builddir)/src/api/libslurm.o -ldl +sacct_LDADD = $(top_builddir)/src/api/libslurm.la -ldl sacct_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) noinst_HEADERS = sacct.c sacct_SOURCES = sacct.c process.c print.c options.c diff --git a/src/sacctmgr/Makefile.am b/src/sacctmgr/Makefile.am index ef44749..359d4ce 100644 --- a/src/sacctmgr/Makefile.am +++ b/src/sacctmgr/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = -I$(top_srcdir) bin_PROGRAMS = sacctmgr sacctmgr_LDADD = \ - $(top_builddir)/src/api/libslurm.o -ldl\ + $(top_builddir)/src/api/libslurm.la -ldl \ $(READLINE_LIBS) sacctmgr_SOURCES = \ diff --git a/src/sacctmgr/Makefile.in b/src/sacctmgr/Makefile.in index c72d477..d78d23a 100644 --- a/src/sacctmgr/Makefile.in +++ b/src/sacctmgr/Makefile.in @@ -88,7 +88,7 @@ am_sacctmgr_OBJECTS = account_functions.$(OBJEXT) \ user_functions.$(OBJEXT) wckey_functions.$(OBJEXT) sacctmgr_OBJECTS = $(am_sacctmgr_OBJECTS) am__DEPENDENCIES_1 = -sacctmgr_DEPENDENCIES = $(top_builddir)/src/api/libslurm.o \ +sacctmgr_DEPENDENCIES = $(top_builddir)/src/api/libslurm.la \ $(am__DEPENDENCIES_1) sacctmgr_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(sacctmgr_LDFLAGS) \ @@ -294,7 +294,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* INCLUDES = -I$(top_srcdir) sacctmgr_LDADD = \ - $(top_builddir)/src/api/libslurm.o -ldl\ + $(top_builddir)/src/api/libslurm.la -ldl \ $(READLINE_LIBS) sacctmgr_SOURCES = \ diff --git a/src/salloc/Makefile.am b/src/salloc/Makefile.am index 05fb0f3..315a483 100644 --- a/src/salloc/Makefile.am +++ b/src/salloc/Makefile.am @@ -9,7 +9,7 @@ bin_PROGRAMS = salloc salloc_SOURCES = salloc.c salloc.h opt.c opt.h -convenience_libs = $(top_builddir)/src/api/libslurm.o -ldl +convenience_libs = $(top_builddir)/src/api/libslurm.la -ldl salloc_LDADD = \ $(convenience_libs) diff --git a/src/salloc/Makefile.in b/src/salloc/Makefile.in index 3172fdb..d6dfd25 100644 --- a/src/salloc/Makefile.in +++ b/src/salloc/Makefile.in @@ -82,7 +82,7 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_salloc_OBJECTS = salloc.$(OBJEXT) opt.$(OBJEXT) salloc_OBJECTS = $(am_salloc_OBJECTS) -am__DEPENDENCIES_1 = $(top_builddir)/src/api/libslurm.o +am__DEPENDENCIES_1 = $(top_builddir)/src/api/libslurm.la salloc_DEPENDENCIES = $(am__DEPENDENCIES_1) salloc_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(salloc_LDFLAGS) \ @@ -288,7 +288,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) salloc_SOURCES = salloc.c salloc.h opt.c opt.h -convenience_libs = $(top_builddir)/src/api/libslurm.o -ldl +convenience_libs = $(top_builddir)/src/api/libslurm.la -ldl salloc_LDADD = \ $(convenience_libs) diff --git a/src/sattach/Makefile.am b/src/sattach/Makefile.am index 749a846..496ecbd 100644 --- a/src/sattach/Makefile.am +++ b/src/sattach/Makefile.am @@ -12,7 +12,7 @@ sattach_SOURCES = \ sattach.c \ sattach.wrapper.c -convenience_libs = $(top_builddir)/src/api/libslurm.o -ldl +convenience_libs = $(top_builddir)/src/api/libslurm.la -ldl sattach_LDADD = \ $(convenience_libs) diff --git a/src/sattach/Makefile.in b/src/sattach/Makefile.in index 0c78003..da32522 100644 --- a/src/sattach/Makefile.in +++ b/src/sattach/Makefile.in @@ -83,7 +83,7 @@ PROGRAMS = $(bin_PROGRAMS) am_sattach_OBJECTS = attach.$(OBJEXT) opt.$(OBJEXT) sattach.$(OBJEXT) \ sattach.wrapper.$(OBJEXT) sattach_OBJECTS = $(am_sattach_OBJECTS) -am__DEPENDENCIES_1 = $(top_builddir)/src/api/libslurm.o +am__DEPENDENCIES_1 = $(top_builddir)/src/api/libslurm.la sattach_DEPENDENCIES = $(am__DEPENDENCIES_1) sattach_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(sattach_LDFLAGS) \ @@ -293,7 +293,7 @@ sattach_SOURCES = \ sattach.c \ sattach.wrapper.c -convenience_libs = $(top_builddir)/src/api/libslurm.o -ldl +convenience_libs = $(top_builddir)/src/api/libslurm.la -ldl sattach_LDADD = \ $(convenience_libs) diff --git a/src/sbatch/Makefile.am b/src/sbatch/Makefile.am index d9b382f..9f9d737 100644 --- a/src/sbatch/Makefile.am +++ b/src/sbatch/Makefile.am @@ -9,7 +9,7 @@ bin_PROGRAMS = sbatch sbatch_SOURCES = sbatch.c opt.c opt.h -convenience_libs = $(top_builddir)/src/api/libslurm.o -ldl +convenience_libs = $(top_builddir)/src/api/libslurm.la -ldl sbatch_LDADD = $(convenience_libs) diff --git a/src/sbatch/Makefile.in b/src/sbatch/Makefile.in index 7b1e1cc..30903a9 100644 --- a/src/sbatch/Makefile.in +++ b/src/sbatch/Makefile.in @@ -82,7 +82,7 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_sbatch_OBJECTS = sbatch.$(OBJEXT) opt.$(OBJEXT) sbatch_OBJECTS = $(am_sbatch_OBJECTS) -am__DEPENDENCIES_1 = $(top_builddir)/src/api/libslurm.o +am__DEPENDENCIES_1 = $(top_builddir)/src/api/libslurm.la sbatch_DEPENDENCIES = $(am__DEPENDENCIES_1) sbatch_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(sbatch_LDFLAGS) \ @@ -288,7 +288,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* INCLUDES = -I$(top_srcdir) sbatch_SOURCES = sbatch.c opt.c opt.h -convenience_libs = $(top_builddir)/src/api/libslurm.o -ldl +convenience_libs = $(top_builddir)/src/api/libslurm.la -ldl sbatch_LDADD = $(convenience_libs) sbatch_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) all: all-am diff --git a/src/sbcast/Makefile.am b/src/sbcast/Makefile.am index 48336a5..c564f51 100644 --- a/src/sbcast/Makefile.am +++ b/src/sbcast/Makefile.am @@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = foreign INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) bin_PROGRAMS = sbcast -sbcast_LDADD = $(top_builddir)/src/api/libslurm.o -ldl -lm +sbcast_LDADD = $(top_builddir)/src/api/libslurm.la -ldl -lm noinst_HEADERS = sbcast.h sbcast_SOURCES = agent.c sbcast.c opts.c diff --git a/src/sbcast/Makefile.in b/src/sbcast/Makefile.in index d41fbcb..d3ecda3 100644 --- a/src/sbcast/Makefile.in +++ b/src/sbcast/Makefile.in @@ -85,7 +85,7 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_sbcast_OBJECTS = agent.$(OBJEXT) sbcast.$(OBJEXT) opts.$(OBJEXT) sbcast_OBJECTS = $(am_sbcast_OBJECTS) -sbcast_DEPENDENCIES = $(top_builddir)/src/api/libslurm.o +sbcast_DEPENDENCIES = $(top_builddir)/src/api/libslurm.la sbcast_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(sbcast_LDFLAGS) \ $(LDFLAGS) -o $@ @@ -289,7 +289,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) -sbcast_LDADD = $(top_builddir)/src/api/libslurm.o -ldl -lm +sbcast_LDADD = $(top_builddir)/src/api/libslurm.la -ldl -lm noinst_HEADERS = sbcast.h sbcast_SOURCES = agent.c sbcast.c opts.c sbcast_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) diff --git a/src/scancel/Makefile.am b/src/scancel/Makefile.am index 95cfb3e..0d2637c 100644 --- a/src/scancel/Makefile.am +++ b/src/scancel/Makefile.am @@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir) bin_PROGRAMS = scancel -scancel_LDADD = $(top_builddir)/src/api/libslurm.o -ldl +scancel_LDADD = $(top_builddir)/src/api/libslurm.la -ldl noinst_HEADERS = scancel.h scancel_SOURCES = scancel.c opt.c diff --git a/src/scancel/Makefile.in b/src/scancel/Makefile.in index a302d76..e5e53cb 100644 --- a/src/scancel/Makefile.in +++ b/src/scancel/Makefile.in @@ -84,7 +84,7 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_scancel_OBJECTS = scancel.$(OBJEXT) opt.$(OBJEXT) scancel_OBJECTS = $(am_scancel_OBJECTS) -scancel_DEPENDENCIES = $(top_builddir)/src/api/libslurm.o +scancel_DEPENDENCIES = $(top_builddir)/src/api/libslurm.la scancel_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(scancel_LDFLAGS) \ $(LDFLAGS) -o $@ @@ -288,7 +288,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign INCLUDES = -I$(top_srcdir) -scancel_LDADD = $(top_builddir)/src/api/libslurm.o -ldl +scancel_LDADD = $(top_builddir)/src/api/libslurm.la -ldl noinst_HEADERS = scancel.h scancel_SOURCES = scancel.c opt.c scancel_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) diff --git a/src/scontrol/Makefile.am b/src/scontrol/Makefile.am index 7e5907d..264ff69 100644 --- a/src/scontrol/Makefile.am +++ b/src/scontrol/Makefile.am @@ -18,7 +18,7 @@ scontrol_SOURCES = \ update_node.c \ update_part.c -convenience_libs = $(top_builddir)/src/api/libslurm.o -ldl -lm +convenience_libs = $(top_builddir)/src/api/libslurm.la -ldl -lm scontrol_LDADD = \ diff --git a/src/scontrol/Makefile.in b/src/scontrol/Makefile.in index ee6520e..c9407df 100644 --- a/src/scontrol/Makefile.in +++ b/src/scontrol/Makefile.in @@ -85,7 +85,7 @@ am_scontrol_OBJECTS = create_res.$(OBJEXT) info_job.$(OBJEXT) \ scontrol.$(OBJEXT) update_job.$(OBJEXT) update_node.$(OBJEXT) \ update_part.$(OBJEXT) scontrol_OBJECTS = $(am_scontrol_OBJECTS) -am__DEPENDENCIES_1 = $(top_builddir)/src/api/libslurm.o +am__DEPENDENCIES_1 = $(top_builddir)/src/api/libslurm.la am__DEPENDENCIES_2 = scontrol_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) scontrol_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -302,7 +302,7 @@ scontrol_SOURCES = \ update_node.c \ update_part.c -convenience_libs = $(top_builddir)/src/api/libslurm.o -ldl -lm +convenience_libs = $(top_builddir)/src/api/libslurm.la -ldl -lm scontrol_LDADD = \ $(convenience_libs) \ $(READLINE_LIBS) diff --git a/src/scontrol/update_job.c b/src/scontrol/update_job.c index 98d0833..2356b83 100644 --- a/src/scontrol/update_job.c +++ b/src/scontrol/update_job.c @@ -92,9 +92,9 @@ scontrol_checkpoint(char *op, char *job_step_id_str, int argc, char *argv[]) sizeof(time_str)); printf("Began at %s\n", time_str); } else - printf("Yes\n"); + puts("Yes"); } else if (slurm_get_errno() == ESLURM_DISABLED) { - printf("No\n"); + puts("No"); rc = SLURM_SUCCESS; /* not real error */ } } diff --git a/src/sinfo/Makefile.am b/src/sinfo/Makefile.am index 0820811..44d91da 100644 --- a/src/sinfo/Makefile.am +++ b/src/sinfo/Makefile.am @@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = foreign INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) bin_PROGRAMS = sinfo -sinfo_LDADD = $(top_builddir)/src/api/libslurm.o -ldl +sinfo_LDADD = $(top_builddir)/src/api/libslurm.la -ldl noinst_HEADERS = sinfo.h print.h sinfo_SOURCES = sinfo.c opts.c print.c sort.c diff --git a/src/sinfo/Makefile.in b/src/sinfo/Makefile.in index 71ce0b9..9cc0ce3 100644 --- a/src/sinfo/Makefile.in +++ b/src/sinfo/Makefile.in @@ -86,7 +86,7 @@ PROGRAMS = $(bin_PROGRAMS) am_sinfo_OBJECTS = sinfo.$(OBJEXT) opts.$(OBJEXT) print.$(OBJEXT) \ sort.$(OBJEXT) sinfo_OBJECTS = $(am_sinfo_OBJECTS) -sinfo_DEPENDENCIES = $(top_builddir)/src/api/libslurm.o +sinfo_DEPENDENCIES = $(top_builddir)/src/api/libslurm.la sinfo_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(sinfo_LDFLAGS) \ $(LDFLAGS) -o $@ @@ -290,7 +290,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) -sinfo_LDADD = $(top_builddir)/src/api/libslurm.o -ldl +sinfo_LDADD = $(top_builddir)/src/api/libslurm.la -ldl noinst_HEADERS = sinfo.h print.h sinfo_SOURCES = sinfo.c opts.c print.c sort.c sinfo_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) diff --git a/src/slurmctld/Makefile.am b/src/slurmctld/Makefile.am index 03613a8..5f5ed5b 100644 --- a/src/slurmctld/Makefile.am +++ b/src/slurmctld/Makefile.am @@ -10,7 +10,7 @@ sbin_PROGRAMS = slurmctld slurmctld_LDADD = \ $(top_builddir)/src/common/libdaemonize.la \ - $(top_builddir)/src/common/libcommon.o -ldl + $(top_builddir)/src/api/libslurm.la -ldl slurmctld_SOURCES = \ diff --git a/src/slurmctld/Makefile.in b/src/slurmctld/Makefile.in index 18cd8d4..69c2452 100644 --- a/src/slurmctld/Makefile.in +++ b/src/slurmctld/Makefile.in @@ -93,7 +93,7 @@ am_slurmctld_OBJECTS = acct_policy.$(OBJEXT) agent.$(OBJEXT) \ trigger_mgr.$(OBJEXT) slurmctld_OBJECTS = $(am_slurmctld_OBJECTS) slurmctld_DEPENDENCIES = $(top_builddir)/src/common/libdaemonize.la \ - $(top_builddir)/src/common/libcommon.o + $(top_builddir)/src/api/libslurm.la slurmctld_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(slurmctld_LDFLAGS) $(LDFLAGS) -o $@ @@ -299,7 +299,7 @@ CLEANFILES = core.* INCLUDES = -I$(top_srcdir) slurmctld_LDADD = \ $(top_builddir)/src/common/libdaemonize.la \ - $(top_builddir)/src/common/libcommon.o -ldl + $(top_builddir)/src/api/libslurm.la -ldl slurmctld_SOURCES = \ acct_policy.c \ diff --git a/src/slurmd/slurmd/Makefile.am b/src/slurmd/slurmd/Makefile.am index 26c533f..60fa5ff 100644 --- a/src/slurmd/slurmd/Makefile.am +++ b/src/slurmd/slurmd/Makefile.am @@ -10,7 +10,7 @@ INCLUDES = -I$(top_srcdir) slurmd_LDADD = \ $(top_builddir)/src/common/libdaemonize.la \ - $(top_builddir)/src/api/libslurm.o -ldl \ + $(top_builddir)/src/api/libslurm.la -ldl \ $(PLPA_LIBS) SLURMD_SOURCES = \ diff --git a/src/slurmd/slurmd/Makefile.in b/src/slurmd/slurmd/Makefile.in index c6eb59c..570f105 100644 --- a/src/slurmd/slurmd/Makefile.in +++ b/src/slurmd/slurmd/Makefile.in @@ -90,7 +90,7 @@ am_slurmd_OBJECTS = $(am__objects_1) slurmd_OBJECTS = $(am_slurmd_OBJECTS) am__DEPENDENCIES_1 = slurmd_DEPENDENCIES = $(top_builddir)/src/common/libdaemonize.la \ - $(top_builddir)/src/api/libslurm.o $(am__DEPENDENCIES_1) + $(top_builddir)/src/api/libslurm.la $(am__DEPENDENCIES_1) slurmd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(slurmd_LDFLAGS) \ $(LDFLAGS) -o $@ @@ -295,7 +295,7 @@ AUTOMAKE_OPTIONS = foreign INCLUDES = -I$(top_srcdir) slurmd_LDADD = \ $(top_builddir)/src/common/libdaemonize.la \ - $(top_builddir)/src/api/libslurm.o -ldl \ + $(top_builddir)/src/api/libslurm.la -ldl \ $(PLPA_LIBS) SLURMD_SOURCES = \ diff --git a/src/slurmd/slurmstepd/Makefile.am b/src/slurmd/slurmstepd/Makefile.am index 21f2e4a..f1d7bbe 100644 --- a/src/slurmd/slurmstepd/Makefile.am +++ b/src/slurmd/slurmstepd/Makefile.am @@ -9,7 +9,7 @@ INCLUDES = -I$(top_srcdir) slurmstepd_LDADD = \ $(top_builddir)/src/common/libdaemonize.la \ - $(top_builddir)/src/api/libslurm.o -ldl\ + $(top_builddir)/src/api/libslurm.la -ldl \ $(PLPA_LIBS) $(PAM_LIBS) $(UTIL_LIBS) slurmstepd_SOURCES = \ diff --git a/src/slurmd/slurmstepd/Makefile.in b/src/slurmd/slurmstepd/Makefile.in index cfb4e3d..f483315 100644 --- a/src/slurmd/slurmstepd/Makefile.in +++ b/src/slurmd/slurmstepd/Makefile.in @@ -92,7 +92,7 @@ am_slurmstepd_OBJECTS = slurmstepd.$(OBJEXT) mgr.$(OBJEXT) \ slurmstepd_OBJECTS = $(am_slurmstepd_OBJECTS) am__DEPENDENCIES_1 = slurmstepd_DEPENDENCIES = $(top_builddir)/src/common/libdaemonize.la \ - $(top_builddir)/src/api/libslurm.o $(am__DEPENDENCIES_1) \ + $(top_builddir)/src/api/libslurm.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) slurmstepd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -298,7 +298,7 @@ AUTOMAKE_OPTIONS = foreign INCLUDES = -I$(top_srcdir) slurmstepd_LDADD = \ $(top_builddir)/src/common/libdaemonize.la \ - $(top_builddir)/src/api/libslurm.o -ldl\ + $(top_builddir)/src/api/libslurm.la -ldl \ $(PLPA_LIBS) $(PAM_LIBS) $(UTIL_LIBS) slurmstepd_SOURCES = \ diff --git a/src/slurmdbd/Makefile.am b/src/slurmdbd/Makefile.am index 76308e0..f33f738 100644 --- a/src/slurmdbd/Makefile.am +++ b/src/slurmdbd/Makefile.am @@ -10,7 +10,7 @@ sbin_PROGRAMS = slurmdbd slurmdbd_LDADD = \ $(top_builddir)/src/common/libdaemonize.la \ - $(top_builddir)/src/api/libslurm.o -ldl + $(top_builddir)/src/api/libslurm.la -ldl slurmdbd_SOURCES = \ diff --git a/src/slurmdbd/Makefile.in b/src/slurmdbd/Makefile.in index 32363fa..44c2bec 100644 --- a/src/slurmdbd/Makefile.in +++ b/src/slurmdbd/Makefile.in @@ -86,7 +86,7 @@ am_slurmdbd_OBJECTS = agent.$(OBJEXT) backup.$(OBJEXT) \ slurmdbd.$(OBJEXT) slurmdbd_OBJECTS = $(am_slurmdbd_OBJECTS) slurmdbd_DEPENDENCIES = $(top_builddir)/src/common/libdaemonize.la \ - $(top_builddir)/src/api/libslurm.o + $(top_builddir)/src/api/libslurm.la slurmdbd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(slurmdbd_LDFLAGS) \ $(LDFLAGS) -o $@ @@ -292,7 +292,7 @@ CLEANFILES = core.* INCLUDES = -I$(top_srcdir) slurmdbd_LDADD = \ $(top_builddir)/src/common/libdaemonize.la \ - $(top_builddir)/src/api/libslurm.o -ldl + $(top_builddir)/src/api/libslurm.la -ldl slurmdbd_SOURCES = \ agent.c \ diff --git a/src/smap/Makefile.am b/src/smap/Makefile.am index cb5115a..11234e2 100644 --- a/src/smap/Makefile.am +++ b/src/smap/Makefile.am @@ -15,7 +15,7 @@ bin_PROGRAMS = smap smap_LDADD = \ $(top_builddir)/src/plugins/select/bluegene/block_allocator/libbluegene_block_allocator.la \ - $(top_builddir)/src/api/libslurm.o -ldl + $(top_builddir)/src/api/libslurm.la -ldl noinst_HEADERS = smap.h smap_SOURCES = smap.c \ diff --git a/src/smap/Makefile.in b/src/smap/Makefile.in index 5eb3ceb..3aa5949 100644 --- a/src/smap/Makefile.in +++ b/src/smap/Makefile.in @@ -101,7 +101,7 @@ am__EXTRA_smap_SOURCES_DIST = smap.h smap.c job_functions.c \ reservation_functions.c opts.c smap_OBJECTS = $(am_smap_OBJECTS) @HAVE_SOME_CURSES_TRUE@smap_DEPENDENCIES = $(top_builddir)/src/plugins/select/bluegene/block_allocator/libbluegene_block_allocator.la \ -@HAVE_SOME_CURSES_TRUE@ $(top_builddir)/src/api/libslurm.o +@HAVE_SOME_CURSES_TRUE@ $(top_builddir)/src/api/libslurm.la smap_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(smap_LDFLAGS) \ $(LDFLAGS) -o $@ @@ -308,7 +308,7 @@ AUTOMAKE_OPTIONS = foreign INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) @HAVE_SOME_CURSES_TRUE@smap_LDADD = \ @HAVE_SOME_CURSES_TRUE@ $(top_builddir)/src/plugins/select/bluegene/block_allocator/libbluegene_block_allocator.la \ -@HAVE_SOME_CURSES_TRUE@ $(top_builddir)/src/api/libslurm.o -ldl +@HAVE_SOME_CURSES_TRUE@ $(top_builddir)/src/api/libslurm.la -ldl @HAVE_SOME_CURSES_TRUE@noinst_HEADERS = smap.h @HAVE_SOME_CURSES_TRUE@smap_SOURCES = smap.c \ diff --git a/src/squeue/Makefile.am b/src/squeue/Makefile.am index 2f3030b..5ea4dd9 100644 --- a/src/squeue/Makefile.am +++ b/src/squeue/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir) bin_PROGRAMS = squeue -squeue_LDADD = $(top_builddir)/src/api/libslurm.o -ldl +squeue_LDADD = $(top_builddir)/src/api/libslurm.la -ldl noinst_HEADERS = squeue.h print.h squeue_SOURCES = squeue.c print.c opts.c sort.c diff --git a/src/squeue/Makefile.in b/src/squeue/Makefile.in index 7811b22..7d28c26 100644 --- a/src/squeue/Makefile.in +++ b/src/squeue/Makefile.in @@ -86,7 +86,7 @@ PROGRAMS = $(bin_PROGRAMS) am_squeue_OBJECTS = squeue.$(OBJEXT) print.$(OBJEXT) opts.$(OBJEXT) \ sort.$(OBJEXT) squeue_OBJECTS = $(am_squeue_OBJECTS) -squeue_DEPENDENCIES = $(top_builddir)/src/api/libslurm.o +squeue_DEPENDENCIES = $(top_builddir)/src/api/libslurm.la squeue_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(squeue_LDFLAGS) \ $(LDFLAGS) -o $@ @@ -290,7 +290,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign INCLUDES = -I$(top_srcdir) -squeue_LDADD = $(top_builddir)/src/api/libslurm.o -ldl +squeue_LDADD = $(top_builddir)/src/api/libslurm.la -ldl noinst_HEADERS = squeue.h print.h squeue_SOURCES = squeue.c print.c opts.c sort.c squeue_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) diff --git a/src/sreport/Makefile.am b/src/sreport/Makefile.am index e0bf3ac..cdd641a 100644 --- a/src/sreport/Makefile.am +++ b/src/sreport/Makefile.am @@ -17,7 +17,7 @@ sreport_SOURCES = \ common.c sreport_LDADD = \ - $(top_builddir)/src/api/libslurm.o -ldl\ + $(top_builddir)/src/api/libslurm.la -ldl \ $(READLINE_LIBS) sreport_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) diff --git a/src/sreport/Makefile.in b/src/sreport/Makefile.in index a09575e..dd94deb 100644 --- a/src/sreport/Makefile.in +++ b/src/sreport/Makefile.in @@ -85,7 +85,7 @@ am_sreport_OBJECTS = sreport.$(OBJEXT) cluster_reports.$(OBJEXT) \ user_reports.$(OBJEXT) resv_reports.$(OBJEXT) common.$(OBJEXT) sreport_OBJECTS = $(am_sreport_OBJECTS) am__DEPENDENCIES_1 = -sreport_DEPENDENCIES = $(top_builddir)/src/api/libslurm.o \ +sreport_DEPENDENCIES = $(top_builddir)/src/api/libslurm.la \ $(am__DEPENDENCIES_1) sreport_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(sreport_LDFLAGS) \ @@ -300,7 +300,7 @@ sreport_SOURCES = \ common.c sreport_LDADD = \ - $(top_builddir)/src/api/libslurm.o -ldl\ + $(top_builddir)/src/api/libslurm.la -ldl \ $(READLINE_LIBS) sreport_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) diff --git a/src/srun/Makefile.am b/src/srun/Makefile.am index 7a39a59..4ed48ea 100644 --- a/src/srun/Makefile.am +++ b/src/srun/Makefile.am @@ -25,7 +25,7 @@ srun_SOURCES = \ srun.wrapper.c convenience_libs = \ - $(top_builddir)/src/api/libslurm.o -ldl + $(top_builddir)/src/api/libslurm.la -ldl srun_LDADD = \ $(convenience_libs) diff --git a/src/srun/Makefile.in b/src/srun/Makefile.in index 8b03f32..a020677 100644 --- a/src/srun/Makefile.in +++ b/src/srun/Makefile.in @@ -85,7 +85,7 @@ am_srun_OBJECTS = srun.$(OBJEXT) opt.$(OBJEXT) srun_job.$(OBJEXT) \ allocate.$(OBJEXT) core-format.$(OBJEXT) multi_prog.$(OBJEXT) \ task_state.$(OBJEXT) srun.wrapper.$(OBJEXT) srun_OBJECTS = $(am_srun_OBJECTS) -am__DEPENDENCIES_1 = $(top_builddir)/src/api/libslurm.o +am__DEPENDENCIES_1 = $(top_builddir)/src/api/libslurm.la srun_DEPENDENCIES = $(am__DEPENDENCIES_1) srun_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(srun_LDFLAGS) \ @@ -308,7 +308,7 @@ srun_SOURCES = \ srun.wrapper.c convenience_libs = \ - $(top_builddir)/src/api/libslurm.o -ldl + $(top_builddir)/src/api/libslurm.la -ldl srun_LDADD = \ $(convenience_libs) diff --git a/src/srun_cr/Makefile.am b/src/srun_cr/Makefile.am index 153b01e..7e87aa3 100644 --- a/src/srun_cr/Makefile.am +++ b/src/srun_cr/Makefile.am @@ -9,7 +9,7 @@ bin_PROGRAMS = srun_cr srun_cr_SOURCES = srun_cr.c -convenience_libs = $(top_builddir)/src/api/libslurm.o -ldl +convenience_libs = $(top_builddir)/src/api/libslurm.la -ldl srun_cr_LDADD = $(convenience_libs) $(BLCR_LIBS) diff --git a/src/srun_cr/Makefile.in b/src/srun_cr/Makefile.in index 14f3ce5..eb17c8b 100644 --- a/src/srun_cr/Makefile.in +++ b/src/srun_cr/Makefile.in @@ -82,7 +82,7 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_srun_cr_OBJECTS = srun_cr.$(OBJEXT) srun_cr_OBJECTS = $(am_srun_cr_OBJECTS) -am__DEPENDENCIES_1 = $(top_builddir)/src/api/libslurm.o +am__DEPENDENCIES_1 = $(top_builddir)/src/api/libslurm.la am__DEPENDENCIES_2 = srun_cr_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) srun_cr_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -289,7 +289,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* INCLUDES = -I$(top_srcdir) $(BLCR_CPPFLAGS) srun_cr_SOURCES = srun_cr.c -convenience_libs = $(top_builddir)/src/api/libslurm.o -ldl +convenience_libs = $(top_builddir)/src/api/libslurm.la -ldl srun_cr_LDADD = $(convenience_libs) $(BLCR_LIBS) srun_cr_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) $(BLCR_LDFLAGS) all: all-am diff --git a/src/srun_cr/srun_cr.c b/src/srun_cr/srun_cr.c index a2a1b06..23d16e5 100644 --- a/src/srun_cr/srun_cr.c +++ b/src/srun_cr/srun_cr.c @@ -154,7 +154,7 @@ mimic_exit(int status) } /****************************************************************/ static void -on_child_exit(int signum) +on_child_exit(int signum, siginfo_t* si, void* p) { int status; diff --git a/src/sshare/Makefile.am b/src/sshare/Makefile.am index cb7a8fe..075a70e 100644 --- a/src/sshare/Makefile.am +++ b/src/sshare/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = -I$(top_srcdir) bin_PROGRAMS = sshare sshare_LDADD = \ - $(top_builddir)/src/api/libslurm.o -ldl\ + $(top_builddir)/src/api/libslurm.la -ldl \ $(READLINE_LIBS) sshare_SOURCES = \ diff --git a/src/sshare/Makefile.in b/src/sshare/Makefile.in index 5f5df57..5d7bad8 100644 --- a/src/sshare/Makefile.in +++ b/src/sshare/Makefile.in @@ -83,7 +83,7 @@ PROGRAMS = $(bin_PROGRAMS) am_sshare_OBJECTS = process.$(OBJEXT) sshare.$(OBJEXT) sshare_OBJECTS = $(am_sshare_OBJECTS) am__DEPENDENCIES_1 = -sshare_DEPENDENCIES = $(top_builddir)/src/api/libslurm.o \ +sshare_DEPENDENCIES = $(top_builddir)/src/api/libslurm.la \ $(am__DEPENDENCIES_1) sshare_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(sshare_LDFLAGS) \ @@ -289,7 +289,7 @@ AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* INCLUDES = -I$(top_srcdir) sshare_LDADD = \ - $(top_builddir)/src/api/libslurm.o -ldl\ + $(top_builddir)/src/api/libslurm.la -ldl \ $(READLINE_LIBS) sshare_SOURCES = \ diff --git a/src/sstat/Makefile.am b/src/sstat/Makefile.am index 41cf9df..6725572 100644 --- a/src/sstat/Makefile.am +++ b/src/sstat/Makefile.am @@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir) bin_PROGRAMS = sstat -sstat_LDADD = $(top_builddir)/src/api/libslurm.o -ldl +sstat_LDADD = $(top_builddir)/src/api/libslurm.la -ldl noinst_HEADERS = sstat.c diff --git a/src/sstat/Makefile.in b/src/sstat/Makefile.in index 39b6009..d1240ac 100644 --- a/src/sstat/Makefile.in +++ b/src/sstat/Makefile.in @@ -85,7 +85,7 @@ PROGRAMS = $(bin_PROGRAMS) am_sstat_OBJECTS = sstat.$(OBJEXT) process.$(OBJEXT) print.$(OBJEXT) \ options.$(OBJEXT) sstat_OBJECTS = $(am_sstat_OBJECTS) -sstat_DEPENDENCIES = $(top_builddir)/src/api/libslurm.o +sstat_DEPENDENCIES = $(top_builddir)/src/api/libslurm.la sstat_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(sstat_LDFLAGS) \ $(LDFLAGS) -o $@ @@ -289,7 +289,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign INCLUDES = -I$(top_srcdir) -sstat_LDADD = $(top_builddir)/src/api/libslurm.o -ldl +sstat_LDADD = $(top_builddir)/src/api/libslurm.la -ldl noinst_HEADERS = sstat.c sstat_SOURCES = sstat.c process.c print.c options.c sstat_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) diff --git a/src/strigger/Makefile.am b/src/strigger/Makefile.am index 0f8cebf..7a0a2b2 100644 --- a/src/strigger/Makefile.am +++ b/src/strigger/Makefile.am @@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = foreign INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) bin_PROGRAMS = strigger -strigger_LDADD = $(top_builddir)/src/api/libslurm.o -ldl +strigger_LDADD = $(top_builddir)/src/api/libslurm.la -ldl noinst_HEADERS = strigger.h strigger_SOURCES = strigger.c opts.c diff --git a/src/strigger/Makefile.in b/src/strigger/Makefile.in index 9f61df1..0873904 100644 --- a/src/strigger/Makefile.in +++ b/src/strigger/Makefile.in @@ -85,7 +85,7 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_strigger_OBJECTS = strigger.$(OBJEXT) opts.$(OBJEXT) strigger_OBJECTS = $(am_strigger_OBJECTS) -strigger_DEPENDENCIES = $(top_builddir)/src/api/libslurm.o +strigger_DEPENDENCIES = $(top_builddir)/src/api/libslurm.la strigger_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(strigger_LDFLAGS) \ $(LDFLAGS) -o $@ @@ -289,7 +289,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) -strigger_LDADD = $(top_builddir)/src/api/libslurm.o -ldl +strigger_LDADD = $(top_builddir)/src/api/libslurm.la -ldl noinst_HEADERS = strigger.h strigger_SOURCES = strigger.c opts.c strigger_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) diff --git a/src/sview/Makefile.am b/src/sview/Makefile.am index 1a5047c..a5d0034 100644 --- a/src/sview/Makefile.am +++ b/src/sview/Makefile.am @@ -11,7 +11,7 @@ bin_PROGRAMS = sview sview_LDADD = \ $(top_builddir)/src/plugins/select/bluegene/block_allocator/libbluegene_block_allocator.la \ - $(top_builddir)/src/api/libslurm.o -ldl + $(top_builddir)/src/api/libslurm.la -ldl noinst_HEADERS = sview.h sview_SOURCES = sview.c popups.c grid.c part_info.c job_info.c \ diff --git a/src/sview/Makefile.in b/src/sview/Makefile.in index ea0375f..c775ed9 100644 --- a/src/sview/Makefile.in +++ b/src/sview/Makefile.in @@ -102,7 +102,7 @@ am__EXTRA_sview_SOURCES_DIST = sview.h sview.c popups.c grid.c \ submit_info.c admin_info.c common.c sview_OBJECTS = $(am_sview_OBJECTS) @HAVE_GTK_TRUE@sview_DEPENDENCIES = $(top_builddir)/src/plugins/select/bluegene/block_allocator/libbluegene_block_allocator.la \ -@HAVE_GTK_TRUE@ $(top_builddir)/src/api/libslurm.o +@HAVE_GTK_TRUE@ $(top_builddir)/src/api/libslurm.la sview_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(sview_CFLAGS) $(CFLAGS) $(sview_LDFLAGS) \ $(LDFLAGS) -o $@ @@ -310,7 +310,7 @@ AUTOMAKE_OPTIONS = foreign INCLUDES = -I$(top_srcdir) $(BG_INCLUDES) @HAVE_GTK_TRUE@sview_LDADD = \ @HAVE_GTK_TRUE@ $(top_builddir)/src/plugins/select/bluegene/block_allocator/libbluegene_block_allocator.la \ -@HAVE_GTK_TRUE@ $(top_builddir)/src/api/libslurm.o -ldl +@HAVE_GTK_TRUE@ $(top_builddir)/src/api/libslurm.la -ldl @HAVE_GTK_TRUE@noinst_HEADERS = sview.h @HAVE_GTK_TRUE@sview_SOURCES = sview.c popups.c grid.c part_info.c job_info.c \