[rtems commit] build: Add missing $(LDADD) for dependencies

Sebastian Huber sebh at rtems.org
Mon Jan 14 08:09:55 UTC 2019


Module:    rtems
Branch:    master
Commit:    dc0285fd09c9c2032a5cf7dffe2e8b6a6259a2d4
Changeset: http://git.rtems.org/rtems/commit/?id=dc0285fd09c9c2032a5cf7dffe2e8b6a6259a2d4

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Mon Jan 14 09:06:30 2019 +0100

build: Add missing $(LDADD) for dependencies

---

 testsuites/libtests/Makefile.am | 12 ++++++------
 testsuites/samples/Makefile.am  |  2 +-
 testsuites/sptests/Makefile.am  |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/testsuites/libtests/Makefile.am b/testsuites/libtests/Makefile.am
index 37bfd77..cb632f8 100644
--- a/testsuites/libtests/Makefile.am
+++ b/testsuites/libtests/Makefile.am
@@ -220,7 +220,7 @@ complex_SOURCES = complex/init.c complex/docomplex.c \
 	complex/docomplexf.c complex/docomplexl.c
 complex_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_complex) \
 	$(support_includes) -DNO_LONG_DOUBLE
-complex_LDADD = -lm
+complex_LDADD = -lm $(LDADD)
 endif
 
 if TEST_cpuuse
@@ -485,7 +485,7 @@ dl06-pre-init.o: dl06-pre-tar.o
 		-DDL06_PRE -c -o $@ $(srcdir)/dl06/init.c
 dl06.pre: dl06-pre-init.o dl06/dl06-dl-load.o dl06-pre-tar.o
 	@rm -f $@
-	$(AM_V_CCLD)$(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ $+
+	$(AM_V_CCLD)$(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ $+ $(LDADD)
 dl06-o1.o: dl06/dl06-o1.c Makefile
 	$(AM_V_CC)$(COMPILE) -c -o $@ $<
 dl06-o2.o: dl06/dl06-o2.c Makefile
@@ -508,7 +508,7 @@ dl06-sym.o: dl06.pre
 	$(AM_V_GEN)rtems-syms -e -C $(CC) -c "$(CFLAGS)" -o $@ $<
 dl06$(EXEEXT): $(dl06_OBJECTS) dl06-sym.o
 	@rm -f $@
-	$(AM_V_CCLD)$(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ $+
+	$(AM_V_CCLD)$(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ $+ $(LDADD)
 CLEANFILES += dl06.pre dl06-sym.o dl06-o1.o dl06-o2.o dl06.tar dl06-tar.h
 endif
 endif
@@ -819,7 +819,7 @@ lib_screens += math/math.scn
 math_SOURCES = math/init.c math/domath.c
 math_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_math) $(support_includes) \
 	-I$(top_srcdir)/math
-math_LDADD = -lm
+math_LDADD = -lm $(LDADD)
 endif
 
 if TEST_mathf
@@ -828,7 +828,7 @@ lib_screens += mathf/mathf.scn
 mathf_SOURCES = mathf/init.c mathf/domathf.c
 mathf_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mathf) \
 	$(support_includes) -I$(top_srcdir)/math
-mathf_LDADD = -lm
+mathf_LDADD = -lm $(LDADD)
 endif
 
 if TEST_mathl
@@ -838,7 +838,7 @@ mathl_SOURCES = mathl/init.c mathl/domathl.c
 mathl_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mathl) \
 	$(support_includes) -I$(top_srcdir)/math \
 	-DNO_LONG_DOUBLE
-mathl_LDADD = -lm
+mathl_LDADD = -lm $(LDADD)
 endif
 
 if TEST_md501
diff --git a/testsuites/samples/Makefile.am b/testsuites/samples/Makefile.am
index 280590d..f78d75e 100644
--- a/testsuites/samples/Makefile.am
+++ b/testsuites/samples/Makefile.am
@@ -121,7 +121,7 @@ paranoia_SOURCES = paranoia/init.c paranoia/paranoia.c \
 	paranoia/system.h
 paranoia_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_paranoia) \
 	$(support_includes) -DCYGNUS -DNOMAIN -DNOSIGNAL
-paranoia_LDADD = -lm
+paranoia_LDADD = -lm $(LDADD)
 endif
 
 if NETTESTS
diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am
index a3c9b1e..e927737 100644
--- a/testsuites/sptests/Makefile.am
+++ b/testsuites/sptests/Makefile.am
@@ -733,7 +733,7 @@ sp_docs += spconsole01/spconsole01.doc
 spconsole01_SOURCES = spconsole01/init.c
 spconsole01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_spconsole01) \
 	$(support_includes)
-spconsole01_LDADD = -lm
+spconsole01_LDADD = -lm $(LDADD)
 endif
 
 if TEST_spcontext01
@@ -1491,7 +1491,7 @@ sp_docs += splinkersets01/splinkersets01.doc
 splinkersets01_SOURCES = splinkersets01/init.c
 splinkersets01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_splinkersets01) \
 	$(support_includes)
-splinkersets01_LDADD = libsplinkersets01.a
+splinkersets01_LDADD = libsplinkersets01.a $(LDADD)
 endif
 
 if TEST_spmkdir




More information about the vc mailing list