diff options
Diffstat (limited to 'plugins/vcgn-plugin')
| -rw-r--r-- | plugins/vcgn-plugin/Makefile.am | 14 | ||||
| -rw-r--r-- | plugins/vcgn-plugin/configure.ac | 11 |
2 files changed, 7 insertions, 18 deletions
diff --git a/plugins/vcgn-plugin/Makefile.am b/plugins/vcgn-plugin/Makefile.am index f9705d05d1c..927f35b6001 100644 --- a/plugins/vcgn-plugin/Makefile.am +++ b/plugins/vcgn-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 ######################################## # Virtual Carrier Grade NAT @@ -87,13 +88,10 @@ nobase_include_HEADERS = \ vcgn/tcp_header_definitions.h \ vcgn/vcgn_db.h -libvcgn_plugin_la_LDFLAGS = -module +vpppluginsdir = ${libdir}/vpp_plugins -lib_LTLIBRARIES = libvcgn_plugin.la +vppplugins_LTLIBRARIES = libvcgn_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/libvcgn_plugin.so /usr/lib/vpp_plugins -endif + @(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES)) diff --git a/plugins/vcgn-plugin/configure.ac b/plugins/vcgn-plugin/configure.ac index 5bc8bd9d876..f9c365affae 100644 --- a/plugins/vcgn-plugin/configure.ac +++ b/plugins/vcgn-plugin/configure.ac @@ -2,17 +2,8 @@ AC_INIT(vcgn_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]) |