Release 0.10

[connman] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index c3a811c..4eda671 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,22 +1,25 @@
 
-dbusdir = $(sysconfdir)/dbus-1/system.d
+if DATAFILES
+dbusdir = @DBUS_DATADIR@
 
 dbus_DATA = connman.conf
-
-servicedir = $(datarootdir)/dbus-1/system-services
-
-service_DATA = connman.service
-
-DISTCLEANFILES = $(service_DATA)
+endif
 
 sbin_PROGRAMS = connmand
 
-connmand_SOURCES = main.c connman.h log.c error.c plugin.c profile.c \
-                       element.c device.c network.c security.c resolver.c \
-                               storage.c manager.c agent.c rtnl.c dbus.c
+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
 
 if UDEV
 connmand_SOURCES += udev.c
+
+if DATAFILES
+rulesdir = @UDEV_DATADIR@
+
+rules_DATA = 92-connman.rules
+endif
 endif
 
 connmand_LDADD = @GDBUS_LIBS@ @GLIB_LIBS@ @UDEV_LIBS@ -ldl
@@ -25,7 +28,7 @@ connmand_LDFLAGS = -Wl,--export-dynamic -Wl,--version-script=connman.ver
 
 connmand_DEPENDENCIES = connman.ver
 
-CLEANFILES = connman.ver connman.exp
+CLEANFILES = connman.ver connman.exp connman.conf 92-connman.rules
 
 statedir = $(localstatedir)/run/connman
 
@@ -41,17 +44,26 @@ AM_CFLAGS = @UDEV_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ \
                                -DSTATEDIR=\""$(statedir)"\" \
                                        -DSTORAGEDIR=\""$(storagedir)\"" \
                                                -DPLUGINDIR=\""$(plugindir)"\"
-
 INCLUDES = -I$(top_builddir)/include
 
-EXTRA_DIST = $(dbus_DATA)
+EXTRA_DIST = connman-dbus.conf connman-polkit.conf connman.rules
 
 MAINTAINERCLEANFILES = Makefile.in
 
-connman.exp:
+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 $< $@