summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorJonny Lamb <jonnylamb@gnome.org>2009-10-20 14:00:51 +0100
committerJonny Lamb <jonnylamb@gnome.org>2009-10-20 14:00:51 +0100
commit105cc83e67ef41c35998aaaaae8bf18c56be65c0 (patch)
tree03a20a791ba481ddb65f34e1a4a1777b7d534d25 /Makefile.am
parent6496713f0997ab90e7ee686819640b22b4911aea (diff)
parentda500948288ec5e9e675502151e5305bdf063592 (diff)
downloadtelepathy-account-widgets-105cc83e67ef41c35998aaaaae8bf18c56be65c0.tar.gz
Merge branch 'slatez-applets'
Conflicts: Makefile.am configure.ac Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am8
1 files changed, 0 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index 20268959..3ce04575 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,9 @@
SUBDIRS = tools extensions po data libempathy libempathy-gtk src docs help
-if HAVE_MEGAPHONE
-SUBDIRS += megaphone
-endif
-
if HAVE_NST
SUBDIRS += nautilus-sendto-plugin
endif
-if HAVE_NOTHERE
-SUBDIRS += nothere
-endif
-
if HAVE_TESTS
SUBDIRS += tests
endif