remove released flag

[empathy.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2b0b06807948d61e63fc3cdb11cba576479bcaf8..28e6374d0c08aa0ae8c976294c1cb83ddc59a4cd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,34 +1,40 @@
-SUBDIRS = tools extensions po data libempathy libempathy-gtk src docs help
+MY_SUBDIRS = tools extensions po data telepathy-account-widgets libempathy libempathy-gtk src help tests
+NST_SUBDIRS = nautilus-sendto-plugin
+GOA_SUBDIRS = goa-mc-plugin
+UOA_SUBDIRS = ubuntu-online-accounts
 
-if HAVE_MEGAPHONE
-SUBDIRS += megaphone
-endif
+DIST_SUBDIRS = $(MY_SUBDIRS) $(NST_SUBDIRS) $(GOA_SUBDIRS) $(UOA_SUBDIRS)
+
+SUBDIRS = $(MY_SUBDIRS)
 
-if HAVE_NOTHERE
-SUBDIRS += nothere
+if HAVE_NST
+SUBDIRS += $(NST_SUBDIRS)
 endif
 
-if HAVE_PYTHON
-SUBDIRS += python
+if HAVE_GOA
+SUBDIRS += $(GOA_SUBDIRS)
 endif
 
-if HAVE_TESTS
-SUBDIRS += tests
+if HAVE_UOA
+SUBDIRS += $(UOA_SUBDIRS)
 endif
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 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,14 +44,14 @@ 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
 
 ChangeLog:
        @echo Creating $@
        @if test -d "$(srcdir)/.git"; then \
-         (GIT_DIR=$(top_srcdir)/.git ./missing --run git log EMPATHY_2_26_1.. --stat) | fmt --split-only > $@.tmp \
+         (GIT_DIR=$(top_srcdir)/.git ./missing --run git log EMPATHY_2_27_1.. --stat) | fmt --split-only > $@.tmp \
          && mv -f $@.tmp $@ \
          || ($(RM) $@.tmp; \
              echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \