Attachment #692331 for bug #775614




# 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 \

	-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)






AM_CPPFLAGS     = -I$(top_srcdir) -DSBINDIR=\"$(sbindir)\"

noinst_PROGRAMS = libcommon.o libeio.o libspank.o

noinst_LTLIBRARIES = 			\
	libcommon.la 			\
	libdaemonize.la 		\


# 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)


Lines 8-14 AM_CPPFLAGS = -I$(top_srcdir) $(HWLOC_CPPFLAGS) Link Here

(-)a/src/slurmd/common/Makefile.am (-2 lines)
8	# making a .la	8	# making a .la
9		9
10	noinst_LTLIBRARIES = libslurmd_common.la libslurmd_reverse_tree_math.la	10	noinst_LTLIBRARIES = libslurmd_common.la libslurmd_reverse_tree_math.la
11	noinst_PROGRAMS = libslurmd_common.o
12		11
13	libslurmd_common_la_SOURCES = \	12	libslurmd_common_la_SOURCES = \
14	core_spec_plugin.c core_spec_plugin.h \	13	core_spec_plugin.c core_spec_plugin.h \
Lines 30-36 libslurmd_common_la_LDFLAGS = $(HWLOC_LDFLAGS) $(HWLOC_LIBS) Link Here
30		29
31	# This was made so we could export all symbols from libslurm_common	30	# This was made so we could export all symbols from libslurm_common
32	# Since the plugins loaded may need all the symbols here.	31	# Since the plugins loaded may need all the symbols here.
33	libslurmd_common_o_SOURCES =
34	libslurmd_common.o$(EXEEXT) : \	32	libslurmd_common.o$(EXEEXT) : \
35	$(libslurmd_common_la_OBJECTS) $(libslurmd_common_la_DEPENDENCIES)	33	$(libslurmd_common_la_OBJECTS) $(libslurmd_common_la_DEPENDENCIES)
36	$(LINK) $(libslurmd_common_la_OBJECTS)	34	$(LINK) $(libslurmd_common_la_OBJECTS)

Lines 7-13 sbin_PROGRAMS = slurmd Link Here

(-)a/src/slurmd/slurmd/Makefile.am (-1 / +1 lines)
7		7
8	depend_libs = $(top_builddir)/src/common/libdaemonize.la \	8	depend_libs = $(top_builddir)/src/common/libdaemonize.la \
9	$(top_builddir)/src/bcast/libfile_bcast.la \	9	$(top_builddir)/src/bcast/libfile_bcast.la \
10	../common/libslurmd_common.o ../common/libslurmd_reverse_tree_math.la	10	../common/libslurmd_common.la ../common/libslurmd_reverse_tree_math.la
11		11
12	# These 2 depend_* should look the same in ../slurmstepd/Makefile.am	12	# These 2 depend_* should look the same in ../slurmstepd/Makefile.am
13	depend_ldadd = $(HWLOC_LIBS) $(PAM_LIBS) $(UTIL_LIBS)	13	depend_ldadd = $(HWLOC_LIBS) $(PAM_LIBS) $(UTIL_LIBS)

Lines 7-13 sbin_PROGRAMS = slurmstepd Link Here

(-)a/src/slurmd/slurmstepd/Makefile.am (-1 / +1 lines)
7		7
8	depend_libs = \	8	depend_libs = \
9	$(top_builddir)/src/common/libdaemonize.la \	9	$(top_builddir)/src/common/libdaemonize.la \
10	../common/libslurmd_common.o	10	../common/libslurmd_common.la
11		11
12	# If slurmstepd_LDADD or slurmstepd_LDFLAGS change	12	# If slurmstepd_LDADD or slurmstepd_LDFLAGS change
13	# make sure you alter the below depend_[ldadd\|ldflags] to look identical in the	13	# make sure you alter the below depend_[ldadd\|ldflags] to look identical in the

Return to bug 775614

Lines 69-75 BUILT_SOURCES = $(VERSION_SCRIPT) $(FULL_VERSION_SCRIPT)\ Link Here

(-)a/src/api/Makefile.am (-9 lines)
69	# them to plugins that are loaded.	69	# them to plugins that are loaded.
70	# Also, libslurmhelper, libslurm.o are for convenience, they are not installed.	70	# Also, libslurmhelper, libslurm.o are for convenience, they are not installed.
71	noinst_LTLIBRARIES = libslurmhelper.la	71	noinst_LTLIBRARIES = libslurmhelper.la
72	noinst_PROGRAMS = libslurm.o
73		72
74	slurmdbapi_src = \	73	slurmdbapi_src = \
75	account_functions.c \	74	account_functions.c \
Lines 168-181 libslurm_pmi_la_LDFLAGS = \ Link Here
168	-avoid-version \	167	-avoid-version \
169	$(SLURM_PMI_OTHER_FLAGS)	168	$(SLURM_PMI_OTHER_FLAGS)
170		169
171	# This was made so we could export all symbols from libcommon
172	# on multiple platforms
173	libslurm_o_SOURCES =
174
175	libslurm_o_LDADD = $(top_builddir)/src/common/libeio.o \
176	$(top_builddir)/src/common/libspank.o \
177	$(top_builddir)/src/common/libcommon.o
178
179	libslurm.o$(EXEEXT): $(libslurmhelper_la_OBJECTS) $(libslurm_o_LDADD)	170	libslurm.o$(EXEEXT): $(libslurmhelper_la_OBJECTS) $(libslurm_o_LDADD)
180	$(LINK) $(libslurmhelper_la_OBJECTS) $(libslurm_o_LDADD)	171	$(LINK) $(libslurmhelper_la_OBJECTS) $(libslurm_o_LDADD)
181		172

Lines 12-19 AUTOMAKE_OPTIONS = foreign Link Here

(-)a/src/common/Makefile.am (-5 lines)
12		12
13	AM_CPPFLAGS = -I$(top_srcdir) -DSBINDIR=\"$(sbindir)\"	13	AM_CPPFLAGS = -I$(top_srcdir) -DSBINDIR=\"$(sbindir)\"
14		14
15	noinst_PROGRAMS = libcommon.o libeio.o libspank.o
16
17	noinst_LTLIBRARIES = \	15	noinst_LTLIBRARIES = \
18	libcommon.la \	16	libcommon.la \
19	libdaemonize.la \	17	libdaemonize.la \
Lines 157-175 libcommon_la_LDFLAGS = $(LIB_LDFLAGS) -module -export-dynamic Link Here
157		155
158	# This was made so we could export all symbols from libcommon	156	# This was made so we could export all symbols from libcommon
159	# on multiple platforms	157	# on multiple platforms
160	libcommon_o_SOURCES =
161	libcommon.o$(EXEEXT) : $(libcommon_la_OBJECTS) $(libcommon_la_DEPENDENCIES)	158	libcommon.o$(EXEEXT) : $(libcommon_la_OBJECTS) $(libcommon_la_DEPENDENCIES)
162	$(LINK) $(libcommon_la_OBJECTS)	159	$(LINK) $(libcommon_la_OBJECTS)
163		160
164	# This was made so we could export all symbols from libeio	161	# This was made so we could export all symbols from libeio
165	# on multiple platforms	162	# on multiple platforms
166	libeio_o_SOURCES =
167	libeio.o$(EXEEXT) : $(libeio_la_OBJECTS) $(libeio_la_DEPENDENCIES)	163	libeio.o$(EXEEXT) : $(libeio_la_OBJECTS) $(libeio_la_DEPENDENCIES)
168	$(LINK) $(libeio_la_OBJECTS)	164	$(LINK) $(libeio_la_OBJECTS)
169		165
170	# This was made so we could export all symbols from libspank	166	# This was made so we could export all symbols from libspank
171	# on multiple platforms	167	# on multiple platforms
172	libspank_o_SOURCES =
173	libspank.o$(EXEEXT) : $(libspank_la_OBJECTS) $(libspank_la_DEPENDENCIES)	168	libspank.o$(EXEEXT) : $(libspank_la_OBJECTS) $(libspank_la_DEPENDENCIES)
174	$(LINK) $(libspank_la_OBJECTS)	169	$(LINK) $(libspank_la_OBJECTS)
175		170