From b11161a7ffab99f5415e4136ce9ddd0bf6e1fa76 Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Thu, 15 Mar 2012 11:30:13 -0500 Subject: Dummy commit on 'no rule' err. --- test/Makefile.am | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 test/Makefile.am (limited to 'test/Makefile.am') diff --git a/test/Makefile.am b/test/Makefile.am new file mode 100644 index 0000000..fa7bace --- /dev/null +++ b/test/Makefile.am @@ -0,0 +1,24 @@ + +check_LIBRARIES = libgtest.a + +AM_CPPFLAGS = $(GTEST_CPPFLAGS) + +nodist_libgtest_a_SOURCES = $(GTEST_SOURCE)/src/gtest-all.cc +libgtest_a_CPPFLAGS = $(GTEST_CPPFLAGS) -w +libgtest_a_CXXFLAGS = $(AM_CXXFLAGS) + +libgtest_a_SOURCES = \ + $(GTEST_SOURCE)/src/gtest-all.cc \ + $(GTEST_SOURCE)/src/gtest-main.cc +lib_gtest_a_CPPFLAGS = \ + $(GTEST_CPPFLAGS) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir) +libxorg_gtest_a_CXXFLAGS = $(GTEST_CXXFLAGS) $(AM_CXXFLAGS) + +check_PROGRAMS = test_gtest + +test_gtest_SOURCES = test-gtest.cpp + +test_gtest_LDADD = \ + libgtest.a -- cgit v1.2.3 From bacad6ee225001ec39b6263ceb4aa99d55a67ba6 Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Thu, 15 Mar 2012 18:22:37 -0500 Subject: Temp commit for review by charles. --- test/Makefile.am | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'test/Makefile.am') diff --git a/test/Makefile.am b/test/Makefile.am index fa7bace..7b59f54 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,24 +1,28 @@ check_LIBRARIES = libgtest.a +check_PROGRAMS = test-gtest + +TESTS = AM_CPPFLAGS = $(GTEST_CPPFLAGS) nodist_libgtest_a_SOURCES = $(GTEST_SOURCE)/src/gtest-all.cc -libgtest_a_CPPFLAGS = $(GTEST_CPPFLAGS) -w -libgtest_a_CXXFLAGS = $(AM_CXXFLAGS) - libgtest_a_SOURCES = \ $(GTEST_SOURCE)/src/gtest-all.cc \ - $(GTEST_SOURCE)/src/gtest-main.cc -lib_gtest_a_CPPFLAGS = \ - $(GTEST_CPPFLAGS) \ - -I$(top_srcdir)/include \ - -I$(top_srcdir) -libxorg_gtest_a_CXXFLAGS = $(GTEST_CXXFLAGS) $(AM_CXXFLAGS) - -check_PROGRAMS = test_gtest + $(GTEST_SOURCE)/src/gtest_main.cc +libgtest_a_CPPFLAGS = \ + $(GTEST_CPPFLAGS) -w +libgtest_a_CXXFLAGS = \ + $(AM_CXXFLAGS) -test_gtest_SOURCES = test-gtest.cpp +TESTS += test-gtest +test_gtest_SOURCES = \ + test-gtest.cpp +test_gtest_CPPFLAGS = \ + $(APPLET_CFLAGS) \ + -I$(top_srcdir)/src +test_gtest_LDFLAGS = -pthread test_gtest_LDADD = \ + $(APPLET_LIBS) \ libgtest.a -- cgit v1.2.3 From a5695b6ae268abc5c446a734ea8dbbcc30bc47fb Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Fri, 16 Mar 2012 16:11:07 -0500 Subject: Experimental Makefile.am changes to support GTest. --- test/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'test/Makefile.am') diff --git a/test/Makefile.am b/test/Makefile.am index 7b59f54..e262bae 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -18,10 +18,12 @@ libgtest_a_CXXFLAGS = \ TESTS += test-gtest test_gtest_SOURCES = \ + $(top_srcdir)/src/launcher-menu-item.c \ + $(top_srcdir)/src/default-applications.c \ + $(top_srcdir)/src/seen-db.c \ test-gtest.cpp test_gtest_CPPFLAGS = \ - $(APPLET_CFLAGS) \ - -I$(top_srcdir)/src + $(APPLET_CFLAGS) test_gtest_LDFLAGS = -pthread test_gtest_LDADD = \ $(APPLET_LIBS) \ -- cgit v1.2.3 From 25fcbef28e8b33fc1ee624359ac4b39fbcb741dc Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Mon, 19 Mar 2012 10:14:53 -0500 Subject: Charles-advised changes to test/Makefile.am for proper CPPFLAGS. --- test/Makefile.am | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'test/Makefile.am') diff --git a/test/Makefile.am b/test/Makefile.am index e262bae..e359ad4 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -4,7 +4,8 @@ check_PROGRAMS = test-gtest TESTS = -AM_CPPFLAGS = $(GTEST_CPPFLAGS) +AM_CPPFLAGS = $(GTEST_CPPFLAGS) \ + -I${top_srcdir}/src nodist_libgtest_a_SOURCES = $(GTEST_SOURCE)/src/gtest-all.cc libgtest_a_SOURCES = \ @@ -14,6 +15,8 @@ libgtest_a_CPPFLAGS = \ $(GTEST_CPPFLAGS) -w libgtest_a_CXXFLAGS = \ $(AM_CXXFLAGS) +libgtest_a_CPPFLAGS = \ + $(AM_CPPFLAGS) TESTS += test-gtest @@ -23,7 +26,8 @@ test_gtest_SOURCES = \ $(top_srcdir)/src/seen-db.c \ test-gtest.cpp test_gtest_CPPFLAGS = \ - $(APPLET_CFLAGS) + $(APPLET_CFLAGS) \ + $(AM_CPPFLAGS) test_gtest_LDFLAGS = -pthread test_gtest_LDADD = \ $(APPLET_LIBS) \ -- cgit v1.2.3 From 6251928d97a1e10fb7e0e4c2df6372e8cead133e Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Tue, 20 Mar 2012 14:28:35 -0500 Subject: Attempt to build lib of code under test. --- test/Makefile.am | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'test/Makefile.am') diff --git a/test/Makefile.am b/test/Makefile.am index e359ad4..522568a 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -32,3 +32,56 @@ test_gtest_LDFLAGS = -pthread test_gtest_LDADD = \ $(APPLET_LIBS) \ libgtest.a + + +###################################### +# Lib containing code under test +###################################### + +lib_LTLIBRARIES = \ + libindicator-messages-service.la + +libindicator_messages_service_la_HEADERS = \ + $(top_srcdir)/src/default-applications.h \ + $(top_srcdir)/src/messages-service-dbus.h \ + $(top_srcdir)/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_srcdir)/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 + +libindicator_messages_service_ladir = \ + $(includedir)/libindicator-messages-service/ + +libindicator_messages_service_la_CFLAGS = \ + $(APPLET_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + -Wall \ + -Wl,-Bsymbolic-functions \ + -Wl,-z,defs \ + -Wl,--as-needed \ + -Werror \ + -DG_LOG_DOMAIN=\"Indicator-Messages\" \ + -DSTATUS_PROVIDER_DIR=\"$(STATUS_PROVIDER_DIR)\" + +libindicator_messages_service_la_LIBADD = \ + $(APPLET_LIBS) \ + libindicator-messages-status-provider.la + +libindicator_messages_service_la_LDFLAGS = \ + $(COVERAGE_LDFLAGS) + -- cgit v1.2.3 From f7d971a8407224ddd8b1b8744d18a33032c9142d Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Tue, 20 Mar 2012 15:30:16 -0500 Subject: Makefile fixes for code under test lib. --- test/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'test/Makefile.am') diff --git a/test/Makefile.am b/test/Makefile.am index 522568a..8986a40 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -80,8 +80,7 @@ libindicator_messages_service_la_CFLAGS = \ libindicator_messages_service_la_LIBADD = \ $(APPLET_LIBS) \ - libindicator-messages-status-provider.la + $(top_builddir)/src/.libs/libindicator-messages-status-provider.la libindicator_messages_service_la_LDFLAGS = \ $(COVERAGE_LDFLAGS) - -- cgit v1.2.3