git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
openvswitch: Use libtool and allow building shared libs
[sliver-openvswitch.git]
/
ovsdb
/
automake.mk
diff --git
a/ovsdb/automake.mk
b/ovsdb/automake.mk
index
b178f3f
..
b97365e
100644
(file)
--- a/
ovsdb/automake.mk
+++ b/
ovsdb/automake.mk
@@
-1,6
+1,7
@@
# libovsdb
# libovsdb
-noinst_LIBRARIES += ovsdb/libovsdb.a
-ovsdb_libovsdb_a_SOURCES = \
+lib_LTLIBRARIES += ovsdb/libovsdb.la
+ovsdb_libovsdb_la_LDFLAGS = -release $(VERSION)
+ovsdb_libovsdb_la_SOURCES = \
ovsdb/column.c \
ovsdb/column.h \
ovsdb/condition.c \
ovsdb/column.c \
ovsdb/column.h \
ovsdb/condition.c \
@@
-21,51
+22,55
@@
ovsdb_libovsdb_a_SOURCES = \
ovsdb/query.h \
ovsdb/row.c \
ovsdb/row.h \
ovsdb/query.h \
ovsdb/row.c \
ovsdb/row.h \
+ ovsdb/server.c \
+ ovsdb/server.h \
ovsdb/table.c \
ovsdb/table.h \
ovsdb/trigger.c \
ovsdb/trigger.h \
ovsdb/transaction.c \
ovsdb/transaction.h
ovsdb/table.c \
ovsdb/table.h \
ovsdb/trigger.c \
ovsdb/trigger.h \
ovsdb/transaction.c \
ovsdb/transaction.h
-EXTRA_DIST += \
+ovsdb_libovsdb_la_CFLAGS = $(AM_CFLAGS)
+ovsdb_libovsdb_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+MAN_FRAGMENTS += \
ovsdb/remote-active.man \
ovsdb/remote-passive.man
# ovsdb-tool
bin_PROGRAMS += ovsdb/ovsdb-tool
ovsdb_ovsdb_tool_SOURCES = ovsdb/ovsdb-tool.c
ovsdb/remote-active.man \
ovsdb/remote-passive.man
# ovsdb-tool
bin_PROGRAMS += ovsdb/ovsdb-tool
ovsdb_ovsdb_tool_SOURCES = ovsdb/ovsdb-tool.c
-ovsdb_ovsdb_tool_LDADD = ovsdb/libovsdb.
a lib/libopenvswitch.a
+ovsdb_ovsdb_tool_LDADD = ovsdb/libovsdb.
la lib/libopenvswitch.la $(SSL_LIBS)
# ovsdb-tool.1
man_MANS += ovsdb/ovsdb-tool.1
DISTCLEANFILES += ovsdb/ovsdb-tool.1
# ovsdb-tool.1
man_MANS += ovsdb/ovsdb-tool.1
DISTCLEANFILES += ovsdb/ovsdb-tool.1
-
EXTRA_DIST
+= ovsdb/ovsdb-tool.1.in
+
MAN_ROOTS
+= ovsdb/ovsdb-tool.1.in
# ovsdb-client
bin_PROGRAMS += ovsdb/ovsdb-client
ovsdb_ovsdb_client_SOURCES = ovsdb/ovsdb-client.c
# ovsdb-client
bin_PROGRAMS += ovsdb/ovsdb-client
ovsdb_ovsdb_client_SOURCES = ovsdb/ovsdb-client.c
-ovsdb_ovsdb_client_LDADD = ovsdb/libovsdb.
a lib/libopenvswitch.
a $(SSL_LIBS)
+ovsdb_ovsdb_client_LDADD = ovsdb/libovsdb.
la lib/libopenvswitch.l
a $(SSL_LIBS)
# ovsdb-client.1
man_MANS += ovsdb/ovsdb-client.1
DISTCLEANFILES += ovsdb/ovsdb-client.1
# ovsdb-client.1
man_MANS += ovsdb/ovsdb-client.1
DISTCLEANFILES += ovsdb/ovsdb-client.1
-
EXTRA_DIST
+= ovsdb/ovsdb-client.1.in
+
MAN_ROOTS
+= ovsdb/ovsdb-client.1.in
# ovsdb-server
sbin_PROGRAMS += ovsdb/ovsdb-server
ovsdb_ovsdb_server_SOURCES = ovsdb/ovsdb-server.c
# ovsdb-server
sbin_PROGRAMS += ovsdb/ovsdb-server
ovsdb_ovsdb_server_SOURCES = ovsdb/ovsdb-server.c
-ovsdb_ovsdb_server_LDADD = ovsdb/libovsdb.
a lib/libopenvswitch.
a $(SSL_LIBS)
+ovsdb_ovsdb_server_LDADD = ovsdb/libovsdb.
la lib/libopenvswitch.l
a $(SSL_LIBS)
# ovsdb-server.1
man_MANS += ovsdb/ovsdb-server.1
DISTCLEANFILES += ovsdb/ovsdb-server.1
# ovsdb-server.1
man_MANS += ovsdb/ovsdb-server.1
DISTCLEANFILES += ovsdb/ovsdb-server.1
-
EXTRA_DIST
+= ovsdb/ovsdb-server.1.in
+
MAN_ROOTS
+= ovsdb/ovsdb-server.1.in
# ovsdb-idlc
# ovsdb-idlc
-EXTRA_DIST += ovsdb/SPECS
-noinst_SCRIPTS += ovsdb/ovsdb-idlc
-EXTRA_DIST += \
- ovsdb/ovsdb-idlc.in \
- ovsdb/ovsdb-idlc.1
+EXTRA_DIST += ovsdb/SPECS
+noinst_SCRIPTS += ovsdb/ovsdb-idlc
+EXTRA_DIST += ovsdb/ovsdb-idlc.in
+MAN_ROOTS += ovsdb/ovsdb-idlc.1
DISTCLEANFILES += ovsdb/ovsdb-idlc
DISTCLEANFILES += ovsdb/ovsdb-idlc
-SUFFIXES += .ovsidl
+SUFFIXES += .ovsidl
.ovsschema
OVSDB_IDLC = $(run_python) $(srcdir)/ovsdb/ovsdb-idlc.in
.ovsidl.c:
$(OVSDB_IDLC) c-idl-source $< > $@.tmp
OVSDB_IDLC = $(run_python) $(srcdir)/ovsdb/ovsdb-idlc.in
.ovsidl.c:
$(OVSDB_IDLC) c-idl-source $< > $@.tmp
@@
-88,10
+93,8
@@
BUILT_SOURCES += $(OVSIDL_BUILT)
$(OVSIDL_BUILT): ovsdb/ovsdb-idlc.in
# ovsdb-doc
$(OVSIDL_BUILT): ovsdb/ovsdb-idlc.in
# ovsdb-doc
-EXTRA_DIST += ovsdb/ovsdb-doc.in
-noinst_SCRIPTS += ovsdb/ovsdb-doc
-DISTCLEANFILES += ovsdb/ovsdb-doc
-OVSDB_DOC = $(run_python) $(srcdir)/ovsdb/ovsdb-doc.in
+EXTRA_DIST += ovsdb/ovsdb-doc
+OVSDB_DOC = $(run_python) $(srcdir)/ovsdb/ovsdb-doc
# ovsdb-dot
EXTRA_DIST += ovsdb/ovsdb-dot.in ovsdb/dot2pic
# ovsdb-dot
EXTRA_DIST += ovsdb/ovsdb-dot.in ovsdb/dot2pic