aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2010-06-17 16:50:30 -0400
committerKen VanDine <ken.vandine@canonical.com>2010-06-17 16:50:30 -0400
commit619a7c5da5817b5da3bfd8af5c3af9de450b6d48 (patch)
tree8047ef8b2414a7f097042712dffe1e9bdfdcf90e /tests
parent012ac7d97cc878ac1a66c9330e82b96e363f2e61 (diff)
downloadayatana-indicator-sound-619a7c5da5817b5da3bfd8af5c3af9de450b6d48.tar.gz
ayatana-indicator-sound-619a7c5da5817b5da3bfd8af5c3af9de450b6d48.tar.bz2
ayatana-indicator-sound-619a7c5da5817b5da3bfd8af5c3af9de450b6d48.zip
Import upstream version 0.3.1
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am3
-rw-r--r--tests/Makefile.in12
2 files changed, 8 insertions, 7 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8d24b2b..620668e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -32,7 +32,8 @@ test_indicator_sound_CFLAGS = \
test_indicator_sound_LDADD = \
libmockpulse.la \
$(PULSEAUDIO_LIBS) \
- $(APPLET_LIBS)
+ $(APPLET_LIBS) \
+ ../src/libsoundmenu.la
#########################################
diff --git a/tests/Makefile.in b/tests/Makefile.in
index bdf396b..78c6a86 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -45,10 +45,7 @@ TESTS = test-indicator-sound$(EXEEXT) test-pulse-manager$(EXEEXT) \
subdir = tests
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -72,7 +69,8 @@ am_test_indicator_sound_OBJECTS = \
test_indicator_sound_OBJECTS = $(am_test_indicator_sound_OBJECTS)
am__DEPENDENCIES_1 =
test_indicator_sound_DEPENDENCIES = libmockpulse.la \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ ../src/libsoundmenu.la
test_indicator_sound_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(test_indicator_sound_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -251,6 +249,7 @@ SOUNDSERVICE_CFLAGS = @SOUNDSERVICE_CFLAGS@
SOUNDSERVICE_LIBS = @SOUNDSERVICE_LIBS@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
+VALAC = @VALAC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
@@ -327,7 +326,8 @@ test_indicator_sound_CFLAGS = \
test_indicator_sound_LDADD = \
libmockpulse.la \
$(PULSEAUDIO_LIBS) \
- $(APPLET_LIBS)
+ $(APPLET_LIBS) \
+ ../src/libsoundmenu.la
test_pulse_manager_SOURCES = \
test-pulse-manager.c \