xenserver: Improve readability of /etc/init.d scripts.

[openvswitch] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f1de10f05f497cb39d43d802a6cb931c2991b6ab..1b49456bc87cc87d79e9c105215528d313c1b7ca 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,14 @@
+# Copyright (C) 2007, 2008, 2009 Nicira Networks, Inc.
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without warranty of any kind.
+
 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)
@@ -20,9 +26,11 @@ endif
 
 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 =
@@ -50,7 +58,7 @@ SUFFIXES = .in
                 -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
@@ -58,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