aboutsummaryrefslogtreecommitdiff
path: root/test/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'test/Makefile.am')
-rw-r--r--test/Makefile.am59
1 files changed, 21 insertions, 38 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index f2c86d9..4671446 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,8 +1,8 @@
check_LIBRARIES = libgtest.a
-check_PROGRAMS = test-gtest
+check_PROGRAMS = test-gactionmuxer
-TESTS =
+TESTS = $(check_PROGRAMS)
AM_CPPFLAGS = $(GTEST_CPPFLAGS) \
-I${top_srcdir}/src
@@ -11,23 +11,22 @@ nodist_libgtest_a_SOURCES = \
$(GTEST_SOURCE)/src/gtest-all.cc \
$(GTEST_SOURCE)/src/gtest_main.cc
libgtest_a_CPPFLAGS = \
- $(GTEST_CPPFLAGS) -w
+ $(GTEST_CPPFLAGS) -w \
+ $(AM_CPPFLAGS)
libgtest_a_CXXFLAGS = \
$(AM_CXXFLAGS)
-libgtest_a_CPPFLAGS = \
- $(AM_CPPFLAGS)
-TESTS += test-gtest
-test_gtest_SOURCES = \
- test-gtest.cpp
-test_gtest_CPPFLAGS = \
+test_gactionmuxer_SOURCES = \
+ test-gactionmuxer.cpp
+
+test_gactionmuxer_CPPFLAGS = \
$(APPLET_CFLAGS) \
$(AM_CPPFLAGS)
-test_gtest_LDFLAGS = -pthread
-test_gtest_LDADD = \
+
+test_gactionmuxer_LDADD = \
$(APPLET_LIBS) \
- $(top_builddir)/src/.libs/libindicator-messages-status-provider.la \
+ libindicator-messages-service.la \
libgtest.a
@@ -35,31 +34,17 @@ test_gtest_LDADD = \
# Lib containing code under test
######################################
-lib_LTLIBRARIES = \
+noinst_LTLIBRARIES = \
libindicator-messages-service.la
-libindicator_messages_service_la_HEADERS = \
- $(top_srcdir)/src/default-applications.h \
- $(top_srcdir)/src/messages-service-dbus.h \
- $(top_builddir)/src/gen-messages-service.xml.h \
- $(top_srcdir)/src/im-menu-item.h \
- $(top_srcdir)/src/app-menu-item.h \
- $(top_srcdir)/src/launcher-menu-item.h \
- $(top_srcdir)/src/seen-db.h \
- $(top_srcdir)/src/dirs.h \
- $(top_srcdir)/src/dbus-data.h \
- $(top_srcdir)/src/status-items.h
-
libindicator_messages_service_la_SOURCES = \
- $(top_srcdir)/src/default-applications.c \
- $(top_srcdir)/src/messages-service.c \
- $(top_srcdir)/src/messages-service-dbus.c \
- $(top_builddir)/src/gen-messages-service.xml.c \
- $(top_srcdir)/src/im-menu-item.c \
- $(top_srcdir)/src/app-menu-item.c \
- $(top_srcdir)/src/launcher-menu-item.c \
- $(top_srcdir)/src/seen-db.c \
- $(top_srcdir)/src/status-items.c
+ $(top_builddir)/src/indicator-messages-service.c \
+ $(top_builddir)/src/indicator-messages-service.h \
+ $(top_srcdir)/src/app-section.c \
+ $(top_srcdir)/src/app-section.h \
+ $(top_srcdir)/src/gactionmuxer.c \
+ $(top_srcdir)/src/gactionmuxer.h
+ $(top_srcdir)/src/dbus-data.h
libindicator_messages_service_ladir = \
$(includedir)/libindicator-messages-service/
@@ -73,12 +58,10 @@ libindicator_messages_service_la_CFLAGS = \
-Wl,-z,defs \
-Wl,--as-needed \
-Werror \
- -DG_LOG_DOMAIN=\"Indicator-Messages\" \
- -DSTATUS_PROVIDER_DIR=\"$(STATUS_PROVIDER_DIR)\"
+ -DG_LOG_DOMAIN=\"Indicator-Messages\"
libindicator_messages_service_la_LIBADD = \
- $(APPLET_LIBS) \
- $(top_builddir)/src/.libs/libindicator-messages-status-provider.la
+ $(APPLET_LIBS)
libindicator_messages_service_la_LDFLAGS = \
$(COVERAGE_LDFLAGS)