Some spelling fixes in a comment

[andy/viking.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f5e2ec262a1c0ffb23284b0dae97a3eb8b1a3c77..9e2760777715d67b75bb57aa15aade3bffdb8a5f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src test doc po
+SUBDIRS = src test data po win32 help tools doc
 
 INTLTOOL = \
        intltool-extract.in \
@@ -7,22 +7,39 @@ INTLTOOL = \
 
 full:
        ./autogen.sh
-       if [ -x config.status ] ; then ./config.status --recheck ; else ./configure ; fi
        make
 
-bin_SCRIPTS = viking-remote
-
 EXTRA_DIST = \
-            viking-remote \
-            viking.spec \
-            $(INTLTOOL)
+       HACKING \
+       gnome-doc-utils.make \
+       ChangeLog.0 \
+       viking.spec \
+       mingw-viking.spec \
+       mingw64-viking.spec \
+       $(INTLTOOL)
+
+.PHONY: generate-changelog
+generate-changelog:
+       if test -d $(top_srcdir)/.git; then \
+          cd $(top_srcdir) ; sh $(top_srcdir)/maintainer/git2changelog.sh > $(distdir)/c-l; \
+          mv $(distdir)/c-l $(distdir)/ChangeLog; \
+        fi
 
-dist-hook: viking.spec
+dist-hook: viking.spec generate-changelog
        cp $(top_builddir)/viking.spec $(distdir)
 
+MAINTAINERCLEANFILES = \
+       gnome-doc-utils.make
+
 DISTCLEANFILES = \
        intltool-extract \
        intltool-merge \
        intltool-update
 
 ACLOCAL_AMFLAGS = -I m4
+
+DISTCHECK_CONFIGURE_FLAGS = \
+       --disable-scrollkeeper
+
+# Ignore gtk theme cache files on distcheck
+distuninstallcheck_listfiles = find . -type f -print | grep -v 'icon-theme.cache'