diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 3d1fe97bff18a535c3e83cd5a332b371da0f3b6d..dfe2e08c105a99c5f1bfc41aa21b4b13082eb6d6 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,4 +1,11 @@
# Makefile for common library
+# If you are linking to this lib in a plugin you will need to link to
+# $(top_builddir)/src/common/.libs/libcommon.a
+# if you are linking to a stand alone program link to
+# $(top_builddir)/src/common/libcommon.la
+# This avoids having multiple symbols running around when there should
+# only be 1 address per symbol. If you link to the libcommon.la in
+# a plugin you will get 2 addresses for one symbol which could lead to problems.
AUTOMAKE_OPTIONS = foreign
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index 41ffca9948bfae762f94cc26b3115678f8595eaf..23f32ba14994fb1667d9a77663910c5d78722f7f 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -15,6 +15,13 @@
@SET_MAKE@
# Makefile for common library
+# If you are linking to this lib in a plugin you will need to link to
+# $(top_builddir)/src/common/.libs/libcommon.a
+# if you are linking to a stand alone program link to
+# $(top_builddir)/src/common/libcommon.la
+# This avoids having multiple symbols running around when there should
+# only be 1 address per symbol. If you link to the libcommon.la in
+# a plugin you will get 2 addresses for one symbol which could lead to problems.
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
diff --git a/src/database/Makefile.am b/src/database/Makefile.am
index a072c450e8385ddbc90e81b052531006f9f26e24..579ffe938731688c3b9b53a8f39953d94cb69e6a 100644
--- a/src/database/Makefile.am
+++ b/src/database/Makefile.am
@@ -3,7 +3,7 @@
AUTOMAKE_OPTIONS = foreign
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
-COMMON_LIBS = $(top_builddir)/src/common/libcommon.la -lpthread
+COMMON_LIBS = $(top_builddir)/src/common/.libs/libcommon.a -lpthread
if HAVE_OPENSSL
@@ -14,9 +14,9 @@ noinst_LTLIBRARIES = \
libslurm_gold_la_SOURCES = gold_interface.c gold_interface.h \
base64.c base64.h
-libslurm_gold_la_LIBADD = $(COMMON_LIBS)
+libslurm_gold_la_LIBADD = $(COMMON_LIBS)
libslurm_gold_la_LDFLAGS = $(LIB_LDFLAGS)
-libslurm_gold_la_DEPENDENCIES = $(top_builddir)/src/common/libcommon.la
+libslurm_gold_la_DEPENDENCIES = $(top_builddir)/src/common/.libs/libcommon.a
else
noinst_LTLIBRARIES = \
@@ -28,8 +28,8 @@ endif
libslurm_mysql_la_SOURCES = mysql_common.c mysql_common.h
libslurm_pgsql_la_SOURCES = pgsql_common.c pgsql_common.h
-libslurm_mysql_la_LIBADD = $(COMMON_LIBS) $(MYSQL_LIBS)
-libslurm_pgsql_la_LIBADD = $(COMMON_LIBS) $(PGSQL_LIBS)
+libslurm_mysql_la_LIBADD = $(COMMON_LIBS) $(MYSQL_LIBS)
+libslurm_pgsql_la_LIBADD = $(COMMON_LIBS) $(PGSQL_LIBS)
libslurm_mysql_la_LDFLAGS = $(LIB_LDFLAGS)
libslurm_pgsql_la_LDFLAGS = $(LIB_LDFLAGS)
@@ -37,5 +37,5 @@ libslurm_pgsql_la_LDFLAGS = $(LIB_LDFLAGS)
libslurm_mysql_la_CFLAGS = $(MYSQL_CFLAGS)
libslurm_pgsql_la_CFLAGS = $(PGSQL_CFLAGS)
-libslurm_mysql_la_DEPENDENCIES = $(top_builddir)/src/common/libcommon.la
-libslurm_pgsql_la_DEPENDENCIES = $(top_builddir)/src/common/libcommon.la
+libslurm_mysql_la_DEPENDENCIES = $(top_builddir)/src/common/.libs/libcommon.a
+libslurm_pgsql_la_DEPENDENCIES = $(top_builddir)/src/common/.libs/libcommon.a
diff --git a/src/database/Makefile.in b/src/database/Makefile.in
index d63386595c1fa2c3d3da7319ec6cacac21d86a6b..c425b99b0c2586edde2f5733a1c2b68413261ea0 100644
--- a/src/database/Makefile.in
+++ b/src/database/Makefile.in
@@ -66,7 +66,7 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/slurm/slurm.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
-am__DEPENDENCIES_1 = $(top_builddir)/src/common/libcommon.la
+am__DEPENDENCIES_1 = $(top_builddir)/src/common/.libs/libcommon.a
am__libslurm_gold_la_SOURCES_DIST = gold_interface.c gold_interface.h \
base64.c base64.h
@HAVE_OPENSSL_TRUE@am_libslurm_gold_la_OBJECTS = gold_interface.lo \
@@ -281,7 +281,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
-COMMON_LIBS = $(top_builddir)/src/common/libcommon.la -lpthread
+COMMON_LIBS = $(top_builddir)/src/common/.libs/libcommon.a -lpthread
@HAVE_OPENSSL_FALSE@noinst_LTLIBRARIES = \
@HAVE_OPENSSL_FALSE@ libslurm_mysql.la \
@HAVE_OPENSSL_FALSE@ libslurm_pgsql.la
@@ -294,19 +294,19 @@ COMMON_LIBS = $(top_builddir)/src/common/libcommon.la -lpthread
@HAVE_OPENSSL_TRUE@libslurm_gold_la_SOURCES = gold_interface.c gold_interface.h \
@HAVE_OPENSSL_TRUE@ base64.c base64.h
-@HAVE_OPENSSL_TRUE@libslurm_gold_la_LIBADD = $(COMMON_LIBS)
+@HAVE_OPENSSL_TRUE@libslurm_gold_la_LIBADD = $(COMMON_LIBS)
@HAVE_OPENSSL_TRUE@libslurm_gold_la_LDFLAGS = $(LIB_LDFLAGS)
-@HAVE_OPENSSL_TRUE@libslurm_gold_la_DEPENDENCIES = $(top_builddir)/src/common/libcommon.la
+@HAVE_OPENSSL_TRUE@libslurm_gold_la_DEPENDENCIES = $(top_builddir)/src/common/.libs/libcommon.a
libslurm_mysql_la_SOURCES = mysql_common.c mysql_common.h
libslurm_pgsql_la_SOURCES = pgsql_common.c pgsql_common.h
-libslurm_mysql_la_LIBADD = $(COMMON_LIBS) $(MYSQL_LIBS)
-libslurm_pgsql_la_LIBADD = $(COMMON_LIBS) $(PGSQL_LIBS)
+libslurm_mysql_la_LIBADD = $(COMMON_LIBS) $(MYSQL_LIBS)
+libslurm_pgsql_la_LIBADD = $(COMMON_LIBS) $(PGSQL_LIBS)
libslurm_mysql_la_LDFLAGS = $(LIB_LDFLAGS)
libslurm_pgsql_la_LDFLAGS = $(LIB_LDFLAGS)
libslurm_mysql_la_CFLAGS = $(MYSQL_CFLAGS)
libslurm_pgsql_la_CFLAGS = $(PGSQL_CFLAGS)
-libslurm_mysql_la_DEPENDENCIES = $(top_builddir)/src/common/libcommon.la
-libslurm_pgsql_la_DEPENDENCIES = $(top_builddir)/src/common/libcommon.la
+libslurm_mysql_la_DEPENDENCIES = $(top_builddir)/src/common/.libs/libcommon.a
+libslurm_pgsql_la_DEPENDENCIES = $(top_builddir)/src/common/.libs/libcommon.a
all: all-am
.SUFFIXES:
diff --git a/src/plugins/accounting_storage/filetxt/Makefile.am b/src/plugins/accounting_storage/filetxt/Makefile.am
index 47c4b5c476561eaa5ed679b499e3c9ee08b3e8bd..a09dfa6929a20682294331ad58e7592e79625ac5 100644
--- a/src/plugins/accounting_storage/filetxt/Makefile.am
+++ b/src/plugins/accounting_storage/filetxt/Makefile.am
@@ -12,6 +12,6 @@ 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 = \
- $(top_builddir)/src/common/libcommon.la -lpthread
+ $(top_builddir)/src/common/.libs/libcommon.a -lpthread
accounting_storage_filetxt_la_DEPENDENCIES = \
- $(top_builddir)/src/common/libcommon.la
+ $(top_builddir)/src/common/.libs/libcommon.a
diff --git a/src/plugins/accounting_storage/filetxt/Makefile.in b/src/plugins/accounting_storage/filetxt/Makefile.in
index 9c6029afe56382aa72a7f6aa766387ac56c736c4..98bb80e751cb2350a2097b58c3e8879013e7fe8a 100644
--- a/src/plugins/accounting_storage/filetxt/Makefile.in
+++ b/src/plugins/accounting_storage/filetxt/Makefile.in
@@ -275,10 +275,10 @@ accounting_storage_filetxt_la_SOURCES = accounting_storage_filetxt.c \
accounting_storage_filetxt_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
accounting_storage_filetxt_la_LIBADD = \
- $(top_builddir)/src/common/libcommon.la -lpthread
+ $(top_builddir)/src/common/.libs/libcommon.a -lpthread
accounting_storage_filetxt_la_DEPENDENCIES = \
- $(top_builddir)/src/common/libcommon.la
+ $(top_builddir)/src/common/.libs/libcommon.a
all: all-am
diff --git a/src/plugins/accounting_storage/slurmdbd/Makefile.am b/src/plugins/accounting_storage/slurmdbd/Makefile.am
index e7074302ca8484d53b28154f9f57c726727e8238..a73fdabd2eb542a5d41c0152458e1768fa3d4bcc 100644
--- a/src/plugins/accounting_storage/slurmdbd/Makefile.am
+++ b/src/plugins/accounting_storage/slurmdbd/Makefile.am
@@ -11,4 +11,5 @@ 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 = $(top_builddir)/src/common/libcommon.la
+accounting_storage_slurmdbd_la_LIBADD = \
+ $(top_builddir)/src/common/.libs/libcommon.a
diff --git a/src/plugins/accounting_storage/slurmdbd/Makefile.in b/src/plugins/accounting_storage/slurmdbd/Makefile.in
index 7d31960e49c6bfeea51f8c283c0f88eef8f971b0..0bea4197c616ab5004e947491d203eeb3c8f064e 100644
--- a/src/plugins/accounting_storage/slurmdbd/Makefile.in
+++ b/src/plugins/accounting_storage/slurmdbd/Makefile.in
@@ -75,7 +75,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)"
pkglibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(pkglib_LTLIBRARIES)
accounting_storage_slurmdbd_la_DEPENDENCIES = \
- $(top_builddir)/src/common/libcommon.la
+ $(top_builddir)/src/common/.libs/libcommon.a
am_accounting_storage_slurmdbd_la_OBJECTS = \
accounting_storage_slurmdbd.lo
accounting_storage_slurmdbd_la_OBJECTS = \
@@ -276,7 +276,9 @@ 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 = $(top_builddir)/src/common/libcommon.la
+accounting_storage_slurmdbd_la_LIBADD = \
+ $(top_builddir)/src/common/.libs/libcommon.a
+
all: all-am
.SUFFIXES:
diff --git a/src/plugins/crypto/openssl/Makefile.am b/src/plugins/crypto/openssl/Makefile.am
index 0aca1f63cf5585f454bfa5cb38fe373f111228f5..cc7f5658218f93dfc9ebd5420d7a8e46f697181c 100644
--- a/src/plugins/crypto/openssl/Makefile.am
+++ b/src/plugins/crypto/openssl/Makefile.am
@@ -22,7 +22,7 @@ crypto_openssl_la_SOURCES = \
# available in slurmctld (slurm_setenvpf)
crypto_openssl_la_LIBADD = $(SSL_LIBS) \
- $(top_builddir)/src/common/libcommon.la
+ $(top_builddir)/src/common/.libs/libcommon.a
crypto_openssl_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
diff --git a/src/plugins/crypto/openssl/Makefile.in b/src/plugins/crypto/openssl/Makefile.in
index 3b45b8b103bef826d94808edba708a2d4c0c532a..225aee2b9384076936436c789bf0ab78bacf52ff 100644
--- a/src/plugins/crypto/openssl/Makefile.in
+++ b/src/plugins/crypto/openssl/Makefile.in
@@ -77,7 +77,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
am__DEPENDENCIES_1 =
@HAVE_OPENSSL_TRUE@crypto_openssl_la_DEPENDENCIES = \
@HAVE_OPENSSL_TRUE@ $(am__DEPENDENCIES_1) \
-@HAVE_OPENSSL_TRUE@ $(top_builddir)/src/common/libcommon.la
+@HAVE_OPENSSL_TRUE@ $(top_builddir)/src/common/.libs/libcommon.a
am__crypto_openssl_la_SOURCES_DIST = crypto_openssl.c
@HAVE_OPENSSL_TRUE@am_crypto_openssl_la_OBJECTS = crypto_openssl.lo
am__EXTRA_crypto_openssl_la_SOURCES_DIST = crypto_openssl.c
@@ -285,7 +285,7 @@ pkglib_LTLIBRARIES = $(openssl_lib)
# Add libslurm to switch_elan to provide some symbols that are not
# available in slurmctld (slurm_setenvpf)
@HAVE_OPENSSL_TRUE@crypto_openssl_la_LIBADD = $(SSL_LIBS) \
-@HAVE_OPENSSL_TRUE@ $(top_builddir)/src/common/libcommon.la
+@HAVE_OPENSSL_TRUE@ $(top_builddir)/src/common/.libs/libcommon.a
@HAVE_OPENSSL_TRUE@crypto_openssl_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
@HAVE_OPENSSL_FALSE@EXTRA_crypto_openssl_la_SOURCES = \
diff --git a/src/plugins/jobacct_gather/aix/Makefile.am b/src/plugins/jobacct_gather/aix/Makefile.am
index 8b988b33c035a9e4283853b99d5cef45c0e4b894..8f4591fd11b7df1e9cd9b7362b916d69d46007b6 100644
--- a/src/plugins/jobacct_gather/aix/Makefile.am
+++ b/src/plugins/jobacct_gather/aix/Makefile.am
@@ -15,4 +15,4 @@ jobacct_gather_aix_la_SOURCES = jobacct_gather_aix.c \
jobacct_gather_aix_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
jobacct_gather_aix_la_LIBADD = \
- $(top_builddir)/src/common/libcommon.la -lpthread
+ $(top_builddir)/src/common/.libs/libcommon.a -lpthread
diff --git a/src/plugins/jobacct_gather/aix/Makefile.in b/src/plugins/jobacct_gather/aix/Makefile.in
index 9139c14912daa3b3bb50539e2599f1381a613d74..83511202642b3b3e364e0d9266cfd051699534bc 100644
--- a/src/plugins/jobacct_gather/aix/Makefile.in
+++ b/src/plugins/jobacct_gather/aix/Makefile.in
@@ -75,7 +75,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)"
pkglibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(pkglib_LTLIBRARIES)
jobacct_gather_aix_la_DEPENDENCIES = \
- $(top_builddir)/src/common/libcommon.la
+ $(top_builddir)/src/common/.libs/libcommon.a
am_jobacct_gather_aix_la_OBJECTS = jobacct_gather_aix.lo proctrack.lo
jobacct_gather_aix_la_OBJECTS = $(am_jobacct_gather_aix_la_OBJECTS)
jobacct_gather_aix_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -277,7 +277,7 @@ jobacct_gather_aix_la_SOURCES = jobacct_gather_aix.c \
jobacct_gather_aix_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
jobacct_gather_aix_la_LIBADD = \
- $(top_builddir)/src/common/libcommon.la -lpthread
+ $(top_builddir)/src/common/.libs/libcommon.a -lpthread
all: all-am
diff --git a/src/plugins/jobacct_gather/linux/Makefile.am b/src/plugins/jobacct_gather/linux/Makefile.am
index 0fe102343cfac426b0a215aacfef11cf4bf3c401..652c352f3a4e2f1b445833570a173367ecde7387 100644
--- a/src/plugins/jobacct_gather/linux/Makefile.am
+++ b/src/plugins/jobacct_gather/linux/Makefile.am
@@ -15,4 +15,4 @@ jobacct_gather_linux_la_SOURCES = jobacct_gather_linux.c \
jobacct_gather_linux_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
jobacct_gather_linux_la_LIBADD = \
- $(top_builddir)/src/common/libcommon.la -lpthread
+ $(top_builddir)/src/common/.libs/libcommon.a -lpthread
diff --git a/src/plugins/jobacct_gather/linux/Makefile.in b/src/plugins/jobacct_gather/linux/Makefile.in
index baf253c8b2530213411c91aad9a12ef6be5dc90a..b288c2ce4db9f24e7cc4910226228811c50e9510 100644
--- a/src/plugins/jobacct_gather/linux/Makefile.in
+++ b/src/plugins/jobacct_gather/linux/Makefile.in
@@ -75,7 +75,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)"
pkglibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(pkglib_LTLIBRARIES)
jobacct_gather_linux_la_DEPENDENCIES = \
- $(top_builddir)/src/common/libcommon.la
+ $(top_builddir)/src/common/.libs/libcommon.a
am_jobacct_gather_linux_la_OBJECTS = jobacct_gather_linux.lo \
proctrack.lo
jobacct_gather_linux_la_OBJECTS = \
@@ -279,7 +279,7 @@ jobacct_gather_linux_la_SOURCES = jobacct_gather_linux.c \
jobacct_gather_linux_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
jobacct_gather_linux_la_LIBADD = \
- $(top_builddir)/src/common/libcommon.la -lpthread
+ $(top_builddir)/src/common/.libs/libcommon.a -lpthread
all: all-am
diff --git a/src/plugins/select/bluegene/block_allocator/Makefile.am b/src/plugins/select/bluegene/block_allocator/Makefile.am
index 7dece203c6f5ef5c3bd834fabfec062b3847fdcb..6f5a77b4ed8596232aee95a81c37ab525f785f63 100644
--- a/src/plugins/select/bluegene/block_allocator/Makefile.am
+++ b/src/plugins/select/bluegene/block_allocator/Makefile.am
@@ -12,7 +12,6 @@ INCLUDES = -I$(top_srcdir) $(BG_INCLUDES)
# block_allocator.h bridge_linker.h
# block_allocator_LDADD = \
-# $(top_builddir)/src/common/libcommon.la \
# $(top_builddir)/src/api/libslurm.la
diff --git a/src/plugins/select/bluegene/block_allocator/Makefile.in b/src/plugins/select/bluegene/block_allocator/Makefile.in
index 21b03828811622f65223a5dd18cb09688d84a2ed..5323d28221698f36255ae63130adeae23233aebc 100644
--- a/src/plugins/select/bluegene/block_allocator/Makefile.in
+++ b/src/plugins/select/bluegene/block_allocator/Makefile.in
@@ -269,7 +269,6 @@ INCLUDES = -I$(top_srcdir) $(BG_INCLUDES)
# block_allocator.h bridge_linker.h
# block_allocator_LDADD = \
-# $(top_builddir)/src/common/libcommon.la \
# $(top_builddir)/src/api/libslurm.la
# block_allocator_LDFLAGS = -export-dynamic -lm $(CMD_LDFLAGS)
diff --git a/src/plugins/select/bluegene/plugin/Makefile.am b/src/plugins/select/bluegene/plugin/Makefile.am
index a1711c7cbb70167bb9ec9db13a76cfbd64d741d4..817ccd600c50122c42b8dd7a83dd9a1bae840cd2 100644
--- a/src/plugins/select/bluegene/plugin/Makefile.am
+++ b/src/plugins/select/bluegene/plugin/Makefile.am
@@ -35,12 +35,9 @@ libsched_if64_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
sbin_PROGRAMS = slurm_prolog slurm_epilog sfree
-sfree_LDADD = $(top_builddir)/src/common/libcommon.la \
- $(top_builddir)/src/api/libslurm.la
-slurm_prolog_LDADD = $(top_builddir)/src/common/libcommon.la \
- $(top_builddir)/src/api/libslurm.la
-slurm_epilog_LDADD = $(top_builddir)/src/common/libcommon.la \
- $(top_builddir)/src/api/libslurm.la
+sfree_LDADD = $(top_builddir)/src/api/libslurmhelper.la
+slurm_prolog_LDADD = $(top_builddir)/src/api/libslurmhelper.la
+slurm_epilog_LDADD = $(top_builddir)/src/api/libslurmhelper.la
sfree_SOURCES = sfree.c sfree.h opts.c \
../block_allocator/bridge_linker.c \
../block_allocator/bridge_linker.h
diff --git a/src/plugins/select/bluegene/plugin/Makefile.in b/src/plugins/select/bluegene/plugin/Makefile.in
index 92da0480d486198e05d9399b7095a84a728004b0..44b196a691859831b93cd37f4b81c68ff4934b1a 100644
--- a/src/plugins/select/bluegene/plugin/Makefile.in
+++ b/src/plugins/select/bluegene/plugin/Makefile.in
@@ -98,22 +98,19 @@ PROGRAMS = $(sbin_PROGRAMS)
am_sfree_OBJECTS = sfree.$(OBJEXT) opts.$(OBJEXT) \
bridge_linker.$(OBJEXT)
sfree_OBJECTS = $(am_sfree_OBJECTS)
-sfree_DEPENDENCIES = $(top_builddir)/src/common/libcommon.la \
- $(top_builddir)/src/api/libslurm.la
+sfree_DEPENDENCIES = $(top_builddir)/src/api/libslurmhelper.la
sfree_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(sfree_LDFLAGS) \
$(LDFLAGS) -o $@
am_slurm_epilog_OBJECTS = slurm_epilog.$(OBJEXT)
slurm_epilog_OBJECTS = $(am_slurm_epilog_OBJECTS)
-slurm_epilog_DEPENDENCIES = $(top_builddir)/src/common/libcommon.la \
- $(top_builddir)/src/api/libslurm.la
+slurm_epilog_DEPENDENCIES = $(top_builddir)/src/api/libslurmhelper.la
slurm_epilog_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(slurm_epilog_LDFLAGS) $(LDFLAGS) -o $@
am_slurm_prolog_OBJECTS = slurm_prolog.$(OBJEXT)
slurm_prolog_OBJECTS = $(am_slurm_prolog_OBJECTS)
-slurm_prolog_DEPENDENCIES = $(top_builddir)/src/common/libcommon.la \
- $(top_builddir)/src/api/libslurm.la
+slurm_prolog_DEPENDENCIES = $(top_builddir)/src/api/libslurmhelper.la
slurm_prolog_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(slurm_prolog_LDFLAGS) $(LDFLAGS) -o $@
@@ -330,15 +327,9 @@ select_bluegene_la_LIBADD = ../block_allocator/libbluegene_block_allocator.la
# MPIRUN dynamic lib.
libsched_if64_la_SOURCES = libsched_if64.c
libsched_if64_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
-sfree_LDADD = $(top_builddir)/src/common/libcommon.la \
- $(top_builddir)/src/api/libslurm.la
-
-slurm_prolog_LDADD = $(top_builddir)/src/common/libcommon.la \
- $(top_builddir)/src/api/libslurm.la
-
-slurm_epilog_LDADD = $(top_builddir)/src/common/libcommon.la \
- $(top_builddir)/src/api/libslurm.la
-
+sfree_LDADD = $(top_builddir)/src/api/libslurmhelper.la
+slurm_prolog_LDADD = $(top_builddir)/src/api/libslurmhelper.la
+slurm_epilog_LDADD = $(top_builddir)/src/api/libslurmhelper.la
sfree_SOURCES = sfree.c sfree.h opts.c \
../block_allocator/bridge_linker.c \
../block_allocator/bridge_linker.h
diff --git a/src/plugins/select/cons_res/Makefile.am b/src/plugins/select/cons_res/Makefile.am
index cb6bd89e26c849ebf21d1b9c1c095aa8a9dc3b45..ecd64e77b69ff3a54f7f6dc8d91ff67f91765271 100644
--- a/src/plugins/select/cons_res/Makefile.am
+++ b/src/plugins/select/cons_res/Makefile.am
@@ -12,4 +12,4 @@ pkglib_LTLIBRARIES = select_cons_res.la
select_cons_res_la_SOURCES = select_cons_res.c select_cons_res.h \
dist_tasks.c dist_tasks.h
select_cons_res_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
-select_cons_res_la_LIBADD = $(top_builddir)/src/common/libcommon.la
+select_cons_res_la_LIBADD = $(top_builddir)/src/common/.libs/libcommon.a
diff --git a/src/plugins/select/cons_res/Makefile.in b/src/plugins/select/cons_res/Makefile.in
index ca80db51012371d813e210ea52a0214f94da0362..20ca2ce42e5a388e63bf7b3fa27fd008096040cd 100644
--- a/src/plugins/select/cons_res/Makefile.in
+++ b/src/plugins/select/cons_res/Makefile.in
@@ -75,7 +75,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)"
pkglibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(pkglib_LTLIBRARIES)
select_cons_res_la_DEPENDENCIES = \
- $(top_builddir)/src/common/libcommon.la
+ $(top_builddir)/src/common/.libs/libcommon.a
am_select_cons_res_la_OBJECTS = select_cons_res.lo dist_tasks.lo
select_cons_res_la_OBJECTS = $(am_select_cons_res_la_OBJECTS)
select_cons_res_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -275,7 +275,7 @@ select_cons_res_la_SOURCES = select_cons_res.c select_cons_res.h \
dist_tasks.c dist_tasks.h
select_cons_res_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
-select_cons_res_la_LIBADD = $(top_builddir)/src/common/libcommon.la
+select_cons_res_la_LIBADD = $(top_builddir)/src/common/.libs/libcommon.a
all: all-am
.SUFFIXES:
diff --git a/src/plugins/select/linear/Makefile.am b/src/plugins/select/linear/Makefile.am
index 00501c93b67bf25a31bf83d94ed29819e3575910..792bc980d6e93c65084f164f6d41ba8f6d5d3871 100644
--- a/src/plugins/select/linear/Makefile.am
+++ b/src/plugins/select/linear/Makefile.am
@@ -11,5 +11,5 @@ 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 = $(top_builddir)/src/common/libcommon.la
+select_linear_la_LIBADD = $(top_builddir)/src/common/.libs/libcommon.a
diff --git a/src/plugins/select/linear/Makefile.in b/src/plugins/select/linear/Makefile.in
index 6f5ef8a5cd18c8037d4b0870d41ebd5eff11add7..93fb3b6c83c6345701fbfa106cac94e7eadebb99 100644
--- a/src/plugins/select/linear/Makefile.in
+++ b/src/plugins/select/linear/Makefile.in
@@ -75,7 +75,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)"
pkglibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(pkglib_LTLIBRARIES)
select_linear_la_DEPENDENCIES = \
- $(top_builddir)/src/common/libcommon.la
+ $(top_builddir)/src/common/.libs/libcommon.a
am_select_linear_la_OBJECTS = select_linear.lo
select_linear_la_OBJECTS = $(am_select_linear_la_OBJECTS)
select_linear_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -273,7 +273,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 = $(top_builddir)/src/common/libcommon.la
+select_linear_la_LIBADD = $(top_builddir)/src/common/.libs/libcommon.a
all: all-am
.SUFFIXES:
diff --git a/src/plugins/switch/federation/Makefile.am b/src/plugins/switch/federation/Makefile.am
index 254d85f8df5340fdf37e941da516d4cf41413037..375c3e6ff167124fb0f505755ddb5dd7d1f5679c 100644
--- a/src/plugins/switch/federation/Makefile.am
+++ b/src/plugins/switch/federation/Makefile.am
@@ -23,7 +23,7 @@ switch_federation_la_SOURCES = \
switch_federation.c
switch_federation_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
-switch_federation_la_LIBADD = $(top_builddir)/src/common/libcommon.la
+switch_federation_la_LIBADD = $(top_builddir)/src/common/.libs/libcommon.a
else
EXTRA_switch_federation_la_SOURCES = \
diff --git a/src/plugins/switch/federation/Makefile.in b/src/plugins/switch/federation/Makefile.in
index 9f3d1c2fa9bbf3d8850c597f5d549d232dde5a45..13520a9ef40c3e5fa468822710e942f5fa70dfa6 100644
--- a/src/plugins/switch/federation/Makefile.in
+++ b/src/plugins/switch/federation/Makefile.in
@@ -74,8 +74,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(pkglibdir)"
pkglibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(pkglib_LTLIBRARIES)
-@HAVE_FEDERATION_TRUE@switch_federation_la_DEPENDENCIES = \
-@HAVE_FEDERATION_TRUE@ $(top_builddir)/src/common/libcommon.la
+@HAVE_FEDERATION_TRUE@switch_federation_la_DEPENDENCIES = $(top_builddir)/src/common/.libs/libcommon.a
am__switch_federation_la_SOURCES_DIST = federation.c federation.h \
federation_keys.h switch_federation.c
@HAVE_FEDERATION_TRUE@am_switch_federation_la_OBJECTS = federation.lo \
@@ -288,7 +287,7 @@ pkglib_LTLIBRARIES = $(federation_lib)
@HAVE_FEDERATION_TRUE@ switch_federation.c
@HAVE_FEDERATION_TRUE@switch_federation_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
-@HAVE_FEDERATION_TRUE@switch_federation_la_LIBADD = $(top_builddir)/src/common/libcommon.la
+@HAVE_FEDERATION_TRUE@switch_federation_la_LIBADD = $(top_builddir)/src/common/.libs/libcommon.a
@HAVE_FEDERATION_FALSE@EXTRA_switch_federation_la_SOURCES = \
@HAVE_FEDERATION_FALSE@ federation.c federation.h \
@HAVE_FEDERATION_FALSE@ federation_keys.h \
diff --git a/src/plugins/switch/none/Makefile.am b/src/plugins/switch/none/Makefile.am
index 2d74f777c9b0cf6aa209f14ec65b72be82314985..d15326c1725286931d3f6ba5525e07c6fbb7158a 100644
--- a/src/plugins/switch/none/Makefile.am
+++ b/src/plugins/switch/none/Makefile.am
@@ -13,5 +13,5 @@ switch_none_la_SOURCES = switch_none.c
switch_none_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
if HAVE_AIX
-switch_none_la_LIBADD = $(top_builddir)/src/common/libcommon.la
+switch_none_la_LIBADD = $(top_builddir)/src/common/.libs/libcommon.a
endif
diff --git a/src/plugins/switch/none/Makefile.in b/src/plugins/switch/none/Makefile.in
index f43923cfbd6523182fad0aec2a36574e09afd85d..ce970ff39f0aa561466e573f83c06fd1374f4e38 100644
--- a/src/plugins/switch/none/Makefile.in
+++ b/src/plugins/switch/none/Makefile.in
@@ -75,7 +75,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)"
pkglibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(pkglib_LTLIBRARIES)
@HAVE_AIX_TRUE@switch_none_la_DEPENDENCIES = \
-@HAVE_AIX_TRUE@ $(top_builddir)/src/common/libcommon.la
+@HAVE_AIX_TRUE@ $(top_builddir)/src/common/.libs/libcommon.a
am_switch_none_la_OBJECTS = switch_none.lo
switch_none_la_OBJECTS = $(am_switch_none_la_OBJECTS)
switch_none_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -273,7 +273,7 @@ pkglib_LTLIBRARIES = switch_none.la
# Null switch plugin.
switch_none_la_SOURCES = switch_none.c
switch_none_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
-@HAVE_AIX_TRUE@switch_none_la_LIBADD = $(top_builddir)/src/common/libcommon.la
+@HAVE_AIX_TRUE@switch_none_la_LIBADD = $(top_builddir)/src/common/.libs/libcommon.a
all: all-am
.SUFFIXES:
diff --git a/src/plugins/task/affinity/Makefile.am b/src/plugins/task/affinity/Makefile.am
index c3eb2f7fbc1f518bf5eafec74f46a4c05255ea84..726fe98b51a09292e6f2389351cbed3e0a3dabd3 100644
--- a/src/plugins/task/affinity/Makefile.am
+++ b/src/plugins/task/affinity/Makefile.am
@@ -16,7 +16,7 @@ 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 = $(top_builddir)/src/common/libcommon.la
+task_affinity_la_LIBADD = $(top_builddir)/src/common/.libs/libcommon.a
else
pkglib_LTLIBRARIES =
EXTRA_task_affinity_la_SOURCES = \
diff --git a/src/plugins/task/affinity/Makefile.in b/src/plugins/task/affinity/Makefile.in
index d77cce8d8fc304d0d1873d9c50bdb729ade6f604..f04f4cb8425d0df4bea7395c89067e6077e045ac 100644
--- a/src/plugins/task/affinity/Makefile.in
+++ b/src/plugins/task/affinity/Makefile.in
@@ -74,7 +74,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(pkglibdir)"
pkglibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(pkglib_LTLIBRARIES)
-@HAVE_SCHED_SETAFFINITY_TRUE@task_affinity_la_DEPENDENCIES = $(top_builddir)/src/common/libcommon.la
+@HAVE_SCHED_SETAFFINITY_TRUE@task_affinity_la_DEPENDENCIES = $(top_builddir)/src/common/.libs/libcommon.a
am__task_affinity_la_SOURCES_DIST = affinity.c affinity.h cpuset.c \
dist_tasks.c dist_tasks.h numa.c schedutils.c task_affinity.c
@HAVE_SCHED_SETAFFINITY_TRUE@am_task_affinity_la_OBJECTS = \
@@ -290,7 +290,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
@HAVE_SCHED_SETAFFINITY_TRUE@ task_affinity.c
@HAVE_SCHED_SETAFFINITY_TRUE@task_affinity_la_LDFLAGS = $(SO_LDFLAGS) $(NUMA_LIBS) $(PLPA_LIBS) $(PLUGIN_FLAGS)
-@HAVE_SCHED_SETAFFINITY_TRUE@task_affinity_la_LIBADD = $(top_builddir)/src/common/libcommon.la
+@HAVE_SCHED_SETAFFINITY_TRUE@task_affinity_la_LIBADD = $(top_builddir)/src/common/.libs/libcommon.a
@HAVE_SCHED_SETAFFINITY_FALSE@EXTRA_task_affinity_la_SOURCES = \
@HAVE_SCHED_SETAFFINITY_FALSE@ affinity.c affinity.h \
@HAVE_SCHED_SETAFFINITY_FALSE@ cpuset.c \
diff --git a/src/plugins/task/none/Makefile.am b/src/plugins/task/none/Makefile.am
index d04c1207ca53380b2e5de104a1fad588ee1e34fc..3b59700c68866464bc89f9c4de4ff318cfda6b50 100644
--- a/src/plugins/task/none/Makefile.am
+++ b/src/plugins/task/none/Makefile.am
@@ -13,5 +13,5 @@ task_none_la_SOURCES = task_none.c
task_none_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
if HAVE_AIX
-task_none_la_LIBADD = $(top_builddir)/src/common/libcommon.la
+task_none_la_LIBADD = $(top_builddir)/src/common/.libs/libcommon.a
endif
diff --git a/src/plugins/task/none/Makefile.in b/src/plugins/task/none/Makefile.in
index cb95eda1fdc50e0aede9a7964dd7dfc98a616863..d7c2a8ee071cbb14618460344e2e042479dc050d 100644
--- a/src/plugins/task/none/Makefile.in
+++ b/src/plugins/task/none/Makefile.in
@@ -75,7 +75,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)"
pkglibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(pkglib_LTLIBRARIES)
@HAVE_AIX_TRUE@task_none_la_DEPENDENCIES = \
-@HAVE_AIX_TRUE@ $(top_builddir)/src/common/libcommon.la
+@HAVE_AIX_TRUE@ $(top_builddir)/src/common/.libs/libcommon.a
am_task_none_la_OBJECTS = task_none.lo
task_none_la_OBJECTS = $(am_task_none_la_OBJECTS)
task_none_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -273,7 +273,7 @@ pkglib_LTLIBRARIES = task_none.la
# Null task plugin.
task_none_la_SOURCES = task_none.c
task_none_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
-@HAVE_AIX_TRUE@task_none_la_LIBADD = $(top_builddir)/src/common/libcommon.la
+@HAVE_AIX_TRUE@task_none_la_LIBADD = $(top_builddir)/src/common/.libs/libcommon.a
all: all-am
.SUFFIXES: