X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ovsdb%2Fautomake.mk;h=3840ffce894f02f3a12639e32ebeb15a56d56252;hb=1bf2c909685893c75f61c63a41928c9ec11c06f1;hp=5745697ae1d865f7cbe3a7d54f2cc8336210e39c;hpb=f8d739a9fa1c1223f0b2c88fd3f0ed47be69bf65;p=sliver-openvswitch.git

diff --git a/ovsdb/automake.mk b/ovsdb/automake.mk
index 5745697ae..3840ffce8 100644
--- a/ovsdb/automake.mk
+++ b/ovsdb/automake.mk
@@ -21,13 +21,15 @@ 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
 
@@ -38,7 +40,7 @@ ovsdb_ovsdb_tool_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a
 # 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,41 +58,16 @@ 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/OVSDB.py \
-	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
-OVSDB_IDLC = $(PYTHON) $(srcdir)/ovsdb/ovsdb-idlc.in
+SUFFIXES += .ovsidl .ovsschema
+OVSDB_IDLC = $(run_python) $(srcdir)/ovsdb/ovsdb-idlc.in
 .ovsidl.c:
 	$(OVSDB_IDLC) c-idl-source $< > $@.tmp
 	mv $@.tmp $@
@@ -115,12 +92,12 @@ $(OVSIDL_BUILT): ovsdb/ovsdb-idlc.in
 EXTRA_DIST += ovsdb/ovsdb-doc.in
 noinst_SCRIPTS += ovsdb/ovsdb-doc
 DISTCLEANFILES += ovsdb/ovsdb-doc
-OVSDB_DOC = $(PYTHON) $(srcdir)/ovsdb/ovsdb-doc.in
+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 = $(PYTHON) $(srcdir)/ovsdb/ovsdb-dot.in
+OVSDB_DOT = $(run_python) $(srcdir)/ovsdb/ovsdb-dot.in
 
 include ovsdb/ovsdbmonitor/automake.mk