From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 2 May 2017 15:38:06 +0000 (-0400)
Subject: Merge branch 'master' into EIGRP
X-Git-Tag: reindent-master-before~197^2~1
X-Git-Url: https://git.proxmox.com/?p=mirror_frr.git;a=commitdiff_plain;h=b46be72b4aff1d413e89bc26a70a29934afe9d85

Merge branch 'master' into EIGRP
---

b46be72b4aff1d413e89bc26a70a29934afe9d85
diff --cc lib/Makefile.am
index c33893be6,ad8a48868..6e3c6d680
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -32,9 -32,9 +32,10 @@@ libfrr_la_SOURCES = 
  	libfrr.c \
  	strlcpy.c \
  	strlcat.c \
 +	sha256.c \
  	module.c \
  	hook.c \
+ 	frr_pthread.c \
  	# end
  
  BUILT_SOURCES = route_types.h gitversion.h command_parse.h command_lex.h
@@@ -75,7 -75,7 +76,8 @@@ pkginclude_HEADERS = 
  	module.h \
  	hook.h \
  	libfrr.h \
 +	sha256.h \
+ 	frr_pthread.h \
  	# end
  
  noinst_HEADERS = \