diff options
| author |   Damjan Marion <damarion@cisco.com> | 2016-07-08 13:46:48 +0200 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2016-07-08 13:37:58 +0000 |
| commit | 952f4f742261ed534806fe508fd61cc613af286f (patch) | |
| tree | f4af9bb2be5d5bf0e77fefe9fc5cb6e70ed6be80 | |
| parent | ac645ad285b6aed7962a3ad9a6388436a80c63a7 (diff) | |
Update emacs plugin skeleton
Change-Id: I52b370abd8b6fec34b8219a274f2de404e072a97
Signed-off-by: Damjan Marion <damarion@cisco.com>
| -rw-r--r-- | build-root/emacs-lisp/plugin-configure-skel.el | 11 | ||||
| -rw-r--r-- | build-root/emacs-lisp/plugin-makefile-skel.el | 30 |
2 files changed, 16 insertions, 25 deletions
diff --git a/build-root/emacs-lisp/plugin-configure-skel.el b/build-root/emacs-lisp/plugin-configure-skel.el index d871323b..ebf0bf69 100644 --- a/build-root/emacs-lisp/plugin-configure-skel.el +++ b/build-root/emacs-lisp/plugin-configure-skel.el @@ -24,19 +24,10 @@ nil " AC_INIT(" plugin-name "_plugin, 1.0) AM_INIT_AUTOMAKE +AM_SILENT_RULES([yes]) AC_PROG_LIBTOOL -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]) ") diff --git a/build-root/emacs-lisp/plugin-makefile-skel.el b/build-root/emacs-lisp/plugin-makefile-skel.el index 1c043239..dc17ddb9 100644 --- a/build-root/emacs-lisp/plugin-makefile-skel.el +++ b/build-root/emacs-lisp/plugin-makefile-skel.el @@ -26,9 +26,9 @@ nil # Licensed under the Apache License, Version 2.0 (the \"License\"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an \"AS IS\" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -37,12 +37,18 @@ nil AUTOMAKE_OPTIONS = foreign subdir-objects -AM_CFLAGS = -Wall -I@TOOLKIT_INCLUDE@ +AM_CFLAGS = -Wall +AM_LDFLAGS = -module -shared -avoid-version + +vppapitestpluginsdir = ${libdir}/vpp_api_test_plugins +vpppluginsdir = ${libdir}/vpp_plugins + +vppplugins_LTLIBRARIES = " plugin-name "_plugin.la +vppapitestplugins_LTLIBRARIES = " plugin-name "_test_plugin.la -lib_LTLIBRARIES = " plugin-name "_plugin.la " plugin-name "_test_plugin.la " plugin-name "_plugin_la_SOURCES = " plugin-name "/" plugin-name ".c \\ " plugin-name "/node.c \\ - " plugin-name "/" plugin-name "_plugin.api.h + " plugin-name "/" plugin-name "_plugin.api.h " plugin-name "_plugin_la_LDFLAGS = -module BUILT_SOURCES = " plugin-name "/" plugin-name ".api.h @@ -54,23 +60,17 @@ SUFFIXES = .api.h .api $(CC) $(CPPFLAGS) -E -P -C -x c $^ \\ | vppapigen --input - --output $@ --show-name $@ -nobase_include_HEADERS = \\ +noinst_HEADERS = \\ " plugin-name "/" plugin-name "_all_api_h.h \\ " plugin-name "/" plugin-name "_msg_enum.h \\ " plugin-name "/" plugin-name ".api.h " plugin-name "_test_plugin_la_SOURCES = \\ " plugin-name "/" plugin-name "_test.c " plugin-name "/" plugin-name "_plugin.api.h -" plugin-name "_test_plugin_la_LDFLAGS = -module -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 $(prefix)/lib/" plugin-name "_plugin.so.*.*.* /usr/lib/vpp_plugins - cp $(prefix)/lib/" plugin-name "_test_plugin.so.*.*.* \\ - /usr/lib/vpp_api_test_plugins - rm -f $(prefix)/lib/" plugin-name "_plugin.* - rm -f $(prefix)/lib/" plugin-name "_test_plugin.* + @(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES)) + @(cd $(vppapitestpluginsdir) && $(RM) $(vppapitestplugins_LTLIBRARIES)) endif ") |