X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=Makefile.am;h=77ceec6c0e894193962eddfb6efdd3d2394331aa;hb=429d455615b010cebe9cf1fbcb10b5e20c08c21f;hp=dd0a1117b87c6f380a63a6debc1b3d2d1ba825b4;hpb=8a9562d21a40c765a8ae6775a070cb279cb2147a;p=cascardo%2Fovs.git

diff --git a/Makefile.am b/Makefile.am
index dd0a1117b..77ceec6c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,21 +11,26 @@ SUBDIRS = datapath
 
 AM_CPPFLAGS = $(SSL_CFLAGS)
 AM_LDFLAGS = $(SSL_LDFLAGS)
+AM_LDFLAGS += $(OVS_LDFLAGS)
 
 if WIN32
 AM_CPPFLAGS += -I $(top_srcdir)/include/windows
+AM_CPPFLAGS += -I $(top_srcdir)/datapath-windows/include
 AM_CPPFLAGS += $(PTHREAD_INCLUDES)
+AM_CPPFLAGS += $(MSVC_CFLAGS)
 AM_LDFLAGS += $(PTHREAD_LDFLAGS)
 endif
 
-AM_CPPFLAGS += $(SSL_INCLUDES)
-
 AM_CPPFLAGS += -I $(top_srcdir)/include
+AM_CPPFLAGS += -I $(top_builddir)/include
 AM_CPPFLAGS += -I $(top_srcdir)/lib
 AM_CPPFLAGS += -I $(top_builddir)/lib
 
+AM_CPPFLAGS += $(SSL_INCLUDES)
+
 AM_CFLAGS = -Wstrict-prototypes
 AM_CFLAGS += $(WARNING_FLAGS)
+AM_CFLAGS += $(OVS_CFLAGS)
 
 if NDEBUG
 AM_CPPFLAGS += -DNDEBUG
@@ -57,7 +62,7 @@ CLEAN_LOCAL =
 DISTCLEANFILES =
 PYCOV_CLEAN_FILES = build-aux/check-structs,cover
 EXTRA_DIST = \
-	BUILD.Windows \
+	CONTRIBUTING \
 	CodingStyle \
 	DESIGN \
 	FAQ \
@@ -72,13 +77,18 @@ EXTRA_DIST = \
 	INSTALL.SSL \
 	INSTALL.XenServer \
 	INSTALL.userspace \
+	INSTALL.Windows \
 	IntegrationGuide \
 	NOTICE \
 	OPENFLOW-1.1+ \
 	PORTING \
+	README.md \
 	README-lisp \
 	REPORTING-BUGS \
-	SubmittingPatches \
+	TODO \
+	.travis.yml \
+	.travis/build.sh \
+	.travis/prepare.sh \
 	WHY-OVS \
 	boot.sh \
 	build-aux/cccl \
@@ -128,7 +138,7 @@ ro_shell = printf '\043 Generated automatically -- do not modify!    -*- buffer-
 
 SUFFIXES += .in
 .in:
-	$(PERL) $(srcdir)/build-aux/soexpand.pl -I$(srcdir) < $< | \
+	$(AM_V_GEN)$(PERL) $(srcdir)/build-aux/soexpand.pl -I$(srcdir) < $< | \
 	    sed \
 		-e 's,[@]PKIDIR[@],$(PKIDIR),g' \
                 -e 's,[@]LOGDIR[@],$(LOGDIR),g' \
@@ -147,7 +157,7 @@ SUFFIXES += .in
 	@if head -n 1 $@.tmp | grep '#!' > /dev/null; then \
 	    chmod +x $@.tmp; \
 	fi
-	$(AM_V_GEN) mv $@.tmp $@
+	$(AM_V_at) mv $@.tmp $@
 
 .PHONY: clean-pycov
 clean-pycov:
@@ -196,7 +206,7 @@ config-h-check:
 	@cd $(srcdir); \
 	if test -e .git && (git --version) >/dev/null 2>&1 && \
 	   git --no-pager grep -L '#include <config\.h>' `git ls-files | grep '\.c$$' | \
-               grep -vE '^datapath|^lib/sflow|^third-party'`; \
+               grep -vE '^datapath|^lib/sflow|^third-party|^datapath-windows'`; \
 	then \
 	    echo "See above for list of violations of the rule that"; \
 	    echo "every C source file must #include <config.h>."; \
@@ -207,8 +217,10 @@ config-h-check:
 # Check for printf() type modifiers that MSVC doesn't support.
 ALL_LOCAL += printf-check
 printf-check:
-	@if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \
-	   git --no-pager grep -n -E -e '%[-+ #0-9.*]*([ztj]|hh)' --and --not -e 'ovs_scan' `git ls-files $(srcdir) | grep '\.[ch]$$'`; \
+	@cd $(srcdir); \
+	if test -e .git && (git --version) >/dev/null 2>&1 && \
+	   git --no-pager grep -n -E -e '%[-+ #0-9.*]*([ztj]|hh)' --and --not -e 'ovs_scan' `git ls-files | grep '\.[ch]$$' | \
+               grep -vE '^datapath|^lib/sflow|^third-party'`; \
 	then \
 	    echo "See above for list of violations of the rule that"; \
 	    echo "'z', 't', 'j', 'hh' printf() type modifiers are"; \
@@ -244,10 +256,11 @@ check-assert-h-usage:
 
 ALL_LOCAL += thread-safety-check
 thread-safety-check:
-	@if test -e '$(srcdir)'/.git && (git --version) >/dev/null 2>&1 && \
-	   grep -n -f '$(srcdir)'/build-aux/thread-safety-blacklist \
-	       `git ls-files '$(srcdir)' | grep '\.[ch]$$' \
-                | $(EGREP) -v '^datapath|^lib/sflow|^third-party'` \
+	@cd $(srcdir); \
+	if test -e .git && (git --version) >/dev/null 2>&1 && \
+	   grep -n -f build-aux/thread-safety-blacklist \
+	       `git ls-files | grep '\.[ch]$$' \
+                | $(EGREP) -v '^datapath|^lib/sflow|^third-party'` /dev/null \
 	       | $(EGREP) -v ':[ 	]*/?\*'; \
 	then \
 	    echo "See above for list of calls to functions that are"; \
@@ -281,6 +294,16 @@ $(srcdir)/manpages.mk: $(MAN_ROOTS) build-aux/sodepends.pl
 	fi
 CLEANFILES += manpage-dep-check
 
+if VSTUDIO_DDK
+ALL_LOCAL += ovsext_make
+ovsext_make: datapath-windows/ovsext.sln
+	MSBuild.exe datapath-windows/ovsext.sln /target:Build /property:Configuration="$(VSTUDIO_CONFIG)"
+
+CLEAN_LOCAL += ovsext_clean
+ovsext_clean: datapath-windows/ovsext.sln
+	MSBuild.exe datapath-windows/ovsext.sln /target:Clean /property:Configuration="$(VSTUDIO_CONFIG)"
+endif
+
 dist-hook: $(DIST_HOOKS)
 all-local: $(ALL_LOCAL)
 clean-local: $(CLEAN_LOCAL)
@@ -309,3 +332,5 @@ include python/automake.mk
 include python/compat/automake.mk
 include tutorial/automake.mk
 include vtep/automake.mk
+include datapath-windows/automake.mk
+include datapath-windows/include/automake.mk