X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=de51e10f779794af0c9faa0af389e8fdb41d2bc7;hb=c65cb7ab93594f6e3f27fd077365ba41782bfa46;hp=18dbb53db7e12c78e6e09792e6a9555f2cbbb252;hpb=8cd4882fd5c3080816a070ad582ef06842f7c482;p=sliver-openvswitch.git

diff --git a/Makefile.am b/Makefile.am
index 18dbb53db..de51e10f7 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)
@@ -17,6 +16,7 @@ AM_CPPFLAGS += -I $(top_srcdir)/include
 AM_CPPFLAGS += -I $(top_srcdir)/lib
 
 AM_CFLAGS = -Wstrict-prototypes
+AM_CFLAGS += $(WARNING_FLAGS)
 
 if NDEBUG
 AM_CPPFLAGS += -DNDEBUG
@@ -27,9 +27,12 @@ endif
 
 CLEANFILES =
 DISTCLEANFILES =
-EXTRA_DIST = INSTALL.Linux INSTALL.XenServer INSTALL.SSL
-TESTS =
-TESTS_ENVIRONMENT =
+EXTRA_DIST = INSTALL.bridge \
+	INSTALL.Linux \
+	INSTALL.userspace \
+	INSTALL.OpenFlow \
+	INSTALL.SSL \
+	INSTALL.XenServer 
 bin_PROGRAMS =
 sbin_PROGRAMS =
 bin_SCRIPTS =
@@ -50,11 +53,22 @@ ro_c = echo '/* -*- mode: c; buffer-read-only: t -*- */'
 SUFFIXES = .in
 .in:
 	$(PERL) $(srcdir)/soexpand.pl -I$(srcdir) < $< | \
-	    sed -e 's,[@]LOGDIR[@],$(LOGDIR),g' \
+	    sed \
 		-e 's,[@]PKIDIR[@],$(PKIDIR),g' \
+                -e 's,[@]LOGDIR[@],$(LOGDIR),g' \
+                -e 's,[@]PERL[@],$(PERL),g' \
+                -e 's,[@]PYTHON[@],$(PYTHON),g' \
                 -e 's,[@]RUNDIR[@],$(RUNDIR),g' \
+                -e 's,[@]VERSION[@],$(VERSION),g' \
+                -e 's,[@]localstatedir[@],$(localstatedir),g' \
                 -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
-                -e 's,[@]PERL[@],$(PERL),g' > $@
+                -e 's,[@]sysconfdir[@],$(sysconfdir),g' \
+            > $@.tmp
+	@if head -n 1 $@.tmp | grep -q '#!'; then \
+	    echo chmod +x $@.tmp; \
+	    chmod +x $@.tmp; \
+	fi
+	mv $@.tmp $@
 
 include lib/automake.mk
 include ofproto/automake.mk
@@ -65,9 +79,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