diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-01-23 08:55:12 -0600 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-01-23 08:55:12 -0600 |
| commit | 95daf102dac37a69686f8a86bf7fe47cd442c7d6 (patch) | |
| tree | 3891a7075873c6eeb320fe0c8a572ca14655f5af /libindicator/Makefile.am | |
| parent | 4f4190f71f8495e5bcf6779d73157931572e42ac (diff) | |
| parent | 1cf6a9761db8beefc8d2a73c2cf9903264424c66 (diff) | |
| download | libayatana-indicator-95daf102dac37a69686f8a86bf7fe47cd442c7d6.tar.gz libayatana-indicator-95daf102dac37a69686f8a86bf7fe47cd442c7d6.tar.bz2 libayatana-indicator-95daf102dac37a69686f8a86bf7fe47cd442c7d6.zip | |
"bzr merge lp:indicator" + conflict resolution in tests suite
Diffstat (limited to 'libindicator/Makefile.am')
| -rw-r--r-- | libindicator/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index 53f9985..b574519 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -26,7 +26,7 @@ CLEANFILES += indicator$(VER)-0.$(INDICATOR_API_VERSION).pc include $(top_srcdir)/Makefile.am.marshal -libindicatorincludedir=$(includedir)/libindicator-0.$(INDICATOR_API_VERSION)/libindicator +libindicatorincludedir=$(includedir)/libindicator$(VER)-0.$(INDICATOR_API_VERSION)/libindicator indicator_headers = \ indicator.h \ @@ -55,6 +55,7 @@ libindicator_la_SOURCES = \ libindicator_la_CFLAGS = \ $(LIBINDICATOR_CFLAGS) \ + $(COVERAGE_CFLAGS) \ -DG_LOG_DOMAIN=\"libindicator\" \ -Wall -Werror @@ -62,6 +63,7 @@ libindicator_la_LIBADD = \ $(LIBINDICATOR_LIBS) libindicator_la_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ -version-info $(INDICATOR_ABI_VERSION):0:0 \ -no-undefined \ -export-symbols-regex "^[^_].*" |