Delete local copy of simplejson.

[sliver-openvswitch.git] / ovsdb / automake.mk

diff --git a/ovsdb/automake.mk b/ovsdb/automake.mk
index 1596a4b..704e452 100644 (file)
--- a/ovsdb/automake.mk
+++ b/ovsdb/automake.mk
@@ -59,44 +59,44 @@ DISTCLEANFILES += ovsdb/ovsdb-server.1
 EXTRA_DIST += ovsdb/ovsdb-server.1.in
 
 # ovsdb-idlc
-EXTRA_DIST += \
-       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/SPECS 
+noinst_SCRIPTS += ovsdb/ovsdb-idlc 
 EXTRA_DIST += \
        ovsdb/ovsdb-idlc.in \
        ovsdb/ovsdb-idlc.1
 DISTCLEANFILES += ovsdb/ovsdb-idlc
-SUFFIXES += .ovsidl .txt
+SUFFIXES += .ovsidl
+OVSDB_IDLC = $(run_python) $(srcdir)/ovsdb/ovsdb-idlc.in
 .ovsidl.c:
-       $(PYTHON) $(srcdir)/ovsdb/ovsdb-idlc.in c-idl-source $< > $@.tmp
+       $(OVSDB_IDLC) c-idl-source $< > $@.tmp
        mv $@.tmp $@
 .ovsidl.h:
-       $(PYTHON) $(srcdir)/ovsdb/ovsdb-idlc.in c-idl-header $< > $@.tmp
-       mv $@.tmp $@
-.ovsidl.ovsschema:
-       $(PYTHON) $(srcdir)/ovsdb/ovsdb-idlc.in ovsdb-schema $< > $@.tmp
-       mv $@.tmp $@
-.ovsidl.txt:
-       $(PYTHON) $(srcdir)/ovsdb/ovsdb-idlc.in doc $< | fmt -s > $@.tmp
+       $(OVSDB_IDLC) c-idl-header $< > $@.tmp
        mv $@.tmp $@
+
+EXTRA_DIST += $(OVSIDL_BUILT)
+BUILT_SOURCES += $(OVSIDL_BUILT)
+
+# This must be done late: macros in targets are expanded when the
+# target line is read, so if this file were to be included before some
+# other file that added to OVSIDL_BUILT, then those files wouldn't get
+# the dependency.
+#
+# However, current versions of Automake seem to output all variable
+# assignments before any targets, so it doesn't seem to be a problem,
+# at least for now.
+$(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
+
+# ovsdb-dot
+EXTRA_DIST += ovsdb/ovsdb-dot.in
+noinst_SCRIPTS += ovsdb/ovsdb-dot
+DISTCLEANFILES += ovsdb/ovsdb-dot
+OVSDB_DOT = $(run_python) $(srcdir)/ovsdb/ovsdb-dot.in
+
+include ovsdb/ovsdbmonitor/automake.mk