From adf68681f2b9fa501e66ab2a03fe15415a4939e2 Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Sun, 18 Sep 2016 00:16:49 +0000 Subject: Fix to make "make dist" work Change-Id: I09562faa0bc57799e91eac1c8d5503ba00baaad4 Signed-off-by: Ed Warnicke --- nsh-plugin/Makefile.am | 4 ++-- nsh-plugin/java/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 3 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 a16c846..8ea88c8 100644 --- a/nsh-plugin/java/Makefile.am +++ b/nsh-plugin/java/Makefile.am @@ -33,7 +33,7 @@ jvpp_gen = jvpp_gen.py lib_LTLIBRARIES = libjvpp_nsh.la -libjvpp_nsh_la_SOURCES = $(srcdir)/../java/nsh.api.h jvpp/jvpp_nsh.c jvpp/org_openvpp_jvpp_nsh_JVppNshImpl.h +libjvpp_nsh_la_SOURCES = ../vpp-api/nsh.api.h jvpp/jvpp_nsh.c jvpp/org_openvpp_jvpp_nsh_JVppNshImpl.h libjvpp_nsh_la_LIBADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \ -lpthread -lm -lrt -ljvpp_common libjvpp_nsh_la_LDFLAGS = -module -- cgit 1.2.3-korg