Make sure to clear favorite setting on removal

[connman] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a1cfcc2..9a1738c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,30 +1,36 @@
 
-dbusdir = $(sysconfdir)/dbus-1/system.d
+if DATAFILES
+dbusdir = @DBUS_DATADIR@
 
 dbus_DATA = connman.conf
+endif
 
 sbin_PROGRAMS = connmand
 
 connmand_SOURCES = main.c connman.h log.c selftest.c error.c plugin.c \
-                       profile.c element.c device.c network.c connection.c \
-                       security.c resolver.c storage.c manager.c agent.c \
-                       ipv4.c detect.c rtnl.c dbus.c
+                       element.c device.c network.c connection.c \
+                       manager.c profile.c service.c agent.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
 
-rulesdir = $(sysconfdir)/udev/rules.d
+if DATAFILES
+rulesdir = @UDEV_DATADIR@
 
 rules_DATA = 92-connman.rules
 endif
+endif
 
-connmand_LDADD = @GDBUS_LIBS@ @GLIB_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
 
 connmand_DEPENDENCIES = connman.ver
 
-CLEANFILES = connman.ver connman.exp 92-connman.rules
+CLEANFILES = connman.ver connman.exp connman.conf 92-connman.rules
 
 statedir = $(localstatedir)/run/connman
 
@@ -36,13 +42,14 @@ else
 plugindir = $(libdir)/connman/plugins
 endif
 
-AM_CFLAGS = @UDEV_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ \
-                               -DSTATEDIR=\""$(statedir)"\" \
-                                       -DSTORAGEDIR=\""$(storagedir)\"" \
-                                               -DPLUGINDIR=\""$(plugindir)"\"
-INCLUDES = -I$(top_builddir)/include
+AM_CFLAGS = @UDEV_CFLAGS@ @GTHREAD_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ \
+                                       -DSTATEDIR=\""$(statedir)"\" \
+                                       -DPLUGINDIR=\""$(plugindir)"\" \
+                                       -DSTORAGEDIR=\""$(storagedir)\""
+
+INCLUDES = -I$(top_builddir)/include -I$(top_builddir)/plugins
 
-EXTRA_DIST = $(dbus_DATA) connman.rules
+EXTRA_DIST = connman-dbus.conf connman-polkit.conf connman.rules
 
 MAINTAINERCLEANFILES = Makefile.in
 
@@ -54,5 +61,12 @@ connman.ver: connman.exp
        cat $< | sed -e "s/\(.*\)/\1;/" >> $@
        echo "local: *; };" >> $@
 
+connman.conf: connman-dbus.conf connman-polkit.conf
+if POLKIT
+       cp $(top_srcdir)/src/connman-polkit.conf $@
+else
+       cp $(top_srcdir)/src/connman-dbus.conf $@
+endif
+
 92-connman.rules: connman.rules
        cp $< $@