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
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
lib
/
automake.mk
diff --git
a/lib/automake.mk
b/lib/automake.mk
index
fce8423
..
4d7c1c6
100644
(file)
--- a/
lib/automake.mk
+++ b/
lib/automake.mk
@@
-58,6
+58,8
@@
lib_libopenvswitch_a_SOURCES = \
lib/fatal-signal.h \
lib/flow.c \
lib/flow.h \
lib/fatal-signal.h \
lib/flow.c \
lib/flow.h \
+ lib/guarded-list.c \
+ lib/guarded-list.h \
lib/hash.c \
lib/hash.h \
lib/hindex.c \
lib/hash.c \
lib/hash.h \
lib/hindex.c \
@@
-199,6
+201,8
@@
lib_libopenvswitch_a_SOURCES = \
lib/svec.h \
lib/table.c \
lib/table.h \
lib/svec.h \
lib/table.c \
lib/table.h \
+ lib/tag.c \
+ lib/tag.h \
lib/timer.c \
lib/timer.h \
lib/timeval.c \
lib/timer.c \
lib/timer.h \
lib/timeval.c \
@@
-229,7
+233,9
@@
lib_libopenvswitch_a_SOURCES = \
lib/vlog.c \
lib/vlog.h \
lib/vswitch-idl.c \
lib/vlog.c \
lib/vlog.h \
lib/vswitch-idl.c \
- lib/vswitch-idl.h
+ lib/vswitch-idl.h \
+ lib/vtep-idl.c \
+ lib/vtep-idl.h
nodist_lib_libopenvswitch_a_SOURCES = \
lib/dirs.c
nodist_lib_libopenvswitch_a_SOURCES = \
lib/dirs.c
@@
-334,7
+340,10
@@
MAN_FRAGMENTS += \
OVSIDL_BUILT += \
$(srcdir)/lib/vswitch-idl.c \
$(srcdir)/lib/vswitch-idl.h \
OVSIDL_BUILT += \
$(srcdir)/lib/vswitch-idl.c \
$(srcdir)/lib/vswitch-idl.h \
- $(srcdir)/lib/vswitch-idl.ovsidl
+ $(srcdir)/lib/vswitch-idl.ovsidl \
+ $(srcdir)/lib/vtep-idl.c \
+ $(srcdir)/lib/vtep-idl.h \
+ $(srcdir)/lib/vtep-idl.ovsidl
EXTRA_DIST += $(srcdir)/lib/vswitch-idl.ann
VSWITCH_IDL_FILES = \
EXTRA_DIST += $(srcdir)/lib/vswitch-idl.ann
VSWITCH_IDL_FILES = \
@@
-344,6
+353,14
@@
$(srcdir)/lib/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES)
$(OVSDB_IDLC) annotate $(VSWITCH_IDL_FILES) > $@.tmp
mv $@.tmp $@
$(OVSDB_IDLC) annotate $(VSWITCH_IDL_FILES) > $@.tmp
mv $@.tmp $@
+EXTRA_DIST += $(srcdir)/lib/vtep-idl.ann
+VTEP_IDL_FILES = \
+ $(srcdir)/vtep/vtep.ovsschema \
+ $(srcdir)/lib/vtep-idl.ann
+$(srcdir)/lib/vtep-idl.ovsidl: $(VTEP_IDL_FILES)
+ $(OVSDB_IDLC) annotate $(VTEP_IDL_FILES) > $@.tmp
+ mv $@.tmp $@
+
lib/dirs.c: lib/dirs.c.in Makefile
($(ro_c) && sed < $(srcdir)/lib/dirs.c.in \
-e 's,[@]srcdir[@],$(srcdir),g' \
lib/dirs.c: lib/dirs.c.in Makefile
($(ro_c) && sed < $(srcdir)/lib/dirs.c.in \
-e 's,[@]srcdir[@],$(srcdir),g' \