Disconnect service on removal if still connected

[connman] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 4da752e..9a1738c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,33 +1,72 @@
 
-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 manager.c plugin.c \
-                       iface.c iface-storage.c iface-helper.c \
-                                       iface-inet.c rtnl.c dhcp.c
+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 ipconfig.c notifier.c \
+                       storage.c ipv4.c detect.c rtnl.c dbus.c
+
+if UDEV
+connmand_SOURCES += udev.c
+
+if DATAFILES
+rulesdir = @UDEV_DATADIR@
+
+rules_DATA = 92-connman.rules
+endif
+endif
+
+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 connman.conf 92-connman.rules
 
-connmand_LDADD = @HAL_LIBS@ @GDBUS_LIBS@ @GMODULE_LIBS@
- 
 statedir = $(localstatedir)/run/connman
 
 storagedir = $(localstatedir)/lib/connman
 
 if MAINTAINER_MODE
-plugindir = $(abs_top_srcdir)/plugins
+plugindir = $(abs_top_srcdir)/plugins/.libs
 else
 plugindir = $(libdir)/connman/plugins
 endif
 
-AM_CFLAGS = @GMODULE_CFLAGS@ @GDBUS_CFLAGS@ @HAL_CFLAGS@ \
-                       -DSTATEDIR=\""$(statedir)"\" \
-                       -DSTORAGEDIR=\""$(storagedir)\"" \
-                       -DPLUGINDIR=\""$(plugindir)"\"
+AM_CFLAGS = @UDEV_CFLAGS@ @GTHREAD_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ \
+                                       -DSTATEDIR=\""$(statedir)"\" \
+                                       -DPLUGINDIR=\""$(plugindir)"\" \
+                                       -DSTORAGEDIR=\""$(storagedir)\""
 
-INCLUDES = -I$(top_builddir)/include
+INCLUDES = -I$(top_builddir)/include -I$(top_builddir)/plugins
 
-EXTRA_DIST = $(dbus_DATA)
+EXTRA_DIST = connman-dbus.conf connman-polkit.conf connman.rules
 
 MAINTAINERCLEANFILES = Makefile.in
+
+connman.exp: $(connmand_OBJECTS)
+       nm -B *.o | awk '{ print $$3 }' | sort -u | grep -E -e '^connman_' > $@
+
+connman.ver: connman.exp
+       echo "{ global:" > $@
+       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 $< $@