X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=Makefile.am;h=c1bed60f6a37a96b60a5da004bdaa7775f8f9ca2;hp=20268959583e0d5f41e4505c7f18a16fcda588b9;hb=8d014e2a3b73644a51fa341a036a6df0221bc66d;hpb=6496713f0997ab90e7ee686819640b22b4911aea

diff --git a/Makefile.am b/Makefile.am
index 20268959..c1bed60f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,34 +1,30 @@
-SUBDIRS = tools extensions po data libempathy libempathy-gtk src docs help
+MY_SUBDIRS = tools extensions po data telepathy-yell libempathy libempathy-gtk src help tests
+NST_SUBDIRS = nautilus-sendto-plugin
 
-if HAVE_MEGAPHONE
-SUBDIRS += megaphone
-endif
-
-if HAVE_NST
-SUBDIRS += nautilus-sendto-plugin
-endif
+DIST_SUBDIRS = $(MY_SUBDIRS) $(NST_SUBDIRS)
 
-if HAVE_NOTHERE
-SUBDIRS += nothere
-endif
+SUBDIRS = $(MY_SUBDIRS)
 
-if HAVE_TESTS
-SUBDIRS += tests
+if HAVE_NST
+SUBDIRS += $(NST_SUBDIRS)
 endif
 
 ACLOCAL_AMFLAGS = -I m4
 
 DISTCHECK_CONFIGURE_FLAGS =		\
 	--disable-scrollkeeper		\
-	--disable-schemas-install	\
-	--enable-gtk-doc
+	--disable-schemas-install
 
 EXTRA_DIST = 			\
-        ChangeLog               \
-        ChangeLog.old           \
-        README                  \
-	CONTRIBUTORS		\
-	autogen.sh
+        CONTRIBUTORS \
+        COPYING-DOCS \
+        COPYING.LGPL \
+        COPYING.SHARE-ALIKE \
+        ChangeLog \
+        ChangeLog.old \
+        README \
+        autogen.sh \
+        $(NULL)
 
 DISTCLEANFILES = 		\
         ChangeLog
@@ -38,7 +34,7 @@ DISTCLEANFILES = 		\
 distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper'
 
 distclean-local:
-	if test "x$(srdcir)" = "x."; then :; else \
+	if test "x$(srcdir)" = "x."; then :; else \
 		rm -f ChangeLog; \
 	fi