6 files changed, 30 insertions, 54 deletions
diff --git a/daemon/control/Makefile.am b/daemon/control/Makefile.am
index 4df8cfd2..0840e780 100644
--- a/daemon/control/Makefile.am
+++ b/daemon/control/Makefile.am
@@ -1,74 +1,50 @@
 
-INCLUDES= \
-	-DPREFIX=\""$(prefix)"\" \
-	-DBINDIR=\""$(bindir)"\" \
-	-DLIBEXECDIR=\""$(libexecdir)"\" \
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/daemon \
-	-I$(top_builddir) \
-	$(GLIB_CFLAGS)
-
-LIBS = \
-	$(GLIB_LIBS) \
-	$(GTHREAD_LIBS) \
-	$(P11_TESTS_LIBS)
 
 # ------------------------------------------------------------------
 # DAEMON CODE
 
-noinst_LTLIBRARIES = \
+noinst_LTLIBRARIES += \
 	libgkd-control.la \
 	libgkd-control-client.la
 
 libgkd_control_la_SOURCES = \
-	gkd-control-server.c gkd-control-client.c \
-	gkd-control.h gkd-control-codes.h
+	daemon/control/gkd-control-server.c \
+	daemon/control/gkd-control-client.c \
+	daemon/control/gkd-control.h \
+	daemon/control/gkd-control-codes.h
 
 libgkd_control_client_la_SOURCES = \
-	gkd-control-client.c gkd-control.h
+	daemon/control/gkd-control-client.c \
+	daemon/control/gkd-control.h
 
 # -------------------------------------------------------------------
 # TESTS
 
-noinst_PROGRAMS= \
+noinst_PROGRAMS += \
 	frob-control-change \
 	frob-control-init \
 	frob-control-unlock \
 	frob-control-quit
 
-frob_control_change_SOURCES = \
-	frob-control-change.c
+control_LIBS = \
+	libgkd-control-client.la \
+	libegg-buffer.la \
+	libegg-creds.la \
+	libegg-secure.la \
+	$(GLIB_LIBS)
 
-frob_control_change_LDADD = \
-	$(top_builddir)/daemon/control/libgkd-control-client.la \
-	$(top_builddir)/egg/libegg-buffer.la \
-	$(top_builddir)/egg/libegg-creds.la \
-	$(top_builddir)/egg/libegg-secure.la
+frob_control_change_SOURCES = \
+	daemon/control/frob-control-change.c
+frob_control_change_LDADD = $(control_LIBS)
 
 frob_control_init_SOURCES = \
-	frob-control-init.c
-
-frob_control_init_LDADD = \
-	$(top_builddir)/daemon/control/libgkd-control-client.la \
-	$(top_builddir)/egg/libegg-buffer.la \
-	$(top_builddir)/egg/libegg-creds.la \
-	$(top_builddir)/egg/libegg-secure.la
+	daemon/control/frob-control-init.c
+frob_control_init_LDADD =  $(control_LIBS)
 
 frob_control_quit_SOURCES = \
-	frob-control-quit.c
-
-frob_control_quit_LDADD = \
-	$(top_builddir)/daemon/control/libgkd-control-client.la \
-	$(top_builddir)/egg/libegg-buffer.la \
-	$(top_builddir)/egg/libegg-creds.la \
-	$(top_builddir)/egg/libegg-secure.la
+	daemon/control/frob-control-quit.c
+frob_control_quit_LDADD =  $(control_LIBS)
 
 frob_control_unlock_SOURCES = \
-	frob-control-unlock.c
-
-frob_control_unlock_LDADD = \
-	$(top_builddir)/daemon/control/libgkd-control-client.la \
-	$(top_builddir)/egg/libegg-buffer.la \
-	$(top_builddir)/egg/libegg-creds.la \
-	$(top_builddir)/egg/libegg-secure.la
-\ No newline at end of file
+	daemon/control/frob-control-unlock.c
+frob_control_unlock_LDADD =  $(control_LIBS)
diff --git a/daemon/control/frob-control-change.c b/daemon/control/frob-control-change.c
index 2fa6b4c8..28269369 100644
--- a/daemon/control/frob-control-change.c
+++ b/daemon/control/frob-control-change.c
@@ -1,5 +1,5 @@
 
-#include "control/gkd-control.h"
+#include "gkd-control.h"
 
 #include "egg/egg-secure-memory.h"
 
diff --git a/daemon/control/frob-control-init.c b/daemon/control/frob-control-init.c
index 88149bed..34f5a56f 100644
--- a/daemon/control/frob-control-init.c
+++ b/daemon/control/frob-control-init.c
@@ -1,5 +1,5 @@
 
-#include "control/gkd-control.h"
+#include "gkd-control.h"
 
 #include "egg/egg-secure-memory.h"
 
diff --git a/daemon/control/frob-control-quit.c b/daemon/control/frob-control-quit.c
index a2ade3a7..5b32de41 100644
--- a/daemon/control/frob-control-quit.c
+++ b/daemon/control/frob-control-quit.c
@@ -1,5 +1,5 @@
 
-#include "control/gkd-control.h"
+#include "gkd-control.h"
 
 #include "egg/egg-secure-memory.h"
 
diff --git a/daemon/control/frob-control-unlock.c b/daemon/control/frob-control-unlock.c
index 6a448011..b93f341b 100644
--- a/daemon/control/frob-control-unlock.c
+++ b/daemon/control/frob-control-unlock.c
@@ -1,5 +1,5 @@
 
-#include "control/gkd-control.h"
+#include "gkd-control.h"
 
 #include "egg/egg-secure-memory.h"
 
diff --git a/daemon/control/gkd-control-server.c b/daemon/control/gkd-control-server.c
index 07795170..9966e979 100644
--- a/daemon/control/gkd-control-server.c
+++ b/daemon/control/gkd-control-server.c
@@ -23,15 +23,15 @@
 #include "gkd-control.h"
 #include "gkd-control-codes.h"
 
-#include "gkd-main.h"
-#include "gkd-util.h"
+#include "daemon/gkd-main.h"
+#include "daemon/gkd-util.h"
 
 #include "egg/egg-buffer.h"
 #include "egg/egg-cleanup.h"
 #include "egg/egg-secure-memory.h"
 #include "egg/egg-unix-credentials.h"
 
-#include "login/gkd-login.h"
+#include "daemon/login/gkd-login.h"
 
 #include <errno.h>
 #include <fcntl.h>