projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netdev: Change netdev_get_etheraddr() to return an error code.
[openvswitch]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 59ffc1939d3575cb565de2fa44e05e06284a1b49..1b49456bc87cc87d79e9c105215528d313c1b7ca 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-9,7
+9,6
@@
AUTOMAKE_OPTIONS = foreign subdir-objects
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = datapath
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = datapath
-if ENABLE_USERSPACE
AM_CPPFLAGS = $(SSL_CFLAGS)
AM_CPPFLAGS += $(NCURSES_CFLAGS)
AM_CPPFLAGS += $(PCRE_CFLAGS)
AM_CPPFLAGS = $(SSL_CFLAGS)
AM_CPPFLAGS += $(NCURSES_CFLAGS)
AM_CPPFLAGS += $(PCRE_CFLAGS)
@@
-27,9
+26,11
@@
endif
CLEANFILES =
DISTCLEANFILES =
CLEANFILES =
DISTCLEANFILES =
-EXTRA_DIST = INSTALL.Linux INSTALL.XenServer INSTALL.SSL
-TESTS =
-TESTS_ENVIRONMENT =
+EXTRA_DIST = INSTALL.bridge \
+ INSTALL.Linux \
+ INSTALL.OpenFlow \
+ INSTALL.SSL \
+ INSTALL.XenServer
bin_PROGRAMS =
sbin_PROGRAMS =
bin_SCRIPTS =
bin_PROGRAMS =
sbin_PROGRAMS =
bin_SCRIPTS =
@@
-57,7
+58,7
@@
SUFFIXES = .in
-e 's,[@]PERL[@],$(PERL),g' > $@
include lib/automake.mk
-e 's,[@]PERL[@],$(PERL),g' > $@
include lib/automake.mk
-include
secchan
/automake.mk
+include
ofproto
/automake.mk
include utilities/automake.mk
include tests/automake.mk
include include/automake.mk
include utilities/automake.mk
include tests/automake.mk
include include/automake.mk
@@
-65,9
+66,4
@@
include third-party/automake.mk
include debian/automake.mk
include vswitchd/automake.mk
include xenserver/automake.mk
include debian/automake.mk
include vswitchd/automake.mk
include xenserver/automake.mk
-if HAVE_CURSES
-if HAVE_PCRE
include extras/ezio/automake.mk
include extras/ezio/automake.mk
-endif
-endif
-endif # ENABLE_USERSPACE