diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-08-04 16:13:29 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-08-04 19:09:11 +0200 |
| commit | 30237d294fcb522e3be0df3a5625178db6f47a32 (patch) | |
| tree | 8447ae64a257378808081e27cca355a9694a05cd /Makefile.am | |
| parent | 50ffbc124bca15b2ca09c1b8b2fd57de6c4d3da4 (diff) | |
build: non-recursive ldpd
This also fixes a build problem where using #include
"ldpd/ldp_vty_cmds_clippy.c" results in the Makefile dependency tracking
having both
ldp_vty_cmds.c: ldp_vty_cmds_clippy.c
ldp_vty_cmds.c: ../ldpd/ldp_vty_cmds_clippy.c
(because, if it's included as "ldpd/..", it uses the "-I.." include path
in gcc, so the gcc -MD dependency output is "../ldpd/...")
... all of which causes the build to try to build it twice (at the same
time) and fail rather stupidly.
With a non-recursive build, the two paths are identical and everything
just works.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 72689c28f7..7d607b2d53 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,14 +37,15 @@ include ospf6d/subdir.am include ospfclient/subdir.am include isisd/subdir.am include nhrpd/subdir.am +include ldpd/subdir.am SUBDIRS = . @LIBRFP@ @RFPTEST@ \ - @BGPD@ @LDPD@ \ + @BGPD@ \ @PIMD@ @EIGRPD@ @BABELD@ \ @WATCHFRR@ @VTYSH@ @DOC@ \ @SOLARIS@ tests tools -DIST_SUBDIRS = . bgpd ldpd \ +DIST_SUBDIRS = . bgpd \ watchfrr vtysh doc tests \ solaris pimd eigrpd bgpd/rfp-example/librfp \ bgpd/rfp-example/rfptest tools babeld \ |