X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=Makefile.am;h=0cfc603db117e284867696182f88bff7d12fa047;hb=f8cb1dbb2484d42a232060cdd7091455a8806adc;hp=3c2ae89aa46d56627143cf56c695ecc9a7fd8149;hpb=bd9d70250b2ebffe43a8863b89bf9b3157a940d6;p=cascardo%2Fovs.git

diff --git a/Makefile.am b/Makefile.am
index 3c2ae89aa..0cfc603db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,11 +11,13 @@ 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
 
@@ -28,6 +30,7 @@ AM_CPPFLAGS += $(SSL_INCLUDES)
 
 AM_CFLAGS = -Wstrict-prototypes
 AM_CFLAGS += $(WARNING_FLAGS)
+AM_CFLAGS += $(OVS_CFLAGS)
 
 if NDEBUG
 AM_CPPFLAGS += -DNDEBUG
@@ -59,33 +62,36 @@ CLEAN_LOCAL =
 DISTCLEANFILES =
 PYCOV_CLEAN_FILES = build-aux/check-structs,cover
 EXTRA_DIST = \
-	CONTRIBUTING \
-	CodingStyle \
-	DESIGN \
-	FAQ \
-	INSTALL \
-	INSTALL.Debian \
-        INSTALL.DPDK \
-	INSTALL.Fedora \
-	INSTALL.KVM \
-	INSTALL.Libvirt \
-	INSTALL.NetBSD \
-	INSTALL.RHEL \
-	INSTALL.SSL \
-	INSTALL.XenServer \
-	INSTALL.userspace \
-	INSTALL.Windows \
-	IntegrationGuide \
+	CONTRIBUTING.md \
+	CodingStyle.md \
+	DESIGN.md \
+	FAQ.md \
+	INSTALL.md \
+	INSTALL.Debian.md \
+	INSTALL.Docker.md \
+	INSTALL.DPDK.md \
+	INSTALL.Fedora.md \
+	INSTALL.KVM.md \
+	INSTALL.Libvirt.md \
+	INSTALL.NetBSD.md \
+	INSTALL.RHEL.md \
+	INSTALL.SSL.md \
+	INSTALL.XenServer.md \
+	INSTALL.userspace.md \
+	INSTALL.Windows.md \
+	IntegrationGuide.md \
 	NOTICE \
-	OPENFLOW-1.1+ \
-	PORTING \
-	README-lisp \
-	REPORTING-BUGS \
-	TODO \
+	OPENFLOW-1.1+.md \
+	PORTING.md \
+	README.md \
+	README-lisp.md \
+	README-native-tunneling.md \
+	REPORTING-BUGS.md \
+	TODO.md \
 	.travis.yml \
 	.travis/build.sh \
 	.travis/prepare.sh \
-	WHY-OVS \
+	WHY-OVS.md \
 	boot.sh \
 	build-aux/cccl \
 	build-aux/sodepends.pl \
@@ -120,8 +126,10 @@ scripts_SCRIPTS =
 scripts_DATA =
 SUFFIXES =
 check_DATA =
+pkgconfig_DATA =
 
 scriptsdir = $(pkgdatadir)/scripts
+pkgconfigdir = $(libdir)/pkgconfig
 
 # This ensures that files added to EXTRA_DIST are always distributed,
 # even if they are inside an Automake if...endif conditional block that is
@@ -134,7 +142,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' \
@@ -153,7 +161,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:
@@ -220,7 +228,7 @@ printf-check:
 	then \
 	    echo "See above for list of violations of the rule that"; \
 	    echo "'z', 't', 'j', 'hh' printf() type modifiers are"; \
-	    echo "forbidden.  See CodingStyle for replacements."; \
+	    echo "forbidden.  See CodingStyle.md for replacements."; \
 	    exit 1; \
 	fi
 .PHONY: printf-check