X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=de51e10f779794af0c9faa0af389e8fdb41d2bc7;hb=0a9126739bc5cd60d3666f4bd574217545001b06;hp=9413ce59ed167dcda13cfef5995758aa478571f0;hpb=31a7c9e7766fed8e72b873850f3798801e442401;p=openvswitch

diff --git a/Makefile.am b/Makefile.am
index 9413ce59..de51e10f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,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
@@ -28,6 +29,7 @@ CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST = INSTALL.bridge \
 	INSTALL.Linux \
+	INSTALL.userspace \
 	INSTALL.OpenFlow \
 	INSTALL.SSL \
 	INSTALL.XenServer 
@@ -51,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
@@ -66,8 +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