From 3da8021f5518c7db95228b4e3374813137507ff8 Mon Sep 17 00:00:00 2001 From: Yu Watanabe <watanabe.yu@gmail.com> Date: Mon, 24 Oct 2016 14:36:12 -0600 Subject: [PATCH] Fix typo in src/api/Makefile.am bug 2390 --- src/api/Makefile.am | 2 +- src/api/Makefile.in | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/api/Makefile.am b/src/api/Makefile.am index b5cb058a2c0..7adbd8e5145 100644 --- a/src/api/Makefile.am +++ b/src/api/Makefile.am @@ -129,7 +129,7 @@ slurmapi_add = \ libslurmhelper_la_SOURCES = $(slurmapi_src) libslurmhelper_la_LIBADD = $(slurmapi_add) -libslurmhelper_la_LDFLAGs = \ +libslurmhelper_la_LDFLAGS = \ $(LIB_LDFLAGS) \ -version-info $(current):$(rev):$(age) diff --git a/src/api/Makefile.in b/src/api/Makefile.in index cefef37a7d5..fed6f3adc16 100644 --- a/src/api/Makefile.in +++ b/src/api/Makefile.in @@ -204,6 +204,10 @@ am__objects_1 = allocate.lo allocate_msg.lo block_info.lo \ topo_info.lo triggers.lo reconfigure.lo update_config.lo am_libslurmhelper_la_OBJECTS = $(am__objects_1) libslurmhelper_la_OBJECTS = $(am_libslurmhelper_la_OBJECTS) +libslurmhelper_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libslurmhelper_la_LDFLAGS) $(LDFLAGS) \ + -o $@ PROGRAMS = $(noinst_PROGRAMS) am_libslurm_o_OBJECTS = libslurm_o_OBJECTS = $(am_libslurm_o_OBJECTS) @@ -650,7 +654,7 @@ slurmapi_add = \ libslurmhelper_la_SOURCES = $(slurmapi_src) libslurmhelper_la_LIBADD = $(slurmapi_add) -libslurmhelper_la_LDFLAGs = \ +libslurmhelper_la_LDFLAGS = \ $(LIB_LDFLAGS) \ -version-info $(current):$(rev):$(age) @@ -777,7 +781,7 @@ libslurm.la: $(libslurm_la_OBJECTS) $(libslurm_la_DEPENDENCIES) $(EXTRA_libslurm $(AM_V_CCLD)$(libslurm_la_LINK) -rpath $(libdir) $(libslurm_la_OBJECTS) $(libslurm_la_LIBADD) $(LIBS) libslurmhelper.la: $(libslurmhelper_la_OBJECTS) $(libslurmhelper_la_DEPENDENCIES) $(EXTRA_libslurmhelper_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(libslurmhelper_la_OBJECTS) $(libslurmhelper_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libslurmhelper_la_LINK) $(libslurmhelper_la_OBJECTS) $(libslurmhelper_la_LIBADD) $(LIBS) clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ -- GitLab