Commit adcb7377 authored by Richard Hughes's avatar Richard Hughes

Make the client tool be called upower, but maintain a symlink to devkit-power

parent 31383d6d
......@@ -3,4 +3,5 @@ POTFILES
stamp-it
.intltool-merge-cache
*.pot
*.gmo
.deps
devkit-power
devkit-power-on-battery
upower
*-glue.h
*.o
*-marshal.c
......
## 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 :
......
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment