diff options
| author | Avneesh Sachdev <avneesh@opensourcerouting.org> | 2012-10-04 16:21:34 +0000 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2012-11-01 23:03:24 -0700 |
| commit | d1d3ac9bad0caf7a9c465bb382b924009f0d9168 (patch) | |
| tree | ee76b87f2b3b18ac109bf8b4268bfa5251ac3b34 | |
| parent | b07458a055493dd37cb955ae90f11ae8bc334d3a (diff) | |
build: reorder libraries to address linker error
The linker on some systems (for example, Ubuntu 12.04 LTS x86_64)
appears to be sensitive to the order in which libraries are
specified. On these systems, if a library 'A' depends on a library
'B', it has to be specified before 'B' when linking an executable.
* zebra/Makefile.am: Make sure LIBCAP comes after libzebra.
* tests/Makefile.am: Ensure libm comes after libbgp.
Signed-off-by: Avneesh Sachdev <avneesh@opensourcerouting.org>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
| -rw-r--r-- | tests/Makefile.am | 10 | ||||
| -rw-r--r-- | zebra/Makefile.am | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index e510a158..cd6b2f1b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -32,10 +32,10 @@ teststream_LDADD = ../lib/libzebra.la @LIBCAP@ heavy_LDADD = ../lib/libzebra.la @LIBCAP@ -lm heavywq_LDADD = ../lib/libzebra.la @LIBCAP@ -lm heavythread_LDADD = ../lib/libzebra.la @LIBCAP@ -lm -aspathtest_LDADD = ../lib/libzebra.la @LIBCAP@ -lm ../bgpd/libbgp.a -testbgpcap_LDADD = ../lib/libzebra.la @LIBCAP@ -lm ../bgpd/libbgp.a -ecommtest_LDADD = ../lib/libzebra.la @LIBCAP@ -lm ../bgpd/libbgp.a -testbgpmpattr_LDADD = ../lib/libzebra.la @LIBCAP@ -lm ../bgpd/libbgp.a +aspathtest_LDADD = ../bgpd/libbgp.a ../lib/libzebra.la @LIBCAP@ -lm +testbgpcap_LDADD = ../bgpd/libbgp.a ../lib/libzebra.la @LIBCAP@ -lm +ecommtest_LDADD = ../bgpd/libbgp.a ../lib/libzebra.la @LIBCAP@ -lm +testbgpmpattr_LDADD = ../bgpd/libbgp.a ../lib/libzebra.la @LIBCAP@ -lm testchecksum_LDADD = ../lib/libzebra.la @LIBCAP@ -testbgpmpath_LDADD = ../lib/libzebra.la @LIBCAP@ -lm ../bgpd/libbgp.a +testbgpmpath_LDADD = ../bgpd/libbgp.a ../lib/libzebra.la @LIBCAP@ -lm tabletest_LDADD = ../lib/libzebra.la @LIBCAP@ -lm diff --git a/zebra/Makefile.am b/zebra/Makefile.am index 9ac90f8e..ea962bf4 100644 --- a/zebra/Makefile.am +++ b/zebra/Makefile.am @@ -39,9 +39,9 @@ noinst_HEADERS = \ connected.h ioctl.h rib.h rt.h zserv.h redistribute.h debug.h rtadv.h \ interface.h ipforward.h irdp.h router-id.h kernel_socket.h -zebra_LDADD = $(otherobj) $(LIBCAP) $(LIB_IPV6) ../lib/libzebra.la +zebra_LDADD = $(otherobj) ../lib/libzebra.la $(LIBCAP) $(LIB_IPV6) -testzebra_LDADD = $(LIBCAP) $(LIB_IPV6) ../lib/libzebra.la +testzebra_LDADD = ../lib/libzebra.la $(LIBCAP) $(LIB_IPV6) zebra_DEPENDENCIES = $(otherobj) |