From: P. F. Chimento Date: Sun, 30 Jan 2011 16:10:37 +0000 (+0100) Subject: Merge branch 'sound' X-Git-Tag: v0.9~152 X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=87504b58306f29cf833637a9e9983e947e684ee1;p=projects%2Fchimara%2Fchimara.git Merge branch 'sound' Conflicts: tests/Makefile.am --- 87504b58306f29cf833637a9e9983e947e684ee1 diff --cc tests/Makefile.am index 5a55db2,0fdb542..d00d911 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@@ -30,7 -30,7 +30,7 @@@ test_close_CFLAGS = @TEST_CFLAGS@ $(AM_ test_close_LDADD = @TEST_LIBS@ $(top_builddir)/libchimara/libchimara.la noinst_LTLIBRARIES = first.la model.la gridtest.la splittest.la multiwin.la \ - styletest.la test-userstyle.la - styletest.la soundtest.la ++ styletest.la soundtest.la test-userstyle.la first_la_SOURCES = first.c first_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS) @@@ -50,5 -50,5 +50,9 @@@ multiwin_la_LDFLAGS = $(TEST_PLUGIN_LIB styletest_la_SOURCES = styletest.c styletest_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS) +test_userstyle_la_SOURCES = test-userstyle.c +test_userstyle_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS) ++ + soundtest_la_SOURCES = soundtest.c + soundtest_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS) ++