X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=8e87557859ce849d25d616721e3bd5987b49666c;hb=6d7d2ace1494936d11b8cabcec26c7e4d0fdda68;hp=5069f962eee3ec9b9a01e091336d680a5a47b7f6;hpb=0f3df203a0b81bdf95ac0e0e5a086408cf641dbc;p=sliver-openvswitch.git

diff --git a/Makefile.am b/Makefile.am
index 5069f962e..8e8755785 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -10,6 +10,14 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = datapath
 
 AM_CPPFLAGS = $(SSL_CFLAGS)
+AM_LDFLAGS = $(SSL_LDFLAGS)
+
+if WIN32
+AM_CPPFLAGS += -I $(top_srcdir)/include/windows
+endif
+
+AM_CPPFLAGS += $(SSL_INCLUDES)
+
 AM_CPPFLAGS += -I $(top_srcdir)/include
 AM_CPPFLAGS += -I $(top_srcdir)/lib
 AM_CPPFLAGS += -I $(top_builddir)/lib
@@ -119,6 +127,7 @@ ro_shell = printf '\043 Generated automatically -- do not modify!    -*- buffer-
 
 SUFFIXES += .in
 .in:
+	@mkdir -p $$(dirname $@)
 	$(PERL) $(srcdir)/build-aux/soexpand.pl -I$(srcdir) < $< | \
 	    sed \
 		-e 's,[@]PKIDIR[@],$(PKIDIR),g' \
@@ -134,13 +143,11 @@ SUFFIXES += .in
                 -e 's,[@]bindir[@],$(bindir),g' \
                 -e 's,[@]sbindir[@],$(sbindir),g' \
                 -e 's,[@]abs_top_srcdir[@],$(abs_top_srcdir),g' \
-                -e 's,[@]ovsdbmonitordir[@],$(ovsdbmonitordir),g' \
             > $@.tmp
 	@if head -n 1 $@.tmp | grep '#!' > /dev/null; then \
-	    echo chmod +x $@.tmp; \
 	    chmod +x $@.tmp; \
 	fi
-	mv $@.tmp $@
+	$(AM_V_GEN) mv $@.tmp $@
 
 .PHONY: clean-pycov
 clean-pycov:
@@ -159,10 +166,10 @@ dist-hook-git: distfiles
 	@if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1; then \
 	  (cd datapath && $(MAKE) distfiles);				    \
 	  (cat distfiles; sed 's|^|datapath/|' datapath/distfiles) |	    \
-	    sort -u > all-distfiles;					    \
-	  (cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' |	    \
-	    sort -u > all-gitfiles;					    \
-	  comm -1 -3 all-distfiles all-gitfiles > missing-distfiles;	    \
+	    LC_ALL=C sort -u > all-distfiles;					    \
+	  (cd $(srcdir) && git ls-files) | grep -vFf $(srcdir)/.non-distfiles |	    \
+	    LC_ALL=C sort -u > all-gitfiles;					    \
+	  LC_ALL=C comm -1 -3 all-distfiles all-gitfiles > missing-distfiles;	    \
 	  if test -s missing-distfiles; then				    \
 	    echo "The distribution is missing the following files:";	    \
 	    cat missing-distfiles;					    \
@@ -177,7 +184,8 @@ distfiles: Makefile
 	list='$(DISTFILES)'; \
 	for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t" | sort -u > $@
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t" | \
+          LC_ALL=C sort -u > $@
 CLEANFILES += distfiles
 endif
 .PHONY: dist-hook-git
@@ -257,7 +265,8 @@ manpage-check: $(man_MANS) $(dist_man_MANS) $(noinst_man_MANS)
 		if grep warning: $@.tmp; then error=:; fi; \
 		rm -f $@.tmp; \
 	done; \
-	if $$error; then exit 1; else echo touch $@; touch $@; fi
+	if $$error; then exit 1; else touch $@; fi
+	$(AM_V_GEN) touch -c $@
 CLEANFILES += manpage-check
 endif
 
@@ -298,5 +307,6 @@ include rhel/automake.mk
 include xenserver/automake.mk
 include python/automake.mk
 include python/compat/automake.mk
+include planetlab/automake.mk
 include tutorial/automake.mk
 include vtep/automake.mk