lib: Correctly pass collected AM_LDFLAGS to linker

AM_LDFLAGS is not automatically passed to individual library LDFLAGS
and must be passed in explicitly.

Signed-off-by: Thomas Graf <tgraf@noironetworks.com>
Acked-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/lib/automake.mk b/lib/automake.mk
index f30459c..5ce93a3 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -15,7 +15,8 @@ endif
 
 lib_libopenvswitch_la_LDFLAGS = \
         -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-        -Wl,--version-script=$(top_builddir)/lib/libopenvswitch.sym
+        -Wl,--version-script=$(top_builddir)/lib/libopenvswitch.sym \
+        $(AM_LDFLAGS)
 
 lib_libopenvswitch_la_SOURCES = \
        lib/aes128.c \
@@ -295,7 +296,8 @@ CLEANFILES += $(nodist_lib_libopenvswitch_la_SOURCES)
 lib_LTLIBRARIES += lib/libsflow.la
 lib_libsflow_la_LDFLAGS = \
         -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-        -Wl,--version-script=$(top_builddir)/lib/libsflow.sym
+        -Wl,--version-script=$(top_builddir)/lib/libsflow.sym \
+        $(AM_LDFLAGS)
 lib_libsflow_la_SOURCES = \
        lib/sflow_api.h \
        lib/sflow.h \

diff --git a/ofproto/automake.mk b/ofproto/automake.mk
index bb4bc7e..6f04852 100644 (file)
--- a/ofproto/automake.mk
+++ b/ofproto/automake.mk
@@ -8,7 +8,8 @@
 lib_LTLIBRARIES += ofproto/libofproto.la
 ofproto_libofproto_la_LDFLAGS = \
         -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-        -Wl,--version-script=$(top_builddir)/ofproto/libofproto.sym
+        -Wl,--version-script=$(top_builddir)/ofproto/libofproto.sym \
+        $(AM_LDFLAGS)
 ofproto_libofproto_la_SOURCES = \
        ofproto/bond.c \
        ofproto/bond.h \

diff --git a/ovsdb/automake.mk b/ovsdb/automake.mk
index 7a8d7d2..2585bec 100644 (file)
--- a/ovsdb/automake.mk
+++ b/ovsdb/automake.mk
@@ -2,7 +2,8 @@
 lib_LTLIBRARIES += ovsdb/libovsdb.la
 ovsdb_libovsdb_la_LDFLAGS = \
         -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-        -Wl,--version-script=$(top_builddir)/ovsdb/libovsdb.sym
+        -Wl,--version-script=$(top_builddir)/ovsdb/libovsdb.sym \
+        $(AM_LDFLAGS)
 ovsdb_libovsdb_la_SOURCES = \
        ovsdb/column.c \
        ovsdb/column.h \