Commit d2c0ee64 authored by Richard Hughes's avatar Richard Hughes

move the library directory from libdevkit-power to devkit-power-gobject

parent 5259367a
## Process this file with automake to produce Makefile.in
SUBDIRS = libdevkit-power src doc tools policy po
SUBDIRS = devkit-power-gobject src doc tools policy po
# Creating ChangeLog from git log (taken from cairo/Makefile.am):
ChangeLog: $(srcdir)/ChangeLog
......
......@@ -158,7 +158,7 @@ doc/version.xml
doc/man/Makefile
doc/dbus/Makefile
policy/Makefile
libdevkit-power/Makefile
devkit-power-gobject/Makefile
po/Makefile.in
])
......
......@@ -2,7 +2,7 @@ INCLUDES = \
$(GLIB_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/libdevkit-power \
-I$(top_srcdir)/devkit-power-gobject \
-DDKP_COMPILATION \
-DEGG_LOG_FILE=\""$(DKP_LOG_DIR)/DeviceKit-power"\" \
-DEGG_VERBOSE="\"DKP_VERBOSE\"" \
......@@ -12,9 +12,9 @@ INCLUDES = \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
noinst_LTLIBRARIES = \
libdevkit-power.la
libdevkit-power-gobject.la
libdevkit_power_la_SOURCES = \
libdevkit_power_gobject_la_SOURCES = \
egg-debug.c \
egg-debug.h \
egg-string.c \
......@@ -37,7 +37,7 @@ libdevkit_power_la_SOURCES = \
dkp-enum.c \
dkp-enum.h
libdevkit_power_la_LIBADD = $(INTLLIBS) $(GLIB_LIBS) $(DBUS_GLIB_LIBS)
libdevkit_power_gobject_la_LIBADD = $(INTLLIBS) $(GLIB_LIBS) $(DBUS_GLIB_LIBS)
clean-local:
......
......@@ -27,8 +27,8 @@
#define __DKP_CLIENT_H
#include <glib-object.h>
#include <libdevkit-power/dkp-enum.h>
#include <libdevkit-power/dkp-device.h>
#include <devkit-power-gobject/dkp-enum.h>
#include <devkit-power-gobject/dkp-device.h>
G_BEGIN_DECLS
......
......@@ -27,7 +27,7 @@
#define __DKP_DEVICE_H
#include <glib-object.h>
#include <libdevkit-power/dkp-enum.h>
#include <devkit-power-gobject/dkp-enum.h>
G_BEGIN_DECLS
......
......@@ -26,7 +26,7 @@
#define __DKP_HISTORY_OBJ_H__
#include <glib.h>
#include <libdevkit-power/dkp-enum.h>
#include <devkit-power-gobject/dkp-enum.h>
G_BEGIN_DECLS
......
......@@ -26,7 +26,7 @@
#define __DKP_QOS_OBJ_H__
#include <glib.h>
#include <libdevkit-power/dkp-enum.h>
#include <devkit-power-gobject/dkp-enum.h>
G_BEGIN_DECLS
......
......@@ -26,7 +26,7 @@
#define __DKP_STATS_OBJ_H__
#include <glib.h>
#include <libdevkit-power/dkp-enum.h>
#include <devkit-power-gobject/dkp-enum.h>
G_BEGIN_DECLS
......
......@@ -26,7 +26,7 @@
#define __DKP_WAKEUPS_OBJ_H__
#include <glib.h>
#include <libdevkit-power/dkp-enum.h>
#include <devkit-power-gobject/dkp-enum.h>
G_BEGIN_DECLS
......
......@@ -27,9 +27,9 @@
#define __DKP_WAKEUPS_H
#include <glib-object.h>
#include <libdevkit-power/dkp-enum.h>
#include <libdevkit-power/dkp-device.h>
#include <libdevkit-power/dkp-wakeups-obj.h>
#include <devkit-power-gobject/dkp-enum.h>
#include <devkit-power-gobject/dkp-device.h>
#include <devkit-power-gobject/dkp-wakeups-obj.h>
G_BEGIN_DECLS
......
......@@ -15,7 +15,7 @@ INCLUDES = \
-DEGG_VERBOSE="\"DKP_VERBOSE\"" \
-DEGG_LOGGING="\"DKP_LOGGING\"" \
-DEGG_CONSOLE="\"DKP_CONSOLE\"" \
-I$(top_srcdir)/libdevkit-power \
-I$(top_srcdir)/devkit-power-gobject \
-I$(top_srcdir) \
$(GIO_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
......@@ -23,7 +23,7 @@ INCLUDES = \
$(DEVKIT_CFLAGS) \
$(GLIB_CFLAGS)
DEVKIT_POWER_LIBS = $(top_builddir)/libdevkit-power/libdevkit-power.la
DEVKIT_POWER_LIBS = $(top_builddir)/devkit-power-gobject/libdevkit-power-gobject.la
BUILT_SOURCES = \
dkp-daemon-glue.h \
......
......@@ -15,12 +15,12 @@ INCLUDES = \
-DEGG_LOGGING="\"DKP_LOGGING\"" \
-DEGG_CONSOLE="\"DKP_CONSOLE\"" \
-I$(top_srcdir) \
-I$(top_srcdir)/libdevkit-power \
-I$(top_srcdir)/devkit-power-gobject \
$(DBUS_GLIB_CFLAGS) \
$(POLKIT_DBUS_CFLAGS) \
$(GLIB_CFLAGS)
DEVKIT_POWER_LIBS = $(top_builddir)/libdevkit-power/libdevkit-power.la
DEVKIT_POWER_LIBS = $(top_builddir)/devkit-power-gobject/libdevkit-power-gobject.la
BUILT_SOURCES = \
dkp-daemon-glue.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