diff options
Diffstat (limited to 'plugins/ioam-plugin')
| -rw-r--r-- | plugins/ioam-plugin/Makefile.am | 23 | ||||
| -rw-r--r-- | plugins/ioam-plugin/configure.ac | 11 |
2 files changed, 12 insertions, 22 deletions
diff --git a/plugins/ioam-plugin/Makefile.am b/plugins/ioam-plugin/Makefile.am index e62525f155a..47ff11671f9 100644 --- a/plugins/ioam-plugin/Makefile.am +++ b/plugins/ioam-plugin/Makefile.am @@ -13,7 +13,8 @@ AUTOMAKE_OPTIONS = foreign subdir-objects -AM_CFLAGS = -Wall -I@TOOLKIT_INCLUDE@ +AM_CFLAGS = -Wall +AM_LDFLAGS = -module -shared -avoid-version ######################################## # iOAM Proof of Transit @@ -26,8 +27,6 @@ ioam_pot_plugin_la_SOURCES = \ ioam/lib-pot/math64.h \ ioam/lib-pot/pot_api.c -ioam_pot_plugin_la_LDFLAGS = -module - BUILT_SOURCES = \ ioam/lib-pot/pot.api.h @@ -38,7 +37,7 @@ SUFFIXES = .api.h .api $(CC) $(CPPFLAGS) -E -P -C -x c $^ \ | vppapigen --input - --output $@ --show-name $@ -nobase_include_HEADERS = \ +noinst_HEADERS = \ ioam/lib-pot/pot_all_api_h.h \ ioam/lib-pot/pot_msg_enum.h \ ioam/lib-pot/pot.api.h \ @@ -49,14 +48,14 @@ ioam_pot_test_plugin_la_SOURCES = \ ioam/lib-pot/pot_test.c \ ioam/lib-pot/pot_plugin.api.h -ioam_pot_test_plugin_la_LDFLAGS = -module +vppapitestpluginsdir = ${libdir}/vpp_api_test_plugins +vpppluginsdir = ${libdir}/vpp_plugins + +vppapitestplugins_LTLIBRARIES = ioam_pot_test_plugin.la +vppplugins_LTLIBRARIES = ioam_pot_plugin.la -lib_LTLIBRARIES = ioam_pot_plugin.la ioam_pot_test_plugin.la -if WITH_PLUGIN_TOOLKIT +# Remove *.la files install-data-hook: - mkdir /usr/lib/vpp_plugins || true - mkdir /usr/lib/vpp_api_test_plugins || true - cp -L $(prefix)/lib/ioam_pot_plugin.so /usr/lib/vpp_plugins - cp -L $(prefix)/lib/ioam_pot_test_plugin.so /usr/lib/vpp_api_test_plugins -endif + @(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES)) + @(cd $(vppapitestpluginsdir) && $(RM) $(vppapitestplugins_LTLIBRARIES)) diff --git a/plugins/ioam-plugin/configure.ac b/plugins/ioam-plugin/configure.ac index 8c828575565..27fda7346b4 100644 --- a/plugins/ioam-plugin/configure.ac +++ b/plugins/ioam-plugin/configure.ac @@ -1,17 +1,8 @@ AC_INIT(ioam_plugin, 1.0) LT_INIT AM_INIT_AUTOMAKE +AC_PREFIX_DEFAULT([/usr]) -AM_PROG_AS AC_PROG_CC -AM_PROG_CC_C_O -AC_ARG_WITH(plugin-toolkit, - AC_HELP_STRING([--with-plugin-toolkit], - [build using the vpp toolkit]), - [with_plugin_toolkit=${prefix}/include], - [with_plugin_toolkit=.]) - -AC_SUBST(TOOLKIT_INCLUDE,[${with_plugin_toolkit}]) -AM_CONDITIONAL(WITH_PLUGIN_TOOLKIT, test "$with_plugin_toolkit" != ".") AC_OUTPUT([Makefile]) |