Browse Source

Move plugin to /usr/lib/libklish-plugin-sysrepo.so. New klish rules for plugin naming

Serj Kalichev 5 months ago
parent
commit
b086194973
2 changed files with 7 additions and 17 deletions
  1. 0 7
      configure.ac
  2. 7 10
      src/Makefile.am

+ 0 - 7
configure.ac

@@ -74,13 +74,6 @@ AC_ARG_ENABLE(debug,
 AM_CONDITIONAL(DEBUG,test x$enable_debug = xyes)
 
 
-################################
-# Variables to install plugins
-################################
-PLUGINS_SUBDIR=klish/plugins
-AC_SUBST(PLUGINS_SUBDIR)
-
-
 ################################
 # Check for mandatory faux library
 ################################

+ 7 - 10
src/Makefile.am

@@ -1,14 +1,11 @@
-plugindir = ${libdir}/@PLUGINS_SUBDIR@
-plugin_LTLIBRARIES =
+lib_LTLIBRARIES += libklish-plugin-sysrepo.la
+libklish_plugin_sysrepo_la_SOURCES =
+libklish_plugin_sysrepo_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version -module
+libklish_plugin_sysrepo_la_LIBS =
+libklish_plugin_sysrepo_la_CFLAGS = $(AM_CFLAGS)
+#libklish_plugin_sysrepo_la_LIBADD = libsysrepo.la
 
-plugin_LTLIBRARIES += kplugin-sysrepo.la
-kplugin_sysrepo_la_SOURCES =
-kplugin_sysrepo_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version -module
-kplugin_sysrepo_la_LIBS =
-kplugin_sysrepo_la_CFLAGS = $(AM_CFLAGS)
-#kplugin_sysrepo_la_LIBADD = libsysrepo.la
-
-kplugin_sysrepo_la_SOURCES += \
+libklish_plugin_sysrepo_la_SOURCES += \
 	src/plugin.c \
 	src/private.h \
 	src/syms.c \