Remove obsolete file.

[connman] / plugins / Makefile.am

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 4380372..8c315e5 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -5,8 +5,8 @@ plugin_LTLIBRARIES =
 
 builtin_modules =
 builtin_sources =
-builtin_cflags =
 builtin_libadd =
+builtin_cflags =
 
 if LOOPBACK
 if LOOPBACK_BUILTIN
@@ -60,9 +60,14 @@ endif
 endif
 
 if MODEMMGR
+if MODEMMGR_BUILTIN
+builtin_modules += modemmgr
+builtin_sources += modemmgr.c
+else
 plugin_LTLIBRARIES += modemmgr.la
 modemmgr_la_LIBADD = @GDBUS_LIBS@
 endif
+endif
 
 if NOVATEL
 plugin_LTLIBRARIES += novatel.la
@@ -79,10 +84,12 @@ if HSO_BUILTIN
 builtin_modules += hso
 builtin_sources += hso.c modem.h modem.c
 builtin_libadd += @GATCHAT_LIBS@
+builtin_cflags += @GATCHAT_CFLAGS@
 else
 plugin_LTLIBRARIES += hso.la
 hso_la_SOURCES = hso.c modem.h modem.c
 hso_la_LIBADD = @GATCHAT_LIBS@
+hso_la_CFLAGS = $(AM_CFLAGS) @GATCHAT_CFLAGS@
 endif
 endif
 
@@ -138,9 +145,16 @@ endif
 endif
 
 if POLKIT
+if POLKIT_BUILTIN
+builtin_modules += polkit
+builtin_sources += polkit.c
+builtin_libadd += @POLKIT_LIBS@
+builtin_cflags += @POLKIT_CFLAGS@
+else
 plugin_LTLIBRARIES += polkit.la
 polkit_la_LIBADD = @POLKIT_LIBS@ @GLIB_LIBS@
 polkit_la_CFLAGS = $(AM_CFLAGS) @POLKIT_CFLAGS@
+endif
 
 if DATAFILES
 policydir = @POLKIT_DATADIR@
@@ -164,17 +178,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
 
@@ -186,8 +200,7 @@ else
 scriptdir = $(libdir)/connman/scripts
 endif
 
-AM_CFLAGS = -fvisibility=hidden @GLIB_CFLAGS@ \
-                                       @GDBUS_CFLAGS@ @GATCHAT_CFLAGS@
+AM_CFLAGS = -fvisibility=hidden @GLIB_CFLAGS@ @GDBUS_CFLAGS@
 
 INCLUDES = -I$(top_builddir)/include