X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ovsdb%2Fautomake.mk;h=d2e3f9ad920974ee6cec50a30182f21330d85e3f;hb=3444fdfb453d3593914cf1e18f9ac2f8b036e986;hp=5b46e168e9bded0f5f1b312da73e008c692803c1;hpb=991559357f6a03c3a5b70c053c8c2554aa8d5ee4;p=sliver-openvswitch.git

diff --git a/ovsdb/automake.mk b/ovsdb/automake.mk
index 5b46e168e..d2e3f9ad9 100644
--- a/ovsdb/automake.mk
+++ b/ovsdb/automake.mk
@@ -21,24 +21,26 @@ ovsdb_libovsdb_a_SOURCES = \
 	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
-EXTRA_DIST += \
+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_ovsdb_tool_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a
+ovsdb_ovsdb_tool_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a $(SSL_LIBS)
 # 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
@@ -47,7 +49,7 @@ ovsdb_ovsdb_client_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a $(SSL_LIBS)
 # 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
@@ -56,39 +58,15 @@ ovsdb_ovsdb_server_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a $(SSL_LIBS)
 # 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
-EXTRA_DIST += \
-	ovsdb/SPECS \
-	ovsdb/simplejson/__init__.py \
-	ovsdb/simplejson/_speedups.c				\
-	ovsdb/simplejson/decoder.py				\
-	ovsdb/simplejson/encoder.py				\
-	ovsdb/simplejson/scanner.py				\
-	ovsdb/simplejson/tests/__init__.py			\
-	ovsdb/simplejson/tests/test_check_circular.py		\
-	ovsdb/simplejson/tests/test_decode.py			\
-	ovsdb/simplejson/tests/test_default.py			\
-	ovsdb/simplejson/tests/test_dump.py			\
-	ovsdb/simplejson/tests/test_encode_basestring_ascii.py	\
-	ovsdb/simplejson/tests/test_fail.py			\
-	ovsdb/simplejson/tests/test_float.py			\
-	ovsdb/simplejson/tests/test_indent.py			\
-	ovsdb/simplejson/tests/test_pass1.py			\
-	ovsdb/simplejson/tests/test_pass2.py			\
-	ovsdb/simplejson/tests/test_pass3.py			\
-	ovsdb/simplejson/tests/test_recursion.py		\
-	ovsdb/simplejson/tests/test_scanstring.py		\
-	ovsdb/simplejson/tests/test_separators.py		\
-	ovsdb/simplejson/tests/test_unicode.py			\
-	ovsdb/simplejson/tool.py
-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
-SUFFIXES += .ovsidl
+SUFFIXES += .ovsidl .ovsschema
 OVSDB_IDLC = $(run_python) $(srcdir)/ovsdb/ovsdb-idlc.in
 .ovsidl.c:
 	$(OVSDB_IDLC) c-idl-source $< > $@.tmp
@@ -117,7 +95,7 @@ DISTCLEANFILES += ovsdb/ovsdb-doc
 OVSDB_DOC = $(run_python) $(srcdir)/ovsdb/ovsdb-doc.in
 
 # ovsdb-dot
-EXTRA_DIST += ovsdb/ovsdb-dot.in
+EXTRA_DIST += ovsdb/ovsdb-dot.in ovsdb/dot2pic
 noinst_SCRIPTS += ovsdb/ovsdb-dot
 DISTCLEANFILES += ovsdb/ovsdb-dot
 OVSDB_DOT = $(run_python) $(srcdir)/ovsdb/ovsdb-dot.in