build-sys: move user/system to respective dir

Signed-off-by: Victor Toso <victortoso@redhat.com>
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>

21 files changed, 31 insertions, 26 deletions

diff --git a/Makefile.am b/Makefile.am
index 9930450..861d806 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,11 +4,19 @@ NULL =
 bin_PROGRAMS = src/spice-vdagent
 sbin_PROGRAMS = src/spice-vdagentd
 
+common_sources =				\
+	src/udscs.c				\
+	src/udscs.h				\
+	src/vdagentd-proto-strings.h		\
+	src/vdagentd-proto.h			\
+	$(NULL)
+
 src_spice_vdagent_CFLAGS =			\
 	$(X_CFLAGS)				\
 	$(SPICE_CFLAGS)				\
 	$(GLIB2_CFLAGS)				\
 	$(ALSA_CFLAGS)				\
+	-I$(srcdir)/src				\
 	-DUDSCS_NO_SERVER			\
 	$(NULL)
 
@@ -20,17 +28,16 @@ src_spice_vdagent_LDADD =			\
 	$(NULL)
 
 src_spice_vdagent_SOURCES =			\
-	src/udscs.c				\
-	src/udscs.h				\
-	src/vdagent-audio.c			\
-	src/vdagent-audio.h			\
-	src/vdagent-file-xfers.c		\
-	src/vdagent-file-xfers.h		\
-	src/vdagent-x11-priv.h			\
-	src/vdagent-x11-randr.c			\
-	src/vdagent-x11.c			\
-	src/vdagent-x11.h			\
-	src/vdagent.c				\
+	$(common_sources)			\
+	src/vdagent/vdagent-audio.c		\
+	src/vdagent/vdagent-audio.h		\
+	src/vdagent/vdagent-file-xfers.c	\
+	src/vdagent/vdagent-file-xfers.h	\
+	src/vdagent/vdagent-x11-priv.h		\
+	src/vdagent/vdagent-x11-randr.c		\
+	src/vdagent/vdagent-x11.c		\
+	src/vdagent/vdagent-x11.h		\
+	src/vdagent/vdagent.c			\
 	$(NULL)
 
 src_spice_vdagentd_CFLAGS =			\
@@ -40,6 +47,7 @@ src_spice_vdagentd_CFLAGS =			\
 	$(SPICE_CFLAGS)				\
 	$(GLIB2_CFLAGS)				\
 	$(PIE_CFLAGS)				\
+	-I$(srcdir)/src				\
 	$(NULL)
 
 src_spice_vdagentd_LDADD =			\
@@ -52,27 +60,24 @@ src_spice_vdagentd_LDADD =			\
 	$(NULL)
 
 src_spice_vdagentd_SOURCES =			\
-	src/vdagentd.c				\
-	src/session-info.h			\
-	src/vdagentd-proto-strings.h		\
-	src/vdagentd-proto.h			\
-	src/vdagentd-uinput.c			\
-	src/vdagentd-uinput.h			\
-	src/vdagentd-xorg-conf.c		\
-	src/vdagentd-xorg-conf.h		\
-	src/vdagent-virtio-port.c		\
-	src/vdagent-virtio-port.h		\
-	src/udscs.c				\
-	src/udscs.h				\
+	$(common_sources)			\
+	src/vdagentd/vdagentd.c			\
+	src/vdagentd/session-info.h		\
+	src/vdagentd/vdagentd-uinput.c		\
+	src/vdagentd/vdagentd-uinput.h		\
+	src/vdagentd/vdagentd-xorg-conf.c	\
+	src/vdagentd/vdagentd-xorg-conf.h	\
+	src/vdagentd/vdagent-virtio-port.c	\
+	src/vdagentd/vdagent-virtio-port.h	\
 	$(NULL)
 
 if HAVE_CONSOLE_KIT
-src_spice_vdagentd_SOURCES += src/console-kit.c
+src_spice_vdagentd_SOURCES += src/vdagentd/console-kit.c
 else
 if HAVE_LIBSYSTEMD_LOGIN
-src_spice_vdagentd_SOURCES += src/systemd-login.c
+src_spice_vdagentd_SOURCES += src/vdagentd/systemd-login.c
 else
-src_spice_vdagentd_SOURCES += src/dummy-session-info.c
+src_spice_vdagentd_SOURCES += src/vdagentd/dummy-session-info.c
 endif
 endif
 
diff --git a/src/vdagent-audio.c b/src/vdagent/vdagent-audio.c
index 6b11cd8..6b11cd8 100644
--- a/src/vdagent-audio.c
+++ b/src/vdagent/vdagent-audio.c
diff --git a/src/vdagent-audio.h b/src/vdagent/vdagent-audio.h
index 6f29d4b..6f29d4b 100644
--- a/src/vdagent-audio.h
+++ b/src/vdagent/vdagent-audio.h
diff --git a/src/vdagent-file-xfers.c b/src/vdagent/vdagent-file-xfers.c
index 48b3069..48b3069 100644
--- a/src/vdagent-file-xfers.c
+++ b/src/vdagent/vdagent-file-xfers.c
diff --git a/src/vdagent-file-xfers.h b/src/vdagent/vdagent-file-xfers.h
index 28a71fd..28a71fd 100644
--- a/src/vdagent-file-xfers.h
+++ b/src/vdagent/vdagent-file-xfers.h
diff --git a/src/vdagent-x11-priv.h b/src/vdagent/vdagent-x11-priv.h
index d60cc07..d60cc07 100644
--- a/src/vdagent-x11-priv.h
+++ b/src/vdagent/vdagent-x11-priv.h
diff --git a/src/vdagent-x11-randr.c b/src/vdagent/vdagent-x11-randr.c
index 02089b2..02089b2 100644
--- a/src/vdagent-x11-randr.c
+++ b/src/vdagent/vdagent-x11-randr.c
diff --git a/src/vdagent-x11.c b/src/vdagent/vdagent-x11.c
index da27602..da27602 100644
--- a/src/vdagent-x11.c
+++ b/src/vdagent/vdagent-x11.c
diff --git a/src/vdagent-x11.h b/src/vdagent/vdagent-x11.h
index e67701e..e67701e 100644
--- a/src/vdagent-x11.h
+++ b/src/vdagent/vdagent-x11.h
diff --git a/src/vdagent.c b/src/vdagent/vdagent.c
index a3cdd9b..a3cdd9b 100644
--- a/src/vdagent.c
+++ b/src/vdagent/vdagent.c
diff --git a/src/console-kit.c b/src/vdagentd/console-kit.c
index 024a260..024a260 100644
--- a/src/console-kit.c
+++ b/src/vdagentd/console-kit.c
diff --git a/src/dummy-session-info.c b/src/vdagentd/dummy-session-info.c
index 8ffe5e4..8ffe5e4 100644
--- a/src/dummy-session-info.c
+++ b/src/vdagentd/dummy-session-info.c
diff --git a/src/session-info.h b/src/vdagentd/session-info.h
index c8edb86..c8edb86 100644
--- a/src/session-info.h
+++ b/src/vdagentd/session-info.h
diff --git a/src/systemd-login.c b/src/vdagentd/systemd-login.c
index 9719c0b..9719c0b 100644
--- a/src/systemd-login.c
+++ b/src/vdagentd/systemd-login.c
diff --git a/src/vdagent-virtio-port.c b/src/vdagentd/vdagent-virtio-port.c
index 6267c74..6267c74 100644
--- a/src/vdagent-virtio-port.c
+++ b/src/vdagentd/vdagent-virtio-port.c
diff --git a/src/vdagent-virtio-port.h b/src/vdagentd/vdagent-virtio-port.h
index ac766bd..ac766bd 100644
--- a/src/vdagent-virtio-port.h
+++ b/src/vdagentd/vdagent-virtio-port.h
diff --git a/src/vdagentd-uinput.c b/src/vdagentd/vdagentd-uinput.c
index 5a70530..5a70530 100644
--- a/src/vdagentd-uinput.c
+++ b/src/vdagentd/vdagentd-uinput.c
diff --git a/src/vdagentd-uinput.h b/src/vdagentd/vdagentd-uinput.h
index cf1d8eb..cf1d8eb 100644
--- a/src/vdagentd-uinput.h
+++ b/src/vdagentd/vdagentd-uinput.h
diff --git a/src/vdagentd-xorg-conf.c b/src/vdagentd/vdagentd-xorg-conf.c
index 5992897..5992897 100644
--- a/src/vdagentd-xorg-conf.c
+++ b/src/vdagentd/vdagentd-xorg-conf.c
diff --git a/src/vdagentd-xorg-conf.h b/src/vdagentd/vdagentd-xorg-conf.h
index 9934359..9934359 100644
--- a/src/vdagentd-xorg-conf.h
+++ b/src/vdagentd/vdagentd-xorg-conf.h
diff --git a/src/vdagentd.c b/src/vdagentd/vdagentd.c
index a699681..a699681 100644
--- a/src/vdagentd.c
+++ b/src/vdagentd/vdagentd.c