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/build-data | |
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/build-data')
-rw-r--r-- | plugins/build-data/packages/ioam-plugin.mk | 47 | ||||
-rw-r--r-- | plugins/build-data/packages/sample-plugin.mk | 47 | ||||
-rw-r--r-- | plugins/build-data/packages/sixrd-plugin.mk | 47 | ||||
-rw-r--r-- | plugins/build-data/packages/vcgn-plugin.mk | 47 |
4 files changed, 0 insertions, 188 deletions
diff --git a/plugins/build-data/packages/ioam-plugin.mk b/plugins/build-data/packages/ioam-plugin.mk deleted file mode 100644 index 1ebe81849ee..00000000000 --- a/plugins/build-data/packages/ioam-plugin.mk +++ /dev/null @@ -1,47 +0,0 @@ -ioam-plugin_configure_depend = \ - vppinfra-install \ - svm-install \ - vlib-api-install \ - vlib-install \ - vnet-install \ - vpp-install \ - vpp-api-test-install - -ioam-plugin_CPPFLAGS = $(call installed_includes_fn, \ - vppinfra \ - openssl \ - svm \ - vlib \ - vlib-api \ - vnet \ - vpp \ - vpp-api-test) - -ioam-plugin_LDFLAGS = $(call installed_libs_fn, \ - vppinfra \ - openssl \ - svm \ - vlib \ - vlib-api \ - vnet \ - vpp \ - vpp-api-test) - -ioam-plugin_post_install = \ - mkdir -p $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins ; \ - cp $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/*.so \ - $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins - -ioam-plugin_image_include = echo $(arch_lib_dir)/vlib_plugins - -ifneq ($($(PLATFORM)_uses_dpdk),no) -ioam-plugin_configure_args = --with-dpdk -ifeq ($($(PLATFORM)_uses_external_dpdk),yes) -ioam-plugin_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir) -ioam-plugin_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir) -else -ioam-plugin_configure_depend += dpdk-install -ioam-plugin_CPPFLAGS += $(call installed_includes_fn, dpdk) -ioam-plugin_LDFLAGS += $(call installed_libs_fn, dpdk) -endif -endif diff --git a/plugins/build-data/packages/sample-plugin.mk b/plugins/build-data/packages/sample-plugin.mk deleted file mode 100644 index 047a26f551c..00000000000 --- a/plugins/build-data/packages/sample-plugin.mk +++ /dev/null @@ -1,47 +0,0 @@ -sample-plugin_configure_depend = \ - vppinfra-install \ - svm-install \ - vlib-api-install \ - vlib-install \ - vnet-install \ - vpp-install \ - vpp-api-test-install - -sample-plugin_CPPFLAGS = $(call installed_includes_fn, \ - vppinfra \ - openssl \ - svm \ - vlib \ - vlib-api \ - vnet \ - vpp \ - vpp-api-test) - -sample-plugin_LDFLAGS = $(call installed_libs_fn, \ - vppinfra \ - openssl \ - svm \ - vlib \ - vlib-api \ - vnet \ - vpp \ - vpp-api-test) - -sample-plugin_post_install = \ - mkdir -p $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins ; \ - cp $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/*.so \ - $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins - -sample-plugin_image_include = echo $(arch_lib_dir)/vlib_plugins - -ifneq ($($(PLATFORM)_uses_dpdk),no) -sample-plugin_configure_args = --with-dpdk -ifeq ($($(PLATFORM)_uses_external_dpdk),yes) -sample-plugin_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir) -sample-plugin_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir) -else -sample-plugin_configure_depend += dpdk-install -sample-plugin_CPPFLAGS += $(call installed_includes_fn, dpdk) -sample-plugin_LDFLAGS += $(call installed_libs_fn, dpdk) -endif -endif diff --git a/plugins/build-data/packages/sixrd-plugin.mk b/plugins/build-data/packages/sixrd-plugin.mk deleted file mode 100644 index 186d9b8fe3b..00000000000 --- a/plugins/build-data/packages/sixrd-plugin.mk +++ /dev/null @@ -1,47 +0,0 @@ -sixrd-plugin_configure_depend = \ - vppinfra-install \ - svm-install \ - vlib-api-install \ - vlib-install \ - vnet-install \ - vpp-install \ - vpp-api-test-install - -sixrd-plugin_CPPFLAGS = $(call installed_includes_fn, \ - vppinfra \ - openssl \ - svm \ - vlib \ - vlib-api \ - vnet \ - vpp \ - vpp-api-test) - -sixrd-plugin_LDFLAGS = $(call installed_libs_fn, \ - vppinfra \ - openssl \ - svm \ - vlib \ - vlib-api \ - vnet \ - vpp \ - vpp-api-test) - -sixrd-plugin_post_install = \ - mkdir -p $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins ; \ - cp $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/*.so \ - $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins - -sixrd-plugin_image_include = echo $(arch_lib_dir)/vlib_plugins - -ifneq ($($(PLATFORM)_uses_dpdk),no) -sixrd-plugin_configure_args = --with-dpdk -ifeq ($($(PLATFORM)_uses_external_dpdk),yes) -sixrd-plugin_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir) -sixrd-plugin_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir) -else -sixrd-plugin_configure_depend += dpdk-install -sixrd-plugin_CPPFLAGS += $(call installed_includes_fn, dpdk) -sixrd-plugin_LDFLAGS += $(call installed_libs_fn, dpdk) -endif -endif diff --git a/plugins/build-data/packages/vcgn-plugin.mk b/plugins/build-data/packages/vcgn-plugin.mk deleted file mode 100644 index cd865c15014..00000000000 --- a/plugins/build-data/packages/vcgn-plugin.mk +++ /dev/null @@ -1,47 +0,0 @@ -vcgn-plugin_configure_depend = \ - vppinfra-install \ - svm-install \ - vlib-api-install \ - vlib-install \ - vnet-install \ - vpp-install \ - vpp-api-test-install - -vcgn-plugin_CPPFLAGS = $(call installed_includes_fn, \ - vppinfra \ - openssl \ - svm \ - vlib \ - vlib-api \ - vnet \ - vpp \ - vpp-api-test) - -vcgn-plugin_LDFLAGS = $(call installed_libs_fn, \ - vppinfra \ - openssl \ - svm \ - vlib \ - vlib-api \ - vnet \ - vpp \ - vpp-api-test) - -vcgn-plugin_post_install = \ - mkdir -p $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins ; \ - cp $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/*.so \ - $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins - -vcgn-plugin_image_include = echo $(arch_lib_dir)/vlib_plugins - -ifneq ($($(PLATFORM)_uses_dpdk),no) -vcgn-plugin_configure_args = --with-dpdk -ifeq ($($(PLATFORM)_uses_external_dpdk),yes) -vcgn-plugin_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir) -vcgn-plugin_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir) -else -vcgn-plugin_configure_depend += dpdk-install -vcgn-plugin_CPPFLAGS += $(call installed_includes_fn, dpdk) -vcgn-plugin_LDFLAGS += $(call installed_libs_fn, dpdk) -endif -endif |