commit 855283216019bd08f101f61f6a42e41aa3d643d3 Author: orbea Date: Thu Mar 18 10:09:28 2021 -0700 build: Don't use object files directly. diff --git a/src/api/Makefile.am b/src/api/Makefile.am index 53af7f8d7f..815ceeb3ef 100644 --- a/src/api/Makefile.am +++ b/src/api/Makefile.am @@ -69,7 +69,6 @@ BUILT_SOURCES = $(VERSION_SCRIPT) $(FULL_VERSION_SCRIPT)\ # them to plugins that are loaded. # Also, libslurmhelper, libslurm.o are for convenience, they are not installed. noinst_LTLIBRARIES = libslurmhelper.la -noinst_PROGRAMS = libslurm.o slurmdbapi_src = \ account_functions.c \ @@ -168,14 +167,6 @@ libslurm_pmi_la_LDFLAGS = \ -avoid-version \ $(SLURM_PMI_OTHER_FLAGS) -# This was made so we could export all symbols from libcommon -# on multiple platforms -libslurm_o_SOURCES = - -libslurm_o_LDADD = $(top_builddir)/src/common/libeio.o \ - $(top_builddir)/src/common/libspank.o \ - $(top_builddir)/src/common/libcommon.o - libslurm.o$(EXEEXT): $(libslurmhelper_la_OBJECTS) $(libslurm_o_LDADD) $(LINK) $(libslurmhelper_la_OBJECTS) $(libslurm_o_LDADD) diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 5181806216..5a2c552e16 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -12,8 +12,6 @@ AUTOMAKE_OPTIONS = foreign AM_CPPFLAGS = -I$(top_srcdir) -DSBINDIR=\"$(sbindir)\" -noinst_PROGRAMS = libcommon.o libeio.o libspank.o - noinst_LTLIBRARIES = \ libcommon.la \ libdaemonize.la \ @@ -157,19 +155,16 @@ libcommon_la_LDFLAGS = $(LIB_LDFLAGS) -module -export-dynamic # This was made so we could export all symbols from libcommon # on multiple platforms -libcommon_o_SOURCES = libcommon.o$(EXEEXT) : $(libcommon_la_OBJECTS) $(libcommon_la_DEPENDENCIES) $(LINK) $(libcommon_la_OBJECTS) # This was made so we could export all symbols from libeio # on multiple platforms -libeio_o_SOURCES = libeio.o$(EXEEXT) : $(libeio_la_OBJECTS) $(libeio_la_DEPENDENCIES) $(LINK) $(libeio_la_OBJECTS) # This was made so we could export all symbols from libspank # on multiple platforms -libspank_o_SOURCES = libspank.o$(EXEEXT) : $(libspank_la_OBJECTS) $(libspank_la_DEPENDENCIES) $(LINK) $(libspank_la_OBJECTS) diff --git a/src/slurmd/common/Makefile.am b/src/slurmd/common/Makefile.am index bf98549fe4..4c161722fb 100644 --- a/src/slurmd/common/Makefile.am +++ b/src/slurmd/common/Makefile.am @@ -8,7 +8,6 @@ AM_CPPFLAGS = -I$(top_srcdir) $(HWLOC_CPPFLAGS) # making a .la noinst_LTLIBRARIES = libslurmd_common.la libslurmd_reverse_tree_math.la -noinst_PROGRAMS = libslurmd_common.o libslurmd_common_la_SOURCES = \ core_spec_plugin.c core_spec_plugin.h \ @@ -30,7 +29,6 @@ libslurmd_common_la_LDFLAGS = $(HWLOC_LDFLAGS) $(HWLOC_LIBS) # This was made so we could export all symbols from libslurm_common # Since the plugins loaded may need all the symbols here. -libslurmd_common_o_SOURCES = libslurmd_common.o$(EXEEXT) : \ $(libslurmd_common_la_OBJECTS) $(libslurmd_common_la_DEPENDENCIES) $(LINK) $(libslurmd_common_la_OBJECTS) diff --git a/src/slurmd/slurmd/Makefile.am b/src/slurmd/slurmd/Makefile.am index f18020912c..2f4098988e 100644 --- a/src/slurmd/slurmd/Makefile.am +++ b/src/slurmd/slurmd/Makefile.am @@ -7,7 +7,7 @@ sbin_PROGRAMS = slurmd depend_libs = $(top_builddir)/src/common/libdaemonize.la \ $(top_builddir)/src/bcast/libfile_bcast.la \ - ../common/libslurmd_common.o ../common/libslurmd_reverse_tree_math.la + ../common/libslurmd_common.la ../common/libslurmd_reverse_tree_math.la # These 2 depend_* should look the same in ../slurmstepd/Makefile.am depend_ldadd = $(HWLOC_LIBS) $(PAM_LIBS) $(UTIL_LIBS) diff --git a/src/slurmd/slurmstepd/Makefile.am b/src/slurmd/slurmstepd/Makefile.am index c52af4100c..78e8142557 100644 --- a/src/slurmd/slurmstepd/Makefile.am +++ b/src/slurmd/slurmstepd/Makefile.am @@ -7,7 +7,7 @@ sbin_PROGRAMS = slurmstepd depend_libs = \ $(top_builddir)/src/common/libdaemonize.la \ - ../common/libslurmd_common.o + ../common/libslurmd_common.la # If slurmstepd_LDADD or slurmstepd_LDFLAGS change # make sure you alter the below depend_[ldadd|ldflags] to look identical in the