X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=da371d85afbb89d286461893204fcbd2243e44f7;hb=7685b7a9e5b3f6db6832e52e111000ff36d3acb4;hp=32775ccc04340e4424d9e3ea571ccebb026ddf4a;hpb=be09aa10c5c244726f203eb7637fc86c87cc3841;p=sliver-openvswitch.git

diff --git a/Makefile.am b/Makefile.am
index 32775ccc0..da371d85a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,11 +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
@@ -70,8 +73,6 @@ EXTRA_DIST = \
 	NOTICE \
 	OPENFLOW-1.1+ \
 	PORTING \
-	README-OFTest \
-	README-gcov \
 	README-lisp \
 	REPORTING-BUGS \
 	SubmittingPatches \
@@ -124,6 +125,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' \
@@ -162,10 +164,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) |	    \
-	    LC_ALL=C sort -u > all-distfiles;				    \
-	  (cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' |	    \
-	    LC_ALL=C sort -u > all-gitfiles;				    \
-	  LC_ALL=C 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;					    \
@@ -303,5 +305,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