rename some source files

This commit is contained in:
Richard Hughes 2008-08-01 11:10:50 +01:00
parent 7e4c0100ba
commit 3bb6d08e29
8 changed files with 43 additions and 41 deletions

View file

@ -15,46 +15,46 @@ INCLUDES = \
$(DEVKIT_CFLAGS) \
$(GLIB_CFLAGS)
BUILT_SOURCES = \
devkit-power-daemon-glue.h \
devkit-power-source-glue.h \
devkit-power-marshal.h devkit-power-marshal.c
BUILT_SOURCES = \
dkp-daemon-glue.h \
dkp-source-glue.h \
dkp-marshal.h dkp-marshal.c
devkit-power-marshal.h: devkit-power-marshal.list
dkp-marshal.h: dkp-marshal.list
glib-genmarshal $< --prefix=devkit_power_marshal --header > $@
devkit-power-marshal.c: devkit-power-marshal.list
echo "#include \"devkit-power-marshal.h\"" > $@ && glib-genmarshal $< --prefix=devkit_power_marshal --body >> $@
dkp-marshal.c: dkp-marshal.list
echo "#include \"dkp-marshal.h\"" > $@ && glib-genmarshal $< --prefix=devkit_power_marshal --body >> $@
devkit-power-daemon-glue.h: org.freedesktop.DeviceKit.Power.xml Makefile.am
dbus-binding-tool --prefix=devkit_power_daemon --mode=glib-server --output=devkit-power-daemon-glue.h org.freedesktop.DeviceKit.Power.xml
dkp-daemon-glue.h: org.freedesktop.DeviceKit.Power.xml Makefile.am
dbus-binding-tool --prefix=devkit_power_daemon --mode=glib-server --output=dkp-daemon-glue.h org.freedesktop.DeviceKit.Power.xml
devkit-power-source-glue.h: org.freedesktop.DeviceKit.Power.Source.xml Makefile.am
dbus-binding-tool --prefix=devkit_power_source --mode=glib-server --output=devkit-power-source-glue.h org.freedesktop.DeviceKit.Power.Source.xml
dkp-source-glue.h: org.freedesktop.DeviceKit.Power.Source.xml Makefile.am
dbus-binding-tool --prefix=devkit_power_source --mode=glib-server --output=dkp-source-glue.h org.freedesktop.DeviceKit.Power.Source.xml
libexec_PROGRAMS = devkit-power-daemon
dbusifdir = $(datadir)/dbus-1/interfaces
dbusif_DATA = org.freedesktop.DeviceKit.Power.xml org.freedesktop.DeviceKit.Power.Source.xml
devkit_power_daemon_SOURCES = \
devkit-power-daemon.h devkit-power-daemon.c \
devkit-power-device.h devkit-power-device.c \
devkit-power-source.h devkit-power-source.c \
devkit-power-enum.h devkit-power-enum.c \
sysfs-utils.h sysfs-utils.c \
main.c \
devkit_power_daemon_SOURCES = \
dkp-daemon.h dkp-daemon.c \
dkp-device.h dkp-device.c \
dkp-source.h dkp-source.c \
dkp-enum.h dkp-enum.c \
sysfs-utils.h sysfs-utils.c \
main.c \
$(BUILT_SOURCES)
devkit_power_daemon_CPPFLAGS = \
-I$(top_srcdir)/src \
-DG_LOG_DOMAIN=\"devkit-power-daemon\" \
$(DISABLE_DEPRECATED) \
devkit_power_daemon_CPPFLAGS = \
-I$(top_srcdir)/src \
-DG_LOG_DOMAIN=\"dkp-daemon\" \
$(DISABLE_DEPRECATED) \
$(AM_CPPFLAGS)
devkit_power_daemon_LDADD = \
$(DBUS_GLIB_LIBS) \
$(POLKIT_DBUS_LIBS) \
devkit_power_daemon_LDADD = \
$(DBUS_GLIB_LIBS) \
$(POLKIT_DBUS_LIBS) \
$(DEVKIT_LIBS)
servicedir = $(datadir)/dbus-1/system-services
@ -75,9 +75,10 @@ CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = org.freedesktop.DeviceKit.Power.xml \
org.freedesktop.DeviceKit.Power.Source.xml \
devkit-power-marshal.list \
dkp-marshal.list \
$(service_in_files) \
$(dbusconf_in_files)
clean-local :
rm -f *~ $(service_DATA) $(dbusconf_DATA)

View file

@ -31,11 +31,11 @@
#include <dbus/dbus-glib-lowlevel.h>
#include <devkit-gobject.h>
#include "devkit-power-daemon.h"
#include "devkit-power-device.h"
#include "dkp-daemon.h"
#include "dkp-device.h"
#include "devkit-power-daemon-glue.h"
#include "devkit-power-marshal.h"
#include "dkp-daemon-glue.h"
#include "dkp-marshal.h"
/*--------------------------------------------------------------------------------------------------------------*/

View file

@ -34,8 +34,8 @@
#include <polkit-dbus/polkit-dbus.h>
#include "sysfs-utils.h"
#include "devkit-power-device.h"
#include "devkit-power-source.h"
#include "dkp-device.h"
#include "dkp-source.h"
static void devkit_power_device_class_init (DevkitPowerDeviceClass *klass);
static void devkit_power_device_init (DevkitPowerDevice *seat);

View file

@ -25,7 +25,7 @@
#include <polkit-dbus/polkit-dbus.h>
#include <devkit-gobject.h>
#include "devkit-power-daemon.h"
#include "dkp-daemon.h"
G_BEGIN_DECLS

View file

@ -20,7 +20,8 @@
*/
#include <glib.h>
#include "devkit-power-enum.h"
#include <strings.h>
#include "dkp-enum.h"
const char *
devkit_power_convert_type_to_text (DevkitPowerType type_enum)

View file

@ -36,12 +36,12 @@
#include <polkit-dbus/polkit-dbus.h>
#include "sysfs-utils.h"
#include "devkit-power-enum.h"
#include "devkit-power-source.h"
#include "devkit-power-marshal.h"
#include "dkp-enum.h"
#include "dkp-source.h"
#include "dkp-marshal.h"
/*--------------------------------------------------------------------------------------------------------------*/
#include "devkit-power-source-glue.h"
#include "dkp-source-glue.h"
#define DK_POWER_MIN_CHARGED_PERCENTAGE 60

View file

@ -25,8 +25,8 @@
#include <polkit-dbus/polkit-dbus.h>
#include <devkit-gobject.h>
#include "devkit-power-daemon.h"
#include "devkit-power-device.h"
#include "dkp-daemon.h"
#include "dkp-device.h"
G_BEGIN_DECLS

View file

@ -38,7 +38,7 @@
#include <dbus/dbus-glib-lowlevel.h>
#include <devkit-gobject.h>
#include "devkit-power-daemon.h"
#include "dkp-daemon.h"
#define NAME_TO_CLAIM "org.freedesktop.DeviceKit.Power"