diff options
| author | Gabriel Burt <gabriel.burt@gmail.com> | 2010-06-04 17:17:43 -0700 |
|---|---|---|
| committer | Gabriel Burt <gabriel.burt@gmail.com> | 2010-06-04 17:17:43 -0700 |
| commit | 52eb965f724ca0bcb4759905efd334e5306a60eb (patch) | |
| tree | f4958fab6f1054b6c95e3bfc9e4a0d6596f18f80 /Makefile.am | |
| parent | bbb6e388831a5f6a534510853360ce667ac136b4 (diff) | |
| parent | 1ad24a016cc250bf14d3eb1a325294eb6b6d5202 (diff) | |
Merge branch 'docs'
Conflicts:
.gitignore
Makefile.am
configure.ac
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index ccb2f8a9b..56e8d07eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ SUBDIRS = \ build \ data \ + help \ libbanshee \ gstreamer \ src \ @@ -151,7 +152,10 @@ package-po: check-since exit 0; \ fi +DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper + EXTRA_DIST = \ + gnome-doc-utils.make \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ @@ -165,6 +169,7 @@ CLEANFILES = \ intltool-merge DISTCLEANFILES = \ + gnome-doc-utils.make \ *.bak \ *~ \ *.pidb |