diff options
| author | Richard Hughes <richard@hughsie.com> | 2010-01-21 14:47:21 +0000 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2010-01-21 14:47:21 +0000 |
| commit | faeb7ffabc78c117bb02119d512a64bcc051c3b2 (patch) | |
| tree | 753de7542ac1814b31938e5306d241315993daa2 /src | |
| parent | adcb737767d42059ea7ad6d1fbd7184fea1b425e (diff) | |
| download | upower-faeb7ffabc78c117bb02119d512a64bcc051c3b2.tar.gz | |
Rename the man pages and rename the main daemon binary name
Diffstat (limited to 'src')
| -rw-r--r-- | src/.gitignore | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 34 | ||||
| -rw-r--r-- | src/org.freedesktop.UPower.service.in | 2 | ||||
| -rw-r--r-- | src/up-main.c | 2 |
4 files changed, 21 insertions, 19 deletions
diff --git a/src/.gitignore b/src/.gitignore index 75c1242..9e2bb52 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,5 +1,5 @@ .deps -devkit-power-daemon +upowerd dkp-self-test *.o *-glue.h diff --git a/src/Makefile.am b/src/Makefile.am index 8d27526..ea5a8c3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -56,16 +56,16 @@ up-qos-glue.h: org.freedesktop.UPower.QoS.xml Makefile.am up-wakeups-glue.h: org.freedesktop.UPower.Wakeups.xml Makefile.am dbus-binding-tool --prefix=up_wakeups --mode=glib-server --output=up-wakeups-glue.h org.freedesktop.UPower.Wakeups.xml -libexec_PROGRAMS = devkit-power-daemon +libexec_PROGRAMS = upowerd dbusifdir = $(datadir)/dbus-1/interfaces dbusif_DATA = \ - org.freedesktop.UPower.xml \ - org.freedesktop.UPower.Device.xml \ - org.freedesktop.UPower.QoS.xml \ + org.freedesktop.UPower.xml \ + org.freedesktop.UPower.Device.xml \ + org.freedesktop.UPower.QoS.xml \ org.freedesktop.UPower.Wakeups.xml -devkit_power_daemon_SOURCES = \ +upowerd_SOURCES = \ egg-debug.c \ egg-debug.h \ up-polkit.h \ @@ -87,13 +87,12 @@ devkit_power_daemon_SOURCES = \ up-main.c \ $(BUILT_SOURCES) -devkit_power_daemon_CPPFLAGS = \ +upowerd_CPPFLAGS = \ -I$(top_srcdir)/src \ -DG_LOG_DOMAIN=\"up-daemon\" \ - $(DISABLE_DEPRECATED) \ $(AM_CPPFLAGS) -devkit_power_daemon_LDADD = \ +upowerd_LDADD = \ -lm \ $(USB_LIBS) \ $(GIO_LIBS) \ @@ -101,24 +100,24 @@ devkit_power_daemon_LDADD = \ $(POLKIT_LIBS) if BACKEND_TYPE_DUMMY -devkit_power_daemon_LDADD += \ +upowerd_LDADD += \ dummy/libupshared.la endif if BACKEND_TYPE_FREEBSD -devkit_power_daemon_LDADD += \ +upowerd_LDADD += \ freebsd/libupshared.la \ $(DEVKIT_POWER_LIBS) endif if BACKEND_TYPE_LINUX -devkit_power_daemon_LDADD += \ +upowerd_LDADD += \ linux/libupshared.la \ $(GUDEV_LIBS) \ $(DEVKIT_POWER_LIBS) endif -devkit_power_daemon_CFLAGS = \ +upowerd_CFLAGS = \ $(WARNINGFLAGS_C) \ $(NULL) @@ -183,13 +182,16 @@ install-data-hook: mkdir -p $(DESTDIR)$(localstatedir)/lib/DeviceKit-power; \ fi +install-exec-hook: + cd $(DESTDIR)$(libexecdir) && $(LN_S) -f upowerd devkit-power-daemon + CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = \ - org.freedesktop.UPower.xml \ - org.freedesktop.UPower.Device.xml \ - org.freedesktop.UPower.QoS.xml \ - org.freedesktop.UPower.Wakeups.xml \ + org.freedesktop.UPower.xml \ + org.freedesktop.UPower.Device.xml \ + org.freedesktop.UPower.QoS.xml \ + org.freedesktop.UPower.Wakeups.xml \ up-marshal.list \ $(service_in_files) \ $(dbusconf_in_files) diff --git a/src/org.freedesktop.UPower.service.in b/src/org.freedesktop.UPower.service.in index c15d799..0c30555 100644 --- a/src/org.freedesktop.UPower.service.in +++ b/src/org.freedesktop.UPower.service.in @@ -1,5 +1,5 @@ [D-BUS Service] Name=org.freedesktop.UPower -Exec=@libexecdir@/devkit-power-daemon +Exec=@libexecdir@/upowerd User=root diff --git a/src/up-main.c b/src/up-main.c index 85f1c9a..7fdf20f 100644 --- a/src/up-main.c +++ b/src/up-main.c @@ -178,7 +178,7 @@ main (gint argc, gchar **argv) /* do stuff on ctrl-c */ signal (SIGINT, up_main_sigint_handler); - egg_debug ("Starting devkit-power-daemon version %s", PACKAGE_VERSION); + egg_debug ("Starting upowerd version %s", PACKAGE_VERSION); qos = up_qos_new (); wakeups = up_wakeups_new (); |