summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2010-01-21 14:30:28 +0000
committerRichard Hughes <richard@hughsie.com>2010-01-21 14:30:28 +0000
commitadcb737767d42059ea7ad6d1fbd7184fea1b425e (patch)
tree3d2b6385f9f2417c8ca048a7c8121a9c578683b1 /tools
parent31383d6d83469cca33558a736289f52d9a5e5b8e (diff)
Make the client tool be called upower, but maintain a symlink to devkit-power
Diffstat (limited to 'tools')
-rw-r--r--tools/.gitignore3
-rw-r--r--tools/Makefile.am35
-rw-r--r--tools/up-tool.c1
3 files changed, 8 insertions, 31 deletions
diff --git a/tools/.gitignore b/tools/.gitignore
index 81c8a0c..ca8d160 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1,6 +1,5 @@
.deps
-devkit-power
-devkit-power-on-battery
+upower
*-glue.h
*.o
*-marshal.c
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 554ebae..4eb26e8 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,16 +1,7 @@
## Process this file with automake to produce Makefile.in
INCLUDES = \
- -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
- -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
- -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- -DPACKAGE_BIN_DIR=\""$(bindir)"\" \
- -DPACKAGE_LOCALSTATE_DIR=\""$(localstatedir)"\" \
- -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
- -DPACKAGE_LIB_DIR=\""$(libdir)"\" \
- -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
-DUP_COMPILATION \
- -DUP_DISABLE_DEPRECATED \
-DEGG_LOG_FILE=\""$(UP_LOG_DIR)/DeviceKit-power"\" \
-DEGG_VERBOSE="\"DKP_VERBOSE\"" \
-DEGG_LOGGING="\"DKP_LOGGING\"" \
@@ -23,37 +14,25 @@ INCLUDES = \
DEVKIT_POWER_LIBS = $(top_builddir)/devkit-power-gobject/libdevkit-power-gobject.la
-BUILT_SOURCES = \
- up-daemon-glue.h \
- up-marshal.h up-marshal.c
+bin_PROGRAMS = upower
-up-marshal.h: $(top_srcdir)/src/up-marshal.list
- glib-genmarshal $< --prefix=devkit_power_marshal --header > $@
-
-up-marshal.c: $(top_srcdir)/src/up-marshal.list
- echo "#include \"up-marshal.h\"" > $@ && glib-genmarshal $< --prefix=devkit_power_marshal --body >> $@
-
-up-daemon-glue.h: $(top_srcdir)/src/org.freedesktop.UPower.xml Makefile.am
- dbus-binding-tool --prefix=devkit_power_daemon --mode=glib-client --output=up-daemon-glue.h $(top_srcdir)/src/org.freedesktop.UPower.xml
-
-bin_PROGRAMS = devkit-power
-
-devkit_power_SOURCES = \
+upower_SOURCES = \
egg-debug.c \
egg-debug.h \
up-tool.c \
$(BUILT_SOURCES)
-devkit_power_CPPFLAGS = \
- -DG_LOG_DOMAIN=\"devkit-power\" \
- $(DISABLE_DEPRECATED) \
+upower_CPPFLAGS = \
$(AM_CPPFLAGS)
-devkit_power_LDADD = \
+upower_LDADD = \
$(DBUS_GLIB_LIBS) \
$(DEVKIT_POWER_LIBS) \
$(POLKIT_DBUS_LIBS)
+install-exec-hook:
+ cd $(DESTDIR)$(bindir) && $(LN_S) upower devkit-power
+
CLEANFILES = $(BUILT_SOURCES)
clean-local :
diff --git a/tools/up-tool.c b/tools/up-tool.c
index 92d930d..162a7bc 100644
--- a/tools/up-tool.c
+++ b/tools/up-tool.c
@@ -30,7 +30,6 @@
#include <glib.h>
#include <glib/gi18n-lib.h>
-#include "up-marshal.h"
#include "up-client.h"
#include "up-device.h"
#include "up-wakeups.h"