summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorStef Walter <stefw@collabora.co.uk>2011-03-01 15:33:57 +0100
committerStef Walter <stefw@collabora.co.uk>2011-03-01 15:33:57 +0100
commit8eca0e1b0b144c5d7a2c697141dd93889acaaaa8 (patch)
treeb57964a3deaec7e46d9bb2914ca91c6464b0fff2 /Makefile.am
parent7bc2e44479884a0c41a5f8490ec750e5bfa3cf8b (diff)
Make building the salut plugin optional, and rename dir.
* Make building the salut plugin optional, since upstream telepathy-salut doesn't have plugin support. * Rename 'src' to 'salut' directory.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am9
1 files changed, 8 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index af437a6..a2e1dad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,8 @@
-SUBDIRS = src
+
+if WITH_SALUT
+SALUT_DIR = salut
+else
+SALUT_DIR =
+endif
+
+SUBDIRS = $(SALUT_DIR) \ No newline at end of file