Skip to content

Commit

Permalink
lib: Correctly pass collected AM_LDFLAGS to linker
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Graf authored and blp committed Nov 12, 2014
1 parent 4595255 commit a4353e2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
6 changes: 4 additions & 2 deletions lib/automake.mk
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion ofproto/automake.mk
Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion ovsdb/automake.mk
Expand Up @@ -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 \
Expand Down

0 comments on commit a4353e2

Please sign in to comment.