diff options
Diffstat (limited to 'plugins/sixrd-plugin')
| -rw-r--r-- | plugins/sixrd-plugin/Makefile.am | 19 | ||||
| -rw-r--r-- | plugins/sixrd-plugin/configure.ac | 11 |
2 files changed, 10 insertions, 20 deletions
diff --git a/plugins/sixrd-plugin/Makefile.am b/plugins/sixrd-plugin/Makefile.am index c2fae798c78..71c8da48420 100644 --- a/plugins/sixrd-plugin/Makefile.am +++ b/plugins/sixrd-plugin/Makefile.am @@ -13,25 +13,24 @@ AUTOMAKE_OPTIONS = foreign subdir-objects -AM_CFLAGS = -Wall -I@TOOLKIT_INCLUDE@ +AM_CFLAGS = -Wall +AM_LDFLAGS = -module -shared -avoid-version libsixrd_plugin_la_SOURCES = \ sixrd/sixrd.c \ sixrd/ip4_sixrd.c \ sixrd/ip6_sixrd.c -nobase_include_HEADERS = \ +noinst_HEADERS = \ sixrd/sixrd.h -libsixrd_plugin_la_LDFLAGS = -module - BUILT_SOURCES = -lib_LTLIBRARIES = libsixrd_plugin.la +vpppluginsdir = ${libdir}/vpp_plugins + +vppplugins_LTLIBRARIES = libsixrd_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/libsixrd_plugin.so /usr/lib/vpp_plugins -endif + @(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES)) diff --git a/plugins/sixrd-plugin/configure.ac b/plugins/sixrd-plugin/configure.ac index 1652c87f644..3aa4c425158 100644 --- a/plugins/sixrd-plugin/configure.ac +++ b/plugins/sixrd-plugin/configure.ac @@ -2,17 +2,8 @@ AC_INIT(sixrd_plugin, 1.0) LT_INIT AM_INIT_AUTOMAKE AM_SILENT_RULES([yes]) +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]) |