of course, the right thing to do is make a static lib to avoid playing with ../src/ type paths

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

configure.in

@@ -145,6 +145,7 @@ doc/version.xml
 doc/man/Makefile
 doc/dbus/Makefile
 policy/Makefile
+libdevkit-power/Makefile
 po/Makefile.in
 ])
 

libdevkit-power/.gitignore

@@ -0,0 +1,11 @@
+.deps
+.libs
+*.o
+*.la
+*.lo
+*-marshal.c
+*-marshal.h
+*.gcov
+*.gcda
+*.gcno
+

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)
+

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

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)

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;