diff options
| author | Iain Lane <iain@orangesquash.org.uk> | 2013-06-13 11:54:37 +0100 |
|---|---|---|
| committer | Iain Lane <iain@orangesquash.org.uk> | 2013-06-13 11:54:37 +0100 |
| commit | adcf6754fb52a1dd9ed099fe420eebbb4fcbb082 (patch) | |
| tree | 5e0b588637d5ddd7cce20c73d7bba3c19ce51e58 | |
| parent | 397f360c08ce59b44ae51038f07e2b4e44b7279c (diff) | |
| download | ayatana-indicator-datetime-adcf6754fb52a1dd9ed099fe420eebbb4fcbb082.tar.gz ayatana-indicator-datetime-adcf6754fb52a1dd9ed099fe420eebbb4fcbb082.tar.bz2 ayatana-indicator-datetime-adcf6754fb52a1dd9ed099fe420eebbb4fcbb082.zip | |
Link test program in the right order. Importantly, make sure
XORG_GTEST_LIBS comes after it as it uses pthread.
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | tests/Makefile.am | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index b40d288..5dd803e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (12.10.3daily13.06.07-0ubuntu2) UNRELEASED; urgency=low + + * Link test program in the right order. Importantly, make sure + XORG_GTEST_LIBS comes after it as it uses pthread. + + -- Iain Lane <iain@orangesquash.org.uk> Thu, 13 Jun 2013 11:44:12 +0100 + indicator-datetime (12.10.3daily13.06.07-0ubuntu1) saucy; urgency=low [ Jeremy Bicha ] diff --git a/tests/Makefile.am b/tests/Makefile.am index 8ca0cbc..f9676c3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -24,10 +24,10 @@ AM_CXXFLAGS = $(GTEST_CXXFLAGS) TEST_LIBS = \ $(top_builddir)/src/.libs/libdatetime.so \ + libgtest.a \ $(INDICATOR_LIBS) \ $(COVERAGE_LDFLAGS) \ - $(XORG_GTEST_LDFLAGS) \ - libgtest.a + $(XORG_GTEST_LDFLAGS) TEST_CPPFLAGS = \ $(AM_CPPFLAGS) \ |