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
targets shownodes and showslice
[sliver-openvswitch.git]
/
vswitchd
/
automake.mk
diff --git
a/vswitchd/automake.mk
b/vswitchd/automake.mk
index
1df5dff
..
9092129
100644
(file)
--- a/
vswitchd/automake.mk
+++ b/
vswitchd/automake.mk
@@
-1,7
+1,8
@@
sbin_PROGRAMS += vswitchd/ovs-vswitchd
sbin_PROGRAMS += vswitchd/ovs-vswitchd
-man_MANS += \
- vswitchd/ovs-vswitchd.8 \
- vswitchd/ovs-brcompatd.8
+man_MANS += vswitchd/ovs-vswitchd.8
+if BUILD_BRCOMPAT
+ man_MANS += vswitchd/ovs-brcompatd.8
+endif
DISTCLEANFILES += \
vswitchd/ovs-vswitchd.8 \
vswitchd/ovs-brcompatd.8
DISTCLEANFILES += \
vswitchd/ovs-vswitchd.8 \
vswitchd/ovs-brcompatd.8
@@
-12,8
+13,6
@@
vswitchd_ovs_vswitchd_SOURCES = \
vswitchd/ovs-vswitchd.c \
vswitchd/system-stats.c \
vswitchd/system-stats.h \
vswitchd/ovs-vswitchd.c \
vswitchd/system-stats.c \
vswitchd/system-stats.h \
- vswitchd/vswitch-idl.c \
- vswitchd/vswitch-idl.h \
vswitchd/xenserver.c \
vswitchd/xenserver.h
vswitchd_ovs_vswitchd_LDADD = \
vswitchd/xenserver.c \
vswitchd/xenserver.h
vswitchd_ovs_vswitchd_LDADD = \
@@
-21,31
+20,22
@@
vswitchd_ovs_vswitchd_LDADD = \
lib/libsflow.a \
lib/libopenvswitch.a \
$(SSL_LIBS)
lib/libsflow.a \
lib/libopenvswitch.a \
$(SSL_LIBS)
-EXTRA_DIST += \
- vswitchd/ovs-vswitchd.8.in \
- vswitchd/INTERNALS
+EXTRA_DIST += vswitchd/INTERNALS
+MAN_ROOTS += vswitchd/ovs-vswitchd.8.in
+if BUILD_BRCOMPAT
if HAVE_NETLINK
sbin_PROGRAMS += vswitchd/ovs-brcompatd
vswitchd_ovs_brcompatd_SOURCES = \
if HAVE_NETLINK
sbin_PROGRAMS += vswitchd/ovs-brcompatd
vswitchd_ovs_brcompatd_SOURCES = \
- vswitchd/ovs-brcompatd.c \
- vswitchd/vswitch-idl.c \
- vswitchd/vswitch-idl.h
+ vswitchd/ovs-brcompatd.c
vswitchd_ovs_brcompatd_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
endif
vswitchd_ovs_brcompatd_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
endif
-EXTRA_DIST += vswitchd/ovs-brcompatd.8.in
+MAN_ROOTS += vswitchd/ovs-brcompatd.8.in
+endif
# vswitch schema and IDL
# vswitch schema and IDL
-OVSIDL_BUILT += \
- vswitchd/vswitch-idl.c \
- vswitchd/vswitch-idl.h \
- vswitchd/vswitch-idl.ovsidl
-VSWITCH_IDL_FILES = vswitchd/vswitch.ovsschema vswitchd/vswitch-idl.ann
-EXTRA_DIST += $(VSWITCH_IDL_FILES)
+EXTRA_DIST += vswitchd/vswitch.ovsschema
pkgdata_DATA += vswitchd/vswitch.ovsschema
pkgdata_DATA += vswitchd/vswitch.ovsschema
-vswitchd/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES)
- $(OVSDB_IDLC) -C $(srcdir) annotate $(VSWITCH_IDL_FILES) > $@.tmp
- mv $@.tmp $@
# vswitch E-R diagram
#
# vswitch E-R diagram
#
@@
-82,7
+72,7
@@
EXTRA_DIST += vswitchd/vswitch.gv vswitchd/vswitch.pic
# vswitch schema documentation
EXTRA_DIST += vswitchd/vswitch.xml
dist_man_MANS += vswitchd/ovs-vswitchd.conf.db.5
# vswitch schema documentation
EXTRA_DIST += vswitchd/vswitch.xml
dist_man_MANS += vswitchd/ovs-vswitchd.conf.db.5
-vswitchd/ovs-vswitchd.conf.db.5: \
+
$(srcdir)/
vswitchd/ovs-vswitchd.conf.db.5: \
ovsdb/ovsdb-doc.in vswitchd/vswitch.xml vswitchd/vswitch.ovsschema \
$(srcdir)/vswitchd/vswitch.pic
$(OVSDB_DOC) \
ovsdb/ovsdb-doc.in vswitchd/vswitch.xml vswitchd/vswitch.ovsschema \
$(srcdir)/vswitchd/vswitch.pic
$(OVSDB_DOC) \
@@
-105,3
+95,7
@@
vswitchd/vswitch.ovsschema.stamp: vswitchd/vswitch.ovsschema
exit 1; \
fi
CLEANFILES += vswitchd/vswitch.ovsschema.stamp
exit 1; \
fi
CLEANFILES += vswitchd/vswitch.ovsschema.stamp
+
+# Clean up generated files from older OVS versions. (This is important so that
+# #include "vswitch-idl.h" doesn't get the wrong copy.)
+CLEANFILES += vswitchd/vswitch-idl.c vswitchd/vswitch-idl.h