From aa6920e0a80d8271be1dda59f613a1d2b0e1d3e6 Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Mon, 27 Jun 2016 09:25:13 -0400 Subject: More janitorial work Install vpp api header files in /usr/include/vpp-api, instead of /usr/include/api. Someone will eventually complain if we continue with the status quo. Generate /usr/bin/vpp_plugin_configure, to correctly configure standalone plugin compilation against header files installed from the dev package. If a plugin's CFLAGS don't precisely match the installed vpp engine binary, subtle misbehavior can and will occur. Example: the ip4/ip6 main_t structure size / member offsets depend on DPDK=[0|1]. Screw that one up, and your brand-new configurable ip feature will mysteriously fail to appear, even though the plugin loads perfectly. Change-Id: I20c97fe1042808a79935863209d995c31953b98c Signed-off-by: Dave Barach --- vpp-api/java/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'vpp-api/java/Makefile.am') diff --git a/vpp-api/java/Makefile.am b/vpp-api/java/Makefile.am index cb841ee2fc9..c06caf5459c 100644 --- a/vpp-api/java/Makefile.am +++ b/vpp-api/java/Makefile.am @@ -54,7 +54,7 @@ japi/org_openvpp_vppjapi_vppConn.h: \ japi/org/openvpp/vppjapi/vppVxlanTunnelDetails.java \ japi/org/openvpp/vppjapi/vppConn.java \ japi/org/openvpp/vppjapi/vppApiCallbacks.java \ - ../../vpp/api/vpe.api.h + ../../vpp/vpp-api/vpe.api.h $(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppVersion.java ; \ $(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppVersion ; \ $(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppInterfaceDetails.java ; \ @@ -79,8 +79,8 @@ japi/org_openvpp_vppjapi_vppConn.h: \ japi/vppapi.c: japi/org_openvpp_vppjapi_vppConn.h pushd .. ; dir=`pwd` ; popd ; \ instdir=`echo $${dir} | sed -e 's:build-root/build:build-root/install:'` ; \ - vppapigen --input $${instdir}/../vpp/api/vpe.api --jni japi/vppapi.c --app vpe ; \ - vppapigen --input $${instdir}/../vpp/api/vpe.api --java japi/vppApi.java --app vpe ; \ + vppapigen --input $${instdir}/../vpp/vpp-api/vpe.api --jni japi/vppapi.c --app vpe ; \ + vppapigen --input $${instdir}/../vpp/vpp-api/vpe.api --java japi/vppApi.java --app vpe ; \ $(JAVAC) -classpath . -d . japi/vppApi.java ; \ $(JAVAH) -classpath . -d japi org.openvpp.vppjapi.vppApi ; \ $(JAVAC) -classpath . -d . @srcdir@/japi/org/openvpp/vppjapi/vppApiCallbacks.java ; \ @@ -112,7 +112,7 @@ JAVAROOT = . BUILT_SOURCES += jvpp/org_openvpp_jvpp_VppJNIConnection.h jvpp/jvpp.c -jvpp/org_openvpp_jvpp_VppJNIConnection.h: $(prefix)/../vpp/api/vpe.api +jvpp/org_openvpp_jvpp_VppJNIConnection.h: $(prefix)/../vpp/vpp-api/vpe.api @echo " jVpp API"; \ cp -rf @srcdir@/jvpp/* -t jvpp/; \ mkdir -p jvpp/gen/target/org/openvpp/jvpp; \ -- cgit 1.2.3-korg