diff options
| author |   Ed Warnicke <hagbard@gmail.com> | 2016-09-18 00:16:49 +0000 |
|---|---|---|
| committer | Ed Warnicke <hagbard@gmail.com> | 2016-10-04 22:18:06 +0000 |
| commit | 2ee7b37b1d2eadedeafb6a8d24b1b2a8c0cea236 (patch) | |
| tree | 3ce5ec7913b29b7245e937eda6c9dd5ac70964ca | |
| parent | a6a65697fece9016e5d12b789b1364f7e8ed28af (diff) | |
Fix to make "make dist" work
Change-Id: I5f944198aa3b2cb55855157d8087d4bef6067106
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
| -rw-r--r-- | nsh-plugin/Makefile.am | 4 | ||||
| -rw-r--r-- | nsh-plugin/java/Makefile.am | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nsh-plugin/Makefile.am b/nsh-plugin/Makefile.am index bf24b6d..05ec808 100644 --- a/nsh-plugin/Makefile.am +++ b/nsh-plugin/Makefile.am @@ -22,7 +22,7 @@ CPPFLAGS += -DDEBUG -g lib_LTLIBRARIES = nsh_plugin.la nsh_test_plugin.la nsh_plugin_la_SOURCES = nsh/nsh.c \ - nsh/nsh_plugin.api.h + vpp-api/nsh.api.h nsh_plugin_la_LDFLAGS = -module BUILT_SOURCES = vpp-api/nsh.api.h @@ -40,7 +40,7 @@ nobase_include_HEADERS = \ vpp-api/nsh.api.h nsh_test_plugin_la_SOURCES = \ - nsh/nsh_test.c nsh/nsh_plugin.api.h + nsh/nsh_test.c vpp-api/nsh.api.h nsh_test_plugin_la_LDFLAGS = -module install-data-hook: diff --git a/nsh-plugin/java/Makefile.am b/nsh-plugin/java/Makefile.am index 5e1401a..10c4cfa 100644 --- a/nsh-plugin/java/Makefile.am +++ b/nsh-plugin/java/Makefile.am @@ -32,7 +32,9 @@ jvpp_gen = jvpp_gen.py lib_LTLIBRARIES = libjvpp_nsh.la + libjvpp_nsh_la_SOURCES = $(srcdir)/../java/nsh.api.h jvpp/jvpp_nsh.c jvpp/io_fd_vpp_jvpp_nsh_JVppNshImpl.h + libjvpp_nsh_la_LIBADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \ -lpthread -lm -lrt -ljvpp_common libjvpp_nsh_la_LDFLAGS = -module |