Don't use libconnman- prefix for plugins

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index b34d79d..9047739 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,22 +1,20 @@
 
 plugindir = $(libdir)/connman/plugins
 
-plugin_LTLIBRARIES = libconnman-80203.la libconnman-80211.la \
-                       libconnman-bluetooth.la \
-                       libconnman-dhclient.la libconnman-resolvconf.la
+plugin_LTLIBRARIES = 80203.la 80211.la bluetooth.la \
+                               dhclient.la resolvconf.la
 
-libconnman_80203_la_SOURCES = 80203.c
+80203_la_SOURCES = 80203.c
 
-libconnman_80211_la_SOURCES = 80211.c supplicant.h supplicant.c
+80211_la_SOURCES = 80211.c supplicant.h supplicant.c
 
-libconnman_bluetooth_la_SOURCES = bluetooth.c
+bluetooth_la_SOURCES = bluetooth.c
 
-libconnman_dhclient_la_SOURCES = dhclient.c
-libconnman_dhclient_la_LIBADD = @GDBUS_LIBS@
-libconnman_dhclient_la_CFLAGS = @GDBUS_CFLAGS@ -DDHCLIENT=\"@DHCLIENT@\" \
+dhclient_la_SOURCES = dhclient.c
+dhclient_la_CFLAGS = @GDBUS_CFLAGS@ -DDHCLIENT=\"@DHCLIENT@\" \
                -DSTATEDIR=\""$(statedir)"\" -DSCRIPTDIR=\""$(scriptdir)"\"
 
-libconnman_resolvconf_la_SOURCES = resolvconf.c
+resolvconf_la_SOURCES = resolvconf.c
 
 AM_LDFLAGS = -module -avoid-version -export-symbols-regex connman_plugin_desc
 

diff --git a/src/plugin.c b/src/plugin.c
index 404ef9e..7f8b16c 100644 (file)
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -69,8 +69,7 @@ static void load_plugins(const gchar *path)
                        GModule *module;
                        struct connman_plugin_desc *desc;
 
-                       if (g_str_has_prefix(file, "libconnman") == FALSE ||
-                                       g_str_has_suffix(file, ".so") == FALSE)
+                       if (g_str_has_suffix(file, ".so") == FALSE)
                                continue;
 
                        filename = g_build_filename(path, file, NULL);