diff options
| author |   Dave Barach <dave@barachs.net> | 2018-03-13 12:54:43 -0400 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2018-03-14 19:06:16 +0000 |
| commit | 5a72e425f9c2d5ca049fd05cd280c4bff5f73d57 (patch) | |
| tree | 866875c0f6f0fb0899dc5111600288c48f84c72a /src | |
| parent | 1ac36d74210069d574e00e110dae398cae5130a6 (diff) | |
Clean up vpp build bootstrap step
Net of rewriting vppapigen in python-ply, there's no need to compile
vppinfra.
Install a copy of vppapigen in .../build-root/tools/bin, so
the sample plugin build will work. Rationalize suffix-rules.mk.
Add clang, clang++ links to .../build-root/ccache-bin.
Change-Id: Ib4017848b7767b6054238ea544ee5319667c3659
Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/examples/sample-plugin/Makefile.am | 7 | ||||
| -rw-r--r-- | src/suffix-rules.mk | 12 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/examples/sample-plugin/Makefile.am b/src/examples/sample-plugin/Makefile.am index 5c279c44b11..1825a8f111f 100644 --- a/src/examples/sample-plugin/Makefile.am +++ b/src/examples/sample-plugin/Makefile.am @@ -31,12 +31,13 @@ vpppluginsdir = ${libdir}/vpp_plugins include sample.am %.api.h: %.api - mkdir -p `dirname $@` ; \ + @echo " APIGEN " $@ ; \ + mkdir -p `dirname $@` ; \ vppapigen --input $^ --output $@ %.api.json: %.api - @echo " JSON APIGEN " $@ ; \ - mkdir -p `dirname $@` ; \ + @echo " JSON APIGEN " $@ ; \ + mkdir -p `dirname $@` ; \ vppapigen --input $^ JSON --output $@ apidir = $(prefix)/api/plugins diff --git a/src/suffix-rules.mk b/src/suffix-rules.mk index 8b1ab83b28b..1e701651822 100644 --- a/src/suffix-rules.mk +++ b/src/suffix-rules.mk @@ -14,13 +14,13 @@ # Shared suffix rules # Please do not set "SUFFIXES = .api.h .api" here -VPPAPIGEN = $(top_srcdir)/tools/vppapigen/vppapigen +VPPAPIGEN = vppapigen %.api.h: %.api - @echo " APIGEN " $@ ; \ - mkdir -p `dirname $@` ; \ + @echo " APIGEN " $@ ; \ + mkdir -p `dirname $@` ; \ $(VPPAPIGEN) --includedir $(top_srcdir) --input $< --output $@ -%.api.json: %.api - @echo " JSON API" $@ ; \ - mkdir -p `dirname $@` ; \ +%.api.json: %.api + @echo " JSON API" $@ ; \ + mkdir -p `dirname $@` ; \ $(VPPAPIGEN) --includedir $(top_srcdir) --input $< JSON --output $@ |