Use static library for builtin plugins and add extra dependency

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 8427f7c..1530c0d 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -156,17 +156,17 @@ if FAKE
 plugin_LTLIBRARIES += fake.la
 endif
 
-noinst_LTLIBRARIES = libbuiltin.la
+noinst_LIBRARIES = libbuiltin.a
 
-libbuiltin_la_SOURCES = $(builtin_sources)
-libbuiltin_la_LDFLAGS =
-libbuiltin_la_CFLAGS = $(AM_CFLAGS) \
+libbuiltin_a_SOURCES = $(builtin_sources)
+libbuiltin_a_LDFLAGS =
+libbuiltin_a_CFLAGS = $(AM_CFLAGS) \
                $(builtin_cflags) -DCONNMAN_PLUGIN_BUILTIN \
                -DSTATEDIR=\""$(statedir)"\" -DSCRIPTDIR=\""$(scriptdir)"\"
 
 BUILT_SOURCES = builtin.h
 
-nodist_libbuiltin_la_SOURCES = $(BUILT_SOURCES)
+nodist_libbuiltin_a_SOURCES = $(BUILT_SOURCES)
 
 AM_LDFLAGS = -no-undefined -module -avoid-version
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 9a1738c..82ad37f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,12 +23,12 @@ rules_DATA = 92-connman.rules
 endif
 endif
 
-connmand_LDADD = $(top_builddir)/plugins/libbuiltin.la \
+connmand_LDADD = $(top_builddir)/plugins/libbuiltin.a \
                @GDBUS_LIBS@ @GLIB_LIBS@ @GTHREAD_LIBS@ @UDEV_LIBS@ -ldl
 
 connmand_LDFLAGS = -Wl,--export-dynamic -Wl,--version-script=connman.ver
 
-connmand_DEPENDENCIES = connman.ver
+connmand_DEPENDENCIES = connman.ver $(top_builddir)/plugins/libbuiltin.a
 
 CLEANFILES = connman.ver connman.exp connman.conf 92-connman.rules