summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Ratajsky <[email protected]>2014-11-03 01:28:24 +0100
committerMichal Ratajsky <[email protected]>2014-11-03 01:28:24 +0100
commit5c9a748c7d5a667b94bc7f3860572cacf7ceaab6 (patch)
tree26bafee6596b1d9bdcc49a95a3e26986ca9ad7e9
parentdcf30062003e1babb09f78c7ba1d7626e04aa478 (diff)
downloadmate-media-5c9a748c7d5a667b94bc7f3860572cacf7ceaab6.tar.bz2
mate-media-5c9a748c7d5a667b94bc7f3860572cacf7ceaab6.tar.xz
The sound-theme widget has same dependencies as MVC and is always built, reflect that in build files.
-rw-r--r--Makefile.am9
-rw-r--r--configure.ac21
-rw-r--r--sound-theme/Makefile.am4
3 files changed, 3 insertions, 31 deletions
diff --git a/Makefile.am b/Makefile.am
index 531c8f1..b0a677f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,6 @@
NULL =
-SUBDIRS = po man
-
-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
+SUBDIRS = po man sound-theme mate-volume-control
DISTCHECK_CONFIGURE_FLAGS = \
--disable-scrollkeeper \
diff --git a/configure.ac b/configure.ac
index fbdf4f9..00f284a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,27 +77,6 @@ case "$with_gtk" in
esac
dnl=======================================================================
-dnl Check for libcanberra
-dnl=======================================================================
-
-PKG_CHECK_MODULES(SOUND_THEME,
- gobject-2.0 >= $GLIB_REQUIRED_VERSION
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION
- gio-2.0 >= $GIO_REQUIRED_VERSION
- libcanberra-gtk$CANBERRA_API_VERSION >= $CANBERRA_REQUIRED_VERSION
- libxml-2.0,
- have_soundtheme=yes,
- have_soundtheme=no)
-
-if test "x$have_soundtheme" = "xyes" ; then
- AC_DEFINE(HAVE_SOUND_THEME, [], [Define if we can build sound theme])
-fi
-AM_CONDITIONAL(HAVE_SOUND_THEME, test x$have_soundtheme = xyes)
-AC_SUBST(HAVE_SOUND_THEME)
-AC_SUBST(SOUNDTHEME_CFLAGS)
-AC_SUBST(SOUNDTHEME_LIBS)
-
-dnl=======================================================================
dnl Check for the volume control modules
dnl=======================================================================
diff --git a/sound-theme/Makefile.am b/sound-theme/Makefile.am
index 7cba443..0c00862 100644
--- a/sound-theme/Makefile.am
+++ b/sound-theme/Makefile.am
@@ -7,7 +7,7 @@ noinst_LTLIBRARIES = libsoundtheme.la
AM_CPPFLAGS = \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
- $(SOUND_THEME_CFLAGS) \
+ $(VOLUME_CONTROL_CFLAGS) \
-DSOUND_DATA_DIR="\"$(datadir)/sounds\"" \
-DSOUND_SET_DIR="\"$(pkgdatadir)/sounds\"" \
$(NULL)
@@ -19,7 +19,7 @@ libsoundtheme_la_SOURCES = \
sound-theme-file-utils.c \
$(NULL)
-libsoundtheme_la_LIBADD = $(SOUND_THEME_LIBS)
+libsoundtheme_la_LIBADD = $(VOLUME_CONTROL_LIBS)
libsoundtheme_la_LDFLAGS = -no-undefined
BUILT_SOURCES = \