summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--configure.in1
-rw-r--r--libdevkit-power/.gitignore11
-rw-r--r--libdevkit-power/Makefile.am25
-rw-r--r--libdevkit-power/dkp-debug.c (renamed from src/dkp-debug.c)0
-rw-r--r--libdevkit-power/dkp-debug.h (renamed from src/dkp-debug.h)0
-rw-r--r--libdevkit-power/dkp-enum.c (renamed from src/dkp-enum.c)0
-rw-r--r--libdevkit-power/dkp-enum.h (renamed from src/dkp-enum.h)0
-rw-r--r--libdevkit-power/dkp-object.c (renamed from src/dkp-object.c)0
-rw-r--r--libdevkit-power/dkp-object.h (renamed from src/dkp-object.h)0
-rw-r--r--src/Makefile.am7
-rw-r--r--tools/Makefile.am7
-rw-r--r--tools/dkp-tool.c4
13 files changed, 48 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 34fc235..a1a3eb9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = src doc tools policy po
+SUBDIRS = libdevkit-power src doc tools policy po
# Creating ChangeLog from git log (taken from cairo/Makefile.am):
ChangeLog: $(srcdir)/ChangeLog
diff --git a/configure.in b/configure.in
index bbad90f..af72717 100644
--- a/configure.in
+++ b/configure.in
@@ -145,6 +145,7 @@ doc/version.xml
doc/man/Makefile
doc/dbus/Makefile
policy/Makefile
+libdevkit-power/Makefile
po/Makefile.in
])
diff --git a/libdevkit-power/.gitignore b/libdevkit-power/.gitignore
new file mode 100644
index 0000000..e9199c5
--- /dev/null
+++ b/libdevkit-power/.gitignore
@@ -0,0 +1,11 @@
+.deps
+.libs
+*.o
+*.la
+*.lo
+*-marshal.c
+*-marshal.h
+*.gcov
+*.gcda
+*.gcno
+
diff --git a/libdevkit-power/Makefile.am b/libdevkit-power/Makefile.am
new file mode 100644
index 0000000..e3e0f8b
--- /dev/null
+++ b/libdevkit-power/Makefile.am
@@ -0,0 +1,25 @@
+INCLUDES = \
+ $(GLIB_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ -I$(top_srcdir)/libdevkit-power \
+ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+
+noinst_LTLIBRARIES = \
+ libdevkit-power.la
+
+libdevkit_power_la_SOURCES = \
+ dkp-debug.c \
+ dkp-debug.h \
+ dkp-enum.c \
+ dkp-enum.h \
+ dkp-object.c \
+ dkp-object.h
+
+libdevkit_power_la_LIBADD = $(INTLLIBS) $(GLIB_LIBS)
+
+clean-local:
+ rm -f *~
+
+CLEANFILES = $(BUILT_SOURCES)
+
diff --git a/src/dkp-debug.c b/libdevkit-power/dkp-debug.c
index bf3f12e..bf3f12e 100644
--- a/src/dkp-debug.c
+++ b/libdevkit-power/dkp-debug.c
diff --git a/src/dkp-debug.h b/libdevkit-power/dkp-debug.h
index 8f05c01..8f05c01 100644
--- a/src/dkp-debug.h
+++ b/libdevkit-power/dkp-debug.h
diff --git a/src/dkp-enum.c b/libdevkit-power/dkp-enum.c
index 26fd788..26fd788 100644
--- a/src/dkp-enum.c
+++ b/libdevkit-power/dkp-enum.c
diff --git a/src/dkp-enum.h b/libdevkit-power/dkp-enum.h
index 6565566..6565566 100644
--- a/src/dkp-enum.h
+++ b/libdevkit-power/dkp-enum.h
diff --git a/src/dkp-object.c b/libdevkit-power/dkp-object.c
index c76e0f6..c76e0f6 100644
--- a/src/dkp-object.c
+++ b/libdevkit-power/dkp-object.c
diff --git a/src/dkp-object.h b/libdevkit-power/dkp-object.h
index 07fb3dd..07fb3dd 100644
--- a/src/dkp-object.h
+++ b/libdevkit-power/dkp-object.h
diff --git a/src/Makefile.am b/src/Makefile.am
index ff767a4..c2f8abd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,11 +10,14 @@ INCLUDES = \
-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
-DPACKAGE_LIB_DIR=\""$(libdir)"\" \
-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
+ -I$(top_srcdir)/libdevkit-power \
$(DBUS_GLIB_CFLAGS) \
$(POLKIT_DBUS_CFLAGS) \
$(DEVKIT_CFLAGS) \
$(GLIB_CFLAGS)
+DEVKIT_POWER_LIBS = $(top_builddir)/libdevkit-power/libdevkit-power.la
+
BUILT_SOURCES = \
dkp-daemon-glue.h \
dkp-source-glue.h \
@@ -41,9 +44,6 @@ 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 \
- dkp-debug.h dkp-debug.c \
- dkp-object.h dkp-object.c \
sysfs-utils.h sysfs-utils.c \
main.c \
$(BUILT_SOURCES)
@@ -57,6 +57,7 @@ devkit_power_daemon_CPPFLAGS = \
devkit_power_daemon_LDADD = \
$(DBUS_GLIB_LIBS) \
$(POLKIT_DBUS_LIBS) \
+ $(DEVKIT_POWER_LIBS) \
$(DEVKIT_LIBS)
servicedir = $(datadir)/dbus-1/system-services
diff --git a/tools/Makefile.am b/tools/Makefile.am
index ef483bc..0f8143f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -10,10 +10,13 @@ INCLUDES = \
-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
-DPACKAGE_LIB_DIR=\""$(libdir)"\" \
-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
+ -I$(top_srcdir)/libdevkit-power \
$(DBUS_GLIB_CFLAGS) \
$(POLKIT_DBUS_CFLAGS) \
$(GLIB_CFLAGS)
+DEVKIT_POWER_LIBS = $(top_builddir)/libdevkit-power/libdevkit-power.la
+
BUILT_SOURCES = \
dkp-daemon-glue.h \
dkp-marshal.h dkp-marshal.c
@@ -31,9 +34,6 @@ bin_PROGRAMS = devkit-power
devkit_power_SOURCES = \
dkp-tool.c \
- ../src/dkp-debug.h ../src/dkp-debug.c \
- ../src/dkp-object.h ../src/dkp-object.c \
- ../src/dkp-enum.h ../src/dkp-enum.c \
$(BUILT_SOURCES)
@@ -44,6 +44,7 @@ devkit_power_CPPFLAGS = \
devkit_power_LDADD = \
$(DBUS_GLIB_LIBS) \
+ $(DEVKIT_POWER_LIBS) \
$(POLKIT_DBUS_LIBS)
CLEANFILES = $(BUILT_SOURCES)
diff --git a/tools/dkp-tool.c b/tools/dkp-tool.c
index 14f3f1a..f7dfb66 100644
--- a/tools/dkp-tool.c
+++ b/tools/dkp-tool.c
@@ -46,8 +46,8 @@
#include "dkp-daemon-glue.h"
#include "dkp-marshal.h"
-#include "../src/dkp-debug.h"
-#include "../src/dkp-object.h"
+#include "dkp-debug.h"
+#include "dkp-object.h"
static DBusGConnection *bus = NULL;
static DBusGProxy *power_proxy = NULL;