Don't use lib prefix for plugins

6 files changed, 26 insertions, 28 deletions

diff --git a/audio/Makefile.am b/audio/Makefile.am
index ca9abddd..0c6acfab 100644
--- a/audio/Makefile.am
+++ b/audio/Makefile.am
@@ -2,16 +2,16 @@
 if AUDIOPLUGIN
 plugindir = $(libdir)/bluetooth/plugins
 
-plugin_LTLIBRARIES = libaudio.la
+plugin_LTLIBRARIES = audio.la
 
-libaudio_la_SOURCES = main.c \
+audio_la_SOURCES = main.c \
 	manager.h manager.c headset.h headset.c \
 	ipc.h ipc.c unix.h unix.c \
 	device.h device.c gateway.h gateway.c \
 	sink.c sink.h avdtp.c avdtp.h \
 	a2dp.c a2dp.h control.c control.h
 
-libaudio_la_LDFLAGS = -module -avoid-version -no-undefined \
+audio_la_LDFLAGS = -module -avoid-version -no-undefined \
 			-export-symbols-regex bluetooth_plugin_desc
 
 LDADD = $(top_builddir)/common/libhelper.a \
diff --git a/hcid/plugin.c b/hcid/plugin.c
index acebed61..41c55155 100644
--- a/hcid/plugin.c
+++ b/hcid/plugin.c
@@ -110,7 +110,7 @@ gboolean plugin_init(GKeyFile *config)
 		gchar *filename;
 		struct stat st;
 
-		if (g_str_has_prefix(file, "lib") == FALSE ||
+		if (g_str_has_prefix(file, "lib") == TRUE ||
 				g_str_has_suffix(file, ".so") == FALSE)
 			continue;
 
diff --git a/input/Makefile.am b/input/Makefile.am
index 3d841d7c..1bc81fbe 100644
--- a/input/Makefile.am
+++ b/input/Makefile.am
@@ -2,12 +2,11 @@
 if INPUTPLUGIN
 plugindir = $(libdir)/bluetooth/plugins
 
-plugin_LTLIBRARIES = libinput.la
+plugin_LTLIBRARIES = input.la
 
-libinput_la_SOURCES = main.c \
-	manager.h manager.c \
-	server.h server.c device.h device.c storage.h storage.c \
-	fakehid.c fakehid.h
+input_la_SOURCES = main.c manager.h manager.c \
+		server.h server.c device.h device.c \
+		storage.h storage.c fakehid.c fakehid.h
 
 LDADD = $(top_builddir)/common/libhelper.a \
 		@GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
diff --git a/network/Makefile.am b/network/Makefile.am
index 704a0c8c..15208f5a 100644
--- a/network/Makefile.am
+++ b/network/Makefile.am
@@ -2,10 +2,9 @@
 if NETWORKPLUGIN
 plugindir = $(libdir)/bluetooth/plugins
 
-plugin_LTLIBRARIES = libnetwork.la
+plugin_LTLIBRARIES = network.la
 
-libnetwork_la_SOURCES = main.c \
-	manager.h manager.c \
+network_la_SOURCES = main.c manager.h manager.c \
 	server.h server.c bridge.h bridge.c \
 	connection.h connection.c common.h common.c
 
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index fac16104..a8e833d0 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -2,23 +2,23 @@
 plugindir = $(libdir)/bluetooth/plugins
 
 if NETLINK
-netlink_plugins = libnetlink.la
+netlink_plugins = netlink.la
 else
 netlink_plugins =
 endif
 
 plugin_LTLIBRARIES = $(netlink_plugins)
 
-noinst_LTLIBRARIES = libecho.la libstorage.la
+noinst_LTLIBRARIES = echo.la storage.la
 
-libecho_la_SOURCES = echo.c
+echo_la_SOURCES = echo.c
 
-libstorage_la_SOURCES = storage.c
+storage_la_SOURCES = storage.c
 
 if NETLINK
-libnetlink_la_SOURCES = netlink.c
+netlink_la_SOURCES = netlink.c
 
-libnetlink_la_LIBADD = @NETLINK_LIBS@
+netlink_la_LIBADD = @NETLINK_LIBS@
 endif
 
 AM_LDFLAGS = -module -avoid-version -no-undefined \
@@ -31,13 +31,13 @@ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/hcid
 MAINTAINERCLEANFILES = Makefile.in
 
 all-local:
-	@$(LN_S) -f $(top_srcdir)/input/.libs/libinput.so
-	@$(LN_S) -f $(top_srcdir)/audio/.libs/libaudio.so
-	@$(LN_S) -f $(top_srcdir)/serial/.libs/libserial.so
-	@$(LN_S) -f $(top_srcdir)/network/.libs/libnetwork.so
+	@$(LN_S) -f $(top_srcdir)/input/.libs/input.so
+	@$(LN_S) -f $(top_srcdir)/audio/.libs/audio.so
+	@$(LN_S) -f $(top_srcdir)/serial/.libs/serial.so
+	@$(LN_S) -f $(top_srcdir)/network/.libs/network.so
 
 clean-local:
-	@rm -f libnetwork.so
-	@rm -f libserial.so
-	@rm -f libaudio.so
-	@rm -f libinput.so
+	@rm -f network.so
+	@rm -f serial.so
+	@rm -f audio.so
+	@rm -f input.so
diff --git a/serial/Makefile.am b/serial/Makefile.am
index df246cf0..0e6c47f7 100644
--- a/serial/Makefile.am
+++ b/serial/Makefile.am
@@ -2,9 +2,9 @@
 if SERIALPLUGIN
 plugindir = $(libdir)/bluetooth/plugins
 
-plugin_LTLIBRARIES = libserial.la
+plugin_LTLIBRARIES = serial.la
 
-libserial_la_SOURCES = main.c \
+serial_la_SOURCES = main.c \
 		manager.h manager.c port.h port.c \
 		storage.h storage.c