Merge remote-tracking branch 'pochu/upgrade-software'

[empathy.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c1bed60f6a37a96b60a5da004bdaa7775f8f9ca2..f86a3a46f078ebe64ed36e7913dca6340fa9bdd0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,8 @@
 MY_SUBDIRS = tools extensions po data telepathy-yell libempathy libempathy-gtk src help tests
 NST_SUBDIRS = nautilus-sendto-plugin
+GOA_SUBDIRS = goa-mc-plugin
 
-DIST_SUBDIRS = $(MY_SUBDIRS) $(NST_SUBDIRS)
+DIST_SUBDIRS = $(MY_SUBDIRS) $(NST_SUBDIRS) $(GOA_SUBDIRS)
 
 SUBDIRS = $(MY_SUBDIRS)
 
@@ -9,7 +10,11 @@ if HAVE_NST
 SUBDIRS += $(NST_SUBDIRS)
 endif
 
-ACLOCAL_AMFLAGS = -I m4
+if HAVE_GOA
+SUBDIRS += $(GOA_SUBDIRS)
+endif
+
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 DISTCHECK_CONFIGURE_FLAGS =            \
        --disable-scrollkeeper          \