X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=Makefile.am;h=3c2ae89aa46d56627143cf56c695ecc9a7fd8149;hb=0b83904fbcec1d33296f9df05b607b61aec63912;hp=6acb0a6b41fe1d45f45b492503872128af9c66b9;hpb=e42dfc72258c0b563a16ec36c9230287fbbcc7ae;p=cascardo%2Fovs.git diff --git a/Makefile.am b/Makefile.am index 6acb0a6b4..3c2ae89aa 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,15 +10,22 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = datapath AM_CPPFLAGS = $(SSL_CFLAGS) +AM_LDFLAGS = $(SSL_LDFLAGS) if WIN32 AM_CPPFLAGS += -I $(top_srcdir)/include/windows +AM_CPPFLAGS += -I $(top_srcdir)/datapath-windows/include +AM_CPPFLAGS += $(PTHREAD_INCLUDES) +AM_LDFLAGS += $(PTHREAD_LDFLAGS) endif 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) @@ -52,12 +59,13 @@ CLEAN_LOCAL = DISTCLEANFILES = PYCOV_CLEAN_FILES = build-aux/check-structs,cover EXTRA_DIST = \ - BUILD.Windows \ + CONTRIBUTING \ CodingStyle \ DESIGN \ FAQ \ INSTALL \ INSTALL.Debian \ + INSTALL.DPDK \ INSTALL.Fedora \ INSTALL.KVM \ INSTALL.Libvirt \ @@ -66,15 +74,17 @@ EXTRA_DIST = \ INSTALL.SSL \ INSTALL.XenServer \ INSTALL.userspace \ + INSTALL.Windows \ IntegrationGuide \ NOTICE \ OPENFLOW-1.1+ \ PORTING \ - README-OFTest \ - README-gcov \ README-lisp \ REPORTING-BUGS \ - SubmittingPatches \ + TODO \ + .travis.yml \ + .travis/build.sh \ + .travis/prepare.sh \ WHY-OVS \ boot.sh \ build-aux/cccl \ @@ -139,13 +149,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: @@ -164,10 +172,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; \ + LC_ALL=C 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-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; \ @@ -182,7 +190,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 @@ -193,7 +202,7 @@ config-h-check: @cd $(srcdir); \ if test -e .git && (git --version) >/dev/null 2>&1 && \ git --no-pager grep -L '#include ' `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 ."; \ @@ -204,8 +213,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"; \ @@ -241,10 +252,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"; \ @@ -262,7 +274,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 @@ -277,6 +290,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) @@ -305,3 +328,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