diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2017-01-26 21:42:00 -0500 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2017-02-02 13:42:56 +0000 |
| commit | ed0e49c51841e84c72a5bb2c6d538ee779b734d4 (patch) | |
| tree | 7ad7c16dc967afd07f3a99ee6a436fe924407a87 /src | |
| parent | 460bc633b131d2001bb81d7c2ad5a51ec177ac93 (diff) | |
Update default Vagrant box to Ubuntu 16.04, VPP-616
- Make puppetlabs/ubuntu-16.04-64-nocm the default box
- Enable x11 forwarding
- Install x11-utils required for emacs to work over X11
- Refactor run.sh
- Add VPP_VAGRANT_POST_BUILD environment variable to
allow selection of installing VPP or run "make test".
- Fix dependencies in src/vppapigen.am
Change-Id: I0ec054fdc83feb71ca8396df53ed02bf82ecd7e7
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/vppapigen.am | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/vppapigen.am b/src/vppapigen.am index 5c25e1ec6f4..fe9ff03ecab 100644 --- a/src/vppapigen.am +++ b/src/vppapigen.am @@ -13,20 +13,17 @@ bin_PROGRAMS += vppapigen -# We cannot rely on BUILT_SOURCES here as other built sources are relying -# on vppapigen, so make can start compiling lex.c before gram.h is created. -# This way we introduce new dependency by running C preprocessor. - -tools/vppapigen/lex_e.c: tools/vppapigen/lex.c tools/vppapigen/gram.y +tools/vppapigen/gram.h: tools/vppapigen/gram.y @$(YACC) -d @srcdir@/tools/vppapigen/gram.y @mv y.tab.h tools/vppapigen/gram.h @rm y.tab.c - @$(CC) -I. -E -o $@ $< -vppapigen_SOURCES = tools/vppapigen/gram.y tools/vppapigen/lex_e.c tools/vppapigen/node.c +tools/vppapigen/lex.o: tools/vppapigen/gram.h +tools/vppapigen/node.o: tools/vppapigen/gram.h + +vppapigen_SOURCES = tools/vppapigen/gram.y tools/vppapigen/lex.c tools/vppapigen/node.c vppapigen_LDADD = libvppinfra.la vppapigen_LDFLAGS = -static CLEANFILES += tools/vppapigen/gram.c tools/vppapigen/gram.h -CLEANFILES += tools/vppapigen/lex_e.c # vi:syntax=automake |