]> git.puffer.fish Git - matthieu/frr.git/commitdiff
Merge pull request #911 from opensourcerouting/non-recursive-2
authorDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 9 Aug 2017 18:38:07 +0000 (14:38 -0400)
committerGitHub <noreply@github.com>
Wed, 9 Aug 2017 18:38:07 +0000 (14:38 -0400)
more non-recursive build, fix cross-compile, & doc build mangling

1  2 
configure.ac
lib/subdir.am

diff --cc configure.ac
Simple merge
diff --cc lib/subdir.am
index 15ce8ec1994fdbe514547118396549394ede4fdd,682ae45cb443d815675cf927f4fcf0ad6b6ae87b..6a62cbb67856b2d823051a144b5332feef0f0f2f
@@@ -123,9 -123,7 +123,8 @@@ pkginclude_HEADERS += 
        lib/prefix.h \
        lib/privs.h \
        lib/ptm_lib.h \
 +      lib/pw.h \
        lib/qobj.h \
-       lib/route_types.h \
        lib/routemap.h \
        lib/sbuf.h \
        lib/sha256.h \