projects
/
connman
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use correct type for user data
[connman]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
a1a7dac
..
3ea9035
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-3,24
+3,28
@@
dbusdir = $(sysconfdir)/dbus-1/system.d
dbus_DATA = connman.conf
dbus_DATA = connman.conf
-servicedir = $(datarootdir)/dbus-1/system-services
+sbin_PROGRAMS = connmand
-service_DATA = connman.service
+connmand_SOURCES = main.c connman.h log.c selftest.c error.c plugin.c \
+ profile.c element.c device.c network.c \
+ security.c resolver.c storage.c manager.c \
+ agent.c detect.c rtnl.c dbus.c
-DISTCLEANFILES = $(service_DATA)
+if UDEV
+connmand_SOURCES += udev.c
-sbin_PROGRAMS = connmand
+rulesdir = $(sysconfdir)/udev/rules.d
-connmand_SOURCES = main.c connman.h log.c plugin.c element.c \
- storage.c manager.c agent.c
+rules_DATA = 92-connman.rules
+endif
-connmand_LDADD = @SQLITE_LIBS@ @GDBUS_LIBS@ @GMODULE_LIBS@ @GTHREAD_LIBS@
+connmand_LDADD = @GDBUS_LIBS@ @GLIB_LIBS@ @UDEV_LIBS@ -ldl
-connmand_LDFLAGS = -Wl,--version-script=connman.ver
+connmand_LDFLAGS = -Wl,--export-dynamic -Wl,--version-script=connman.ver
connmand_DEPENDENCIES = connman.ver
connmand_DEPENDENCIES = connman.ver
-CLEANFILES = connman.ver connman.exp
+CLEANFILES = connman.ver connman.exp 92-connman.rules
statedir = $(localstatedir)/run/connman
statedir = $(localstatedir)/run/connman
@@
-32,21
+36,23
@@
else
plugindir = $(libdir)/connman/plugins
endif
plugindir = $(libdir)/connman/plugins
endif
-AM_CFLAGS = @GTHREAD_CFLAGS@ @GMODULE_CFLAGS@ @GDBUS_CFLAGS@ @SQLITE_CFLAGS@ \
- -DSTATEDIR=\""$(statedir)"\" \
- -DSTORAGEDIR=\""$(storagedir)\"" \
- -DPLUGINDIR=\""$(plugindir)"\"
-
+AM_CFLAGS = @UDEV_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ \
+ -DSTATEDIR=\""$(statedir)"\" \
+ -DSTORAGEDIR=\""$(storagedir)\"" \
+ -DPLUGINDIR=\""$(plugindir)"\"
INCLUDES = -I$(top_builddir)/include
INCLUDES = -I$(top_builddir)/include
-EXTRA_DIST = $(dbus_DATA)
+EXTRA_DIST = $(dbus_DATA) connman.rules
MAINTAINERCLEANFILES = Makefile.in
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: *; };" >> $@
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: *; };" >> $@
+
+92-connman.rules: connman.rules
+ cp $< $@