diff options
| author | Ted Gould <ted@gould.cx> | 2015-03-06 14:05:25 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2015-03-06 14:05:25 -0600 |
| commit | 23e18e9e09fadbd1cf590a7d69d69c753e974c9d (patch) | |
| tree | 3cea930c8e34333ddf65474cc7a11edaa9cd02b7 /tests | |
| parent | b540111644608c4873b0075b96a7cfbc127501ee (diff) | |
| download | ayatana-indicator-messages-23e18e9e09fadbd1cf590a7d69d69c753e974c9d.tar.gz ayatana-indicator-messages-23e18e9e09fadbd1cf590a7d69d69c753e974c9d.tar.bz2 ayatana-indicator-messages-23e18e9e09fadbd1cf590a7d69d69c753e974c9d.zip | |
Linking and building, oh my
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 7d433ba..ca03f56 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,5 @@ -check_LIBRARIES = libgtest.a +check_LTLIBRARIES = libgtest.la check_PROGRAMS = test-gactionmuxer TESTS = $(check_PROGRAMS) @@ -11,13 +11,13 @@ AM_CPPFLAGS = $(GTEST_CPPFLAGS) \ # Google Test ###################################### -nodist_libgtest_a_SOURCES = \ +nodist_libgtest_la_SOURCES = \ $(GTEST_SOURCE)/src/gtest-all.cc \ $(GTEST_SOURCE)/src/gtest_main.cc -libgtest_a_CPPFLAGS = \ +libgtest_la_CPPFLAGS = \ $(GTEST_CPPFLAGS) -w \ $(AM_CPPFLAGS) -libgtest_a_CXXFLAGS = \ +libgtest_la_CXXFLAGS = \ $(AM_CXXFLAGS) ###################################### @@ -45,6 +45,7 @@ indicator_test_SOURCES = \ indicator_test_CPPFLAGS = \ -DINDICATOR_MESSAGES_SERVICE_BINARY="\"$(top_bindir)/service/indicator-messages-service\"" \ + -DSCHEMA_DIR="\"$(bindir)/gsettings-schemas-compiled/\"" \ -std=c++11 \ $(APPLET_CFLAGS) \ $(DBUSTEST_CFLAGS) \ @@ -53,7 +54,8 @@ indicator_test_CPPFLAGS = \ indicator_test_LDADD = \ $(APPLET_LIBS) \ $(DBUSTEST_LIBS) \ - libgtest.a + libgtest.la \ + -lc -lpthread TESTS += indicator-test check_PROGRAMS += indicator-test |