Merge with trunk

[sojka/lightdm.git] / tests / src / Makefile.am

diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am
index c771a0e4834766c4c6154cb7a0aaebddb7bfa386..7f36ef57b21416a77989a857b360a74d3ccc29dd 100644 (file)
--- a/tests/src/Makefile.am
+++ b/tests/src/Makefile.am
@@ -1,5 +1,17 @@
-noinst_PROGRAMS = dbus-env test-runner X Xvnc test-gobject-greeter test-session test-script-hook guest-account initctl plymouth vnc-client
-dist_noinst_SCRIPTS = lightdm-session test-python-greeter
+noinst_PROGRAMS = dbus-env \
+                  initctl \
+                  plymouth \
+                  test-gobject-greeter \
+                  test-runner \
+                  test-script-hook \
+                  test-session \
+                  guest-account \
+                  unity-system-compositor \
+                  vnc-client \
+                  X \
+                  Xvnc
+dist_noinst_SCRIPTS = lightdm-session \
+                      test-python-greeter
 noinst_LTLIBRARIES = libsystem.la
 
 libsystem_la_SOURCES = libsystem.c
@@ -169,6 +181,17 @@ plymouth_LDADD = \
        $(GLIB_LIBS) \
        $(GIO_UNIX_LIBS)
 
+unity_system_compositor_SOURCES = unity-system-compositor.c status.c status.h
+unity_system_compositor_CFLAGS = \
+       $(WARN_CFLAGS) \
+       $(GLIB_CFLAGS) \
+       $(GIO_CFLAGS) \
+       $(GIO_UNIX_CFLAGS)
+unity_system_compositor_LDADD = \
+       $(GLIB_LIBS) \
+       $(GIO_LIBS) \
+       $(GIO_UNIX_LIBS)
+
 vnc_client_SOURCES = vnc-client.c status.c status.h
 vnc_client_CFLAGS = \
        $(WARN_CFLAGS) \