diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2012-08-31 19:37:39 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2012-08-31 19:37:39 +0200 |
| commit | 08007af84a6a608a3da5c32c9d2965501fd23f6e (patch) | |
| tree | d9267f0bde054ec7423b6210a20b2d70fa71fb14 /tests | |
| parent | 747d6e9a9e4d6bc825d1b3ba239e6f0f0d79c673 (diff) | |
| parent | 0b1b65a1eedcd0158680437e0ceed9cb9f86f35f (diff) | |
| download | ayatana-indicator-session-08007af84a6a608a3da5c32c9d2965501fd23f6e.tar.gz ayatana-indicator-session-08007af84a6a608a3da5c32c9d2965501fd23f6e.tar.bz2 ayatana-indicator-session-08007af84a6a608a3da5c32c9d2965501fd23f6e.zip | |
* New upstream release:
- Add an 'Online Accounts' menuitem (lp: #1044464)
- Add disposition highlighting to the indicator icon (lp: #1044015)
- Remove the Restart button from the shutdown dialog (lp: #1027952)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/Makefile.in | 21 |
2 files changed, 23 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 5f22130..9371c2e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -14,7 +14,9 @@ AM_CXXFLAGS = $(GTEST_CXXFLAGS) TESTS = test-service check_PROGRAMS = test-service -test_service_SOURCES = test-service.cc +test_service_SOURCES = \ + test-service.cc \ + gtest-dbus-helper.h test_service_LDADD = $(TEST_SERVICE_LIBS) libgtest.a $(XORG_GTEST_MAIN_LIBS) $(X11_LIBS) test_service_CPPFLAGS = \ $(TEST_SERVICE_CFLAGS) \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 85f4e2b..290e5ed 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -107,6 +107,22 @@ CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; @@ -322,7 +338,10 @@ AM_CPPFLAGS = \ -Wall -Werror AM_CXXFLAGS = $(GTEST_CXXFLAGS) -test_service_SOURCES = test-service.cc +test_service_SOURCES = \ + test-service.cc \ + gtest-dbus-helper.h + test_service_LDADD = $(TEST_SERVICE_LIBS) libgtest.a $(XORG_GTEST_MAIN_LIBS) $(X11_LIBS) test_service_CPPFLAGS = \ $(TEST_SERVICE_CFLAGS) \ |