Make sure to clear favorite setting on removal

[connman] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index e0ccdae..9a1738c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,8 +10,8 @@ sbin_PROGRAMS = connmand
 connmand_SOURCES = main.c connman.h log.c selftest.c error.c plugin.c \
                        element.c device.c network.c connection.c \
                        manager.c profile.c service.c agent.c \
-                       security.c resolver.c notifier.c storage.c \
-                       ipv4.c detect.c rtnl.c dbus.c
+                       security.c resolver.c ipconfig.c notifier.c \
+                       storage.c ipv4.c detect.c rtnl.c dbus.c
 
 if UDEV
 connmand_SOURCES += udev.c
@@ -23,7 +23,8 @@ rules_DATA = 92-connman.rules
 endif
 endif
 
-connmand_LDADD = @GDBUS_LIBS@ @GLIB_LIBS@ @GTHREAD_LIBS@ @UDEV_LIBS@ -ldl
+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
 
@@ -46,7 +47,7 @@ AM_CFLAGS = @UDEV_CFLAGS@ @GTHREAD_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ \
                                        -DPLUGINDIR=\""$(plugindir)"\" \
                                        -DSTORAGEDIR=\""$(storagedir)\""
 
-INCLUDES = -I$(top_builddir)/include
+INCLUDES = -I$(top_builddir)/include -I$(top_builddir)/plugins
 
 EXTRA_DIST = connman-dbus.conf connman-polkit.conf connman.rules