diff options
| author | Terry Wilson <twilson@redhat.com> | 2016-07-12 16:37:34 -0500 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2016-07-22 17:09:17 -0700 |
| commit | ee89ea7b477bb4fd05137de03b2e8443807ed9f4 (patch) | |
| tree | c67229de600aa075cc7326419b50e76a8eecb032 /include/openvswitch/automake.mk | |
| parent | ab39371d68842b7e4000cc5d8718e6fc04e92795 (diff) | |
| download | openvswitch-ee89ea7b477bb4fd05137de03b2e8443807ed9f4.tar.gz | |
json: Move from lib to include/openvswitch.
To easily allow both in- and out-of-tree building of the Python
wrapper for the OVS JSON parser (e.g. w/ pip), move json.h to
include/openvswitch. This also requires moving lib/{hmap,shash}.h.
Both hmap.h and shash.h were #include-ing "util.h" even though the
headers themselves did not use anything from there, but rather from
include/openvswitch/util.h. Fixing that required including util.h
in several C files mostly due to OVS_NOT_REACHED and things like
xmalloc.
Signed-off-by: Terry Wilson <twilson@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'include/openvswitch/automake.mk')
| -rw-r--r-- | include/openvswitch/automake.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk index d8541dc84..c0e276f9d 100644 --- a/include/openvswitch/automake.mk +++ b/include/openvswitch/automake.mk @@ -2,8 +2,10 @@ openvswitchincludedir = $(includedir)/openvswitch openvswitchinclude_HEADERS = \ include/openvswitch/compiler.h \ include/openvswitch/dynamic-string.h \ + include/openvswitch/hmap.h \ include/openvswitch/flow.h \ include/openvswitch/geneve.h \ + include/openvswitch/json.h \ include/openvswitch/list.h \ include/openvswitch/netdev.h \ include/openvswitch/match.h \ @@ -17,6 +19,7 @@ openvswitchinclude_HEADERS = \ include/openvswitch/ofp-prop.h \ include/openvswitch/ofp-util.h \ include/openvswitch/packets.h \ + include/openvswitch/shash.h \ include/openvswitch/thread.h \ include/openvswitch/token-bucket.h \ include/openvswitch/tun-metadata.h \ |