diff options
Diffstat (limited to 'vpp-api')
-rw-r--r-- | vpp-api/java/Makefile.am | 8 | ||||
-rw-r--r-- | vpp-api/java/japi/vppjni.c | 10 | ||||
-rw-r--r-- | vpp-api/java/jvpp/jvpp.c | 10 | ||||
-rw-r--r-- | vpp-api/python/Makefile.am | 4 | ||||
-rw-r--r-- | vpp-api/python/pneum/pneum.c | 8 | ||||
-rw-r--r-- | vpp-api/python/pneum/test_pneum.c | 4 |
6 files changed, 22 insertions, 22 deletions
diff --git a/vpp-api/java/Makefile.am b/vpp-api/java/Makefile.am index cb841ee2..c06caf54 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; \ diff --git a/vpp-api/java/japi/vppjni.c b/vpp-api/java/japi/vppjni.c index f1b8eda1..2b58b360 100644 --- a/vpp-api/java/japi/vppjni.c +++ b/vpp-api/java/japi/vppjni.c @@ -16,7 +16,7 @@ #include <vnet/vnet.h> #define vl_api_version(n,v) static u32 vpe_api_version = (v); -#include <api/vpe.api.h> +#include <vpp-api/vpe.api.h> #undef vl_api_version #include <jni.h> @@ -26,19 +26,19 @@ #include <japi/org_openvpp_vppjapi_vppConn.h> #include <japi/org_openvpp_vppjapi_vppApi.h> -#include <api/vpe_msg_enum.h> +#include <vpp-api/vpe_msg_enum.h> #define vl_typedefs /* define message structures */ -#include <api/vpe_all_api_h.h> +#include <vpp-api/vpe_all_api_h.h> #undef vl_typedefs #define vl_endianfun -#include <api/vpe_all_api_h.h> +#include <vpp-api/vpe_all_api_h.h> #undef vl_endianfun /* instantiate all the print functions we know about */ #define vl_print(handle, ...) #define vl_printfun -#include <api/vpe_all_api_h.h> +#include <vpp-api/vpe_all_api_h.h> #undef vl_printfun #ifndef VPPJNI_DEBUG diff --git a/vpp-api/java/jvpp/jvpp.c b/vpp-api/java/jvpp/jvpp.c index 00c50f95..37aef803 100644 --- a/vpp-api/java/jvpp/jvpp.c +++ b/vpp-api/java/jvpp/jvpp.c @@ -16,7 +16,7 @@ #include <vnet/vnet.h> #define vl_api_version(n,v) static u32 vpe_api_version = (v); -#include <api/vpe.api.h> +#include <vpp-api/vpe.api.h> #undef vl_api_version #include <jni.h> @@ -24,19 +24,19 @@ #include <jvpp/org_openvpp_jvpp_VppJNIConnection.h> #include <jvpp/org_openvpp_jvpp_JVppImpl.h> -#include <api/vpe_msg_enum.h> +#include <vpp-api/vpe_msg_enum.h> #define vl_typedefs /* define message structures */ -#include <api/vpe_all_api_h.h> +#include <vpp-api/vpe_all_api_h.h> #undef vl_typedefs #define vl_endianfun -#include <api/vpe_all_api_h.h> +#include <vpp-api/vpe_all_api_h.h> #undef vl_endianfun /* instantiate all the print functions we know about */ #define vl_print(handle, ...) #define vl_printfun -#include <api/vpe_all_api_h.h> +#include <vpp-api/vpe_all_api_h.h> #undef vl_printfun #ifndef VPPJNI_DEBUG diff --git a/vpp-api/python/Makefile.am b/vpp-api/python/Makefile.am index b96ff3d9..4d2d221d 100644 --- a/vpp-api/python/Makefile.am +++ b/vpp-api/python/Makefile.am @@ -33,11 +33,11 @@ libpneum_la_CPPFLAGS = BUILT_SOURCES += vpp_papi.py -vpp_papi.py: $(prefix)/../vpp/api/vpe.api pneum/api-gen.py +vpp_papi.py: $(prefix)/../vpp/vpp-api/vpe.api pneum/api-gen.py @echo " PYTHON API"; \ $(CC) $(CPPFLAGS) -E -P -C -x c $< \ | vppapigen --input - --python defs_$@; \ - echo "#include <api/vpe_msg_enum.h>" \ + echo "#include <vpp-api/vpe_msg_enum.h>" \ | $(CC) $(CPPFLAGS) -E -P -x c - | grep VL_API \ | @srcdir@/pneum/api-gen.py -i defs_$@ > @srcdir@/vpp_papi/$@ diff --git a/vpp-api/python/pneum/pneum.c b/vpp-api/python/pneum/pneum.c index 971c79bf..ac518493 100644 --- a/vpp-api/python/pneum/pneum.c +++ b/vpp-api/python/pneum/pneum.c @@ -31,16 +31,16 @@ #include <vlibapi/api.h> #include <vlibmemory/api.h> -#include <api/vpe_msg_enum.h> +#include <vpp-api/vpe_msg_enum.h> #include "pneum.h" #define vl_typedefs /* define message structures */ -#include <api/vpe_all_api_h.h> +#include <vpp-api/vpe_all_api_h.h> #undef vl_typedefs #define vl_endianfun /* define message structures */ -#include <api/vpe_all_api_h.h> +#include <vpp-api/vpe_all_api_h.h> #undef vl_endianfun typedef struct { @@ -63,7 +63,7 @@ void vlib_cli_output (struct vlib_main_t * vm, char * fmt, ...) } #define vl_api_version(n,v) static u32 vpe_api_version = v; -#include <api/vpe.api.h> +#include <vpp-api/vpe.api.h> #undef vl_api_version void vl_client_add_api_signatures (vl_api_memclnt_create_t *mp) diff --git a/vpp-api/python/pneum/test_pneum.c b/vpp-api/python/pneum/test_pneum.c index 18627b3f..b3131953 100644 --- a/vpp-api/python/pneum/test_pneum.c +++ b/vpp-api/python/pneum/test_pneum.c @@ -36,13 +36,13 @@ #include <vlibmemory/api.h> #include <vnet/ip/ip.h> -#include <api/vpe_msg_enum.h> +#include <vpp-api/vpe_msg_enum.h> #include <signal.h> #include <setjmp.h> #include "pneum.h" #define vl_typedefs /* define message structures */ -#include <api/vpe_all_api_h.h> +#include <vpp-api/vpe_all_api_h.h> #undef vl_typedefs volatile int sigterm_received = 0; |