diff options
| author |   Damjan Marion <damarion@cisco.com> | 2016-07-07 20:27:49 +0200 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2016-07-08 10:43:38 +0000 |
| commit | 905a7f5520a64aad545c8dd02796b56f88ed2d38 (patch) | |
| tree | fb2da8de6ac2bbf1a35bcf2b87251c9a94a23fc8 /plugins/sixrd-plugin/Makefile.am | |
| parent | 370e9e38e8e0b35810734125e2b6eeac65fefa5d (diff) | |
Multiple changes in the plugin build infra
- configure.ac - some plugins are enabled by default
- Plugin .so files are placed into corresponding subdirs
- WITH_PLUGIN_TOOLKIT macro is retired - not needed anymore
- plugins/build-data is removed
- plugin makefiles are not building static libs anymore
- plugin makefiles are not installing header files to /usr/include
anymore
Change-Id: I55681bd9ce34811f7eb1b2b24d9f0ca42df1cf04
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'plugins/sixrd-plugin/Makefile.am')
| -rw-r--r-- | plugins/sixrd-plugin/Makefile.am | 19 |
1 files changed, 9 insertions, 10 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)) |