From e77ca70da8bf4bd1991401e9609b97f9da6ae013 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Mon, 25 May 2009 13:56:02 +0100 Subject: [PATCH] Use shared library for builtin plugins --- plugins/Makefile.am | 10 +++++----- src/Makefile.am | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 4380372..5866ac2 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -164,17 +164,17 @@ if FAKE plugin_LTLIBRARIES += fake.la endif -noinst_LIBRARIES = libbuiltin.a +noinst_LTLIBRARIES = libbuiltin.la -libbuiltin_a_SOURCES = $(builtin_sources) -libbuiltin_a_LIBADD = $(builtin_libadd) -libbuiltin_a_CFLAGS = $(AM_CFLAGS) \ +libbuiltin_la_SOURCES = $(builtin_sources) +libbuiltin_la_LIBADD = $(builtin_libadd) +libbuiltin_la_CFLAGS = $(AM_CFLAGS) \ $(builtin_cflags) -DCONNMAN_PLUGIN_BUILTIN \ -DSTATEDIR=\""$(statedir)"\" -DSCRIPTDIR=\""$(scriptdir)"\" BUILT_SOURCES = builtin.h -nodist_libbuiltin_a_SOURCES = $(BUILT_SOURCES) +nodist_libbuiltin_la_SOURCES = $(BUILT_SOURCES) AM_LDFLAGS = -no-undefined -module -avoid-version diff --git a/src/Makefile.am b/src/Makefile.am index 17c2768..286a020 100644 --- 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.a \ +connmand_LDADD = $(top_builddir)/plugins/libbuiltin.la \ @GDBUS_LIBS@ @GLIB_LIBS@ @GTHREAD_LIBS@ @UDEV_LIBS@ -ldl connmand_LDFLAGS = -Wl,--export-dynamic -Wl,--version-script=connman.ver -connmand_DEPENDENCIES = connman.ver $(top_builddir)/plugins/libbuiltin.a +connmand_DEPENDENCIES = connman.ver $(top_builddir)/plugins/libbuiltin.la CLEANFILES = connman.ver connman.exp connman.conf 92-connman.rules -- 1.7.9.5