projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovsdb/jsonrpc-server: ovsdb-server closes accepted connections immediately.
[openvswitch]
/
lib
/
automake.mk
diff --git
a/lib/automake.mk
b/lib/automake.mk
index 5223423f5c1cc8d16d0c3159d6bc4a01072ae73c..d5927d69d2e7bf371f61a8951de2859ecaea880c 100644
(file)
--- a/
lib/automake.mk
+++ b/
lib/automake.mk
@@
-79,6
+79,8
@@
lib_libopenvswitch_a_SOURCES = \
lib/lockfile.h \
lib/mac-learning.c \
lib/mac-learning.h \
lib/lockfile.h \
lib/mac-learning.c \
lib/mac-learning.h \
+ lib/match.c \
+ lib/match.h \
lib/memory.c \
lib/memory.h \
lib/meta-flow.c \
lib/memory.c \
lib/memory.h \
lib/meta-flow.c \
@@
-100,6
+102,8
@@
lib_libopenvswitch_a_SOURCES = \
lib/ofp-actions.h \
lib/ofp-errors.c \
lib/ofp-errors.h \
lib/ofp-actions.h \
lib/ofp-errors.c \
lib/ofp-errors.h \
+ lib/ofp-msgs.c \
+ lib/ofp-msgs.h \
lib/ofp-parse.c \
lib/ofp-parse.h \
lib/ofp-print.c \
lib/ofp-parse.c \
lib/ofp-parse.h \
lib/ofp-print.c \
@@
-296,14
+300,16
@@
MAN_FRAGMENTS += \
# vswitch IDL
OVSIDL_BUILT += \
# vswitch IDL
OVSIDL_BUILT += \
- lib/vswitch-idl.c \
- lib/vswitch-idl.h \
- lib/vswitch-idl.ovsidl
+
$(srcdir)/
lib/vswitch-idl.c \
+
$(srcdir)/
lib/vswitch-idl.h \
+
$(srcdir)/
lib/vswitch-idl.ovsidl
-EXTRA_DIST += lib/vswitch-idl.ann
-VSWITCH_IDL_FILES = vswitchd/vswitch.ovsschema lib/vswitch-idl.ann
-lib/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES)
- $(OVSDB_IDLC) -C $(srcdir) annotate $(VSWITCH_IDL_FILES) > $@.tmp
+EXTRA_DIST += $(srcdir)/lib/vswitch-idl.ann
+VSWITCH_IDL_FILES = \
+ $(srcdir)/vswitchd/vswitch.ovsschema \
+ $(srcdir)/lib/vswitch-idl.ann
+$(srcdir)/lib/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES)
+ $(OVSDB_IDLC) annotate $(VSWITCH_IDL_FILES) > $@.tmp
mv $@.tmp $@
lib/dirs.c: lib/dirs.c.in Makefile
mv $@.tmp $@
lib/dirs.c: lib/dirs.c.in Makefile
@@
-311,6
+317,7
@@
lib/dirs.c: lib/dirs.c.in Makefile
-e 's,[@]srcdir[@],$(srcdir),g' \
-e 's,[@]LOGDIR[@],"$(LOGDIR)",g' \
-e 's,[@]RUNDIR[@],"$(RUNDIR)",g' \
-e 's,[@]srcdir[@],$(srcdir),g' \
-e 's,[@]LOGDIR[@],"$(LOGDIR)",g' \
-e 's,[@]RUNDIR[@],"$(RUNDIR)",g' \
+ -e 's,[@]DBDIR[@],"$(DBDIR)",g' \
-e 's,[@]bindir[@],"$(bindir)",g' \
-e 's,[@]sysconfdir[@],"$(sysconfdir)",g' \
-e 's,[@]pkgdatadir[@],"$(pkgdatadir)",g') \
-e 's,[@]bindir[@],"$(bindir)",g' \
-e 's,[@]sysconfdir[@],"$(sysconfdir)",g' \
-e 's,[@]pkgdatadir[@],"$(pkgdatadir)",g') \
@@
-324,11
+331,19
@@
$(srcdir)/lib/ofp-errors.inc: \
$(srcdir)/lib/ofp-errors.c: $(srcdir)/lib/ofp-errors.inc
EXTRA_DIST += build-aux/extract-ofp-errors lib/ofp-errors.inc
$(srcdir)/lib/ofp-errors.c: $(srcdir)/lib/ofp-errors.inc
EXTRA_DIST += build-aux/extract-ofp-errors lib/ofp-errors.inc
+$(srcdir)/lib/ofp-msgs.inc: \
+ lib/ofp-msgs.h $(srcdir)/build-aux/extract-ofp-msgs
+ $(run_python) $(srcdir)/build-aux/extract-ofp-msgs \
+ $(srcdir)/lib/ofp-msgs.h $@ > $@.tmp && mv $@.tmp $@
+$(srcdir)/lib/ofp-msgs.c: $(srcdir)/lib/ofp-msgs.inc
+EXTRA_DIST += build-aux/extract-ofp-msgs lib/ofp-msgs.inc
+
INSTALL_DATA_LOCAL += lib-install-data-local
lib-install-data-local:
$(MKDIR_P) $(DESTDIR)$(RUNDIR)
$(MKDIR_P) $(DESTDIR)$(PKIDIR)
$(MKDIR_P) $(DESTDIR)$(LOGDIR)
INSTALL_DATA_LOCAL += lib-install-data-local
lib-install-data-local:
$(MKDIR_P) $(DESTDIR)$(RUNDIR)
$(MKDIR_P) $(DESTDIR)$(PKIDIR)
$(MKDIR_P) $(DESTDIR)$(LOGDIR)
+ $(MKDIR_P) $(DESTDIR)$(DBDIR)
if !USE_LINKER_SECTIONS
# All distributed sources, with names adjust properly for referencing
if !USE_LINKER_SECTIONS
# All distributed sources, with names adjust properly for referencing