diff options
| author | Michal Ratajsky <[email protected]> | 2014-11-10 10:22:29 +0100 |
|---|---|---|
| committer | Michal Ratajsky <[email protected]> | 2014-11-10 10:22:29 +0100 |
| commit | b70459bd7ab6cbf64892fbaea6a931a80f0cc132 (patch) | |
| tree | 488768eb7c736d014f29e08e7191323e2fcfa93a /Makefile.am | |
| parent | cf4eac60cdc4d02fdeccb3b85d524eda8a5f320e (diff) | |
| parent | 194e26e0be4660dae0987445c0edcfa8349fde51 (diff) | |
| download | mate-media-b70459bd7ab6cbf64892fbaea6a931a80f0cc132.tar.bz2 mate-media-b70459bd7ab6cbf64892fbaea6a931a80f0cc132.tar.xz | |
Merge branch 'michal-wip'
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 49 |
1 files changed, 20 insertions, 29 deletions
diff --git a/Makefile.am b/Makefile.am index 531c8f1..378e1c8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,41 +1,32 @@ NULL = -SUBDIRS = po man +SUBDIRS = data po man mate-volume-control -if HAVE_SOUND_THEME -SUBDIRS += sound-theme -endif - -# m-v-c depends on sound-theme, if enabled, so add here to SUBDIRS -SUBDIRS += mate-volume-control - -DISTCHECK_CONFIGURE_FLAGS = \ - --disable-scrollkeeper \ - --enable-more-warnings \ - --enable-compile-warnings=maximum \ +DISTCHECK_CONFIGURE_FLAGS = \ + --enable-more-warnings \ + --enable-compile-warnings=maximum \ --enable-deprecated -DIST_SUBDIRS = \ - po \ - man \ - mate-volume-control \ - sound-theme \ +DIST_SUBDIRS = \ + data \ + po \ + man \ + mate-volume-control \ $(NULL) -EXTRA_DIST = \ - .version \ - autogen.sh \ - configure \ - ChangeLog \ - COPYING \ - COPYING-DOCS \ - build-aux/git-version-gen \ - $(INTLTOOL_BUILT:=.in) \ +EXTRA_DIST = \ + .version \ + autogen.sh \ + configure \ + ChangeLog \ + COPYING \ + COPYING-DOCS \ + build-aux/git-version-gen \ + $(INTLTOOL_BUILT:=.in) \ $(NULL) -DISTCLEANFILES = \ - build-aux/mate-doc-utils.make \ - po/.intltool-merge-cache \ +DISTCLEANFILES = \ + po/.intltool-merge-cache \ $(NULL) ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} |