X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=1b49456bc87cc87d79e9c105215528d313c1b7ca;hb=a320b3413d239aaf8cad506ffc6d72c93b6591b2;hp=1b40cdea9a3275ebff37603b2da86ec367fb220c;hpb=a5e54d9b6f8002f34cc792df69e6eda68cf95223;p=openvswitch

diff --git a/Makefile.am b/Makefile.am
index 1b40cdea..1b49456b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,6 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = datapath
 
-if ENABLE_USERSPACE
 AM_CPPFLAGS = $(SSL_CFLAGS)
 AM_CPPFLAGS += $(NCURSES_CFLAGS)
 AM_CPPFLAGS += $(PCRE_CFLAGS)
@@ -32,8 +31,6 @@ EXTRA_DIST = INSTALL.bridge \
 	INSTALL.OpenFlow \
 	INSTALL.SSL \
 	INSTALL.XenServer 
-TESTS =
-TESTS_ENVIRONMENT =
 bin_PROGRAMS =
 sbin_PROGRAMS =
 bin_SCRIPTS =
@@ -69,9 +66,4 @@ include third-party/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
-endif
-endif
-endif # ENABLE_USERSPACE