Messaging Menu

Merge lp:~larsu/indicator-messages/lp1010122 into lp:indicator-messages/12.10

  1. lp1010122
  2. Merge into trunk.12.10
Proposed by Lars Karlitski
Status: Merged
Approved by: Charles Kerr
Approved revision: 273
Merged at revision: 273
Proposed branch: lp:~larsu/indicator-messages/lp1010122
Merge into: lp:indicator-messages/12.10
Diff against target: 29 lines (+3/-2)
1 file modified
test/Makefile.am (+3/-2)
To merge this branch: bzr merge lp:~larsu/indicator-messages/lp1010122
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Review via email: mp+110812@code.launchpad.net

Description of the change

Fixes out-of-tree builds. Strangely, this error does not show up in distcheck.

To post a comment you must log in.
Revision history for this message
Charles Kerr (charlesk) wrote :

Good catch.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/Makefile.am'
2--- test/Makefile.am 2012-03-21 20:20:15 +0000
3+++ test/Makefile.am 2012-06-18 13:06:22 +0000
4@@ -41,7 +41,7 @@
5 libindicator_messages_service_la_HEADERS = \
6 $(top_srcdir)/src/default-applications.h \
7 $(top_srcdir)/src/messages-service-dbus.h \
8- $(top_srcdir)/src/gen-messages-service.xml.h \
9+ $(top_builddir)/src/gen-messages-service.xml.h \
10 $(top_srcdir)/src/im-menu-item.h \
11 $(top_srcdir)/src/app-menu-item.h \
12 $(top_srcdir)/src/launcher-menu-item.h \
13@@ -54,7 +54,7 @@
14 $(top_srcdir)/src/default-applications.c \
15 $(top_srcdir)/src/messages-service.c \
16 $(top_srcdir)/src/messages-service-dbus.c \
17- $(top_srcdir)/src/gen-messages-service.xml.c \
18+ $(top_builddir)/src/gen-messages-service.xml.c \
19 $(top_srcdir)/src/im-menu-item.c \
20 $(top_srcdir)/src/app-menu-item.c \
21 $(top_srcdir)/src/launcher-menu-item.c \
22@@ -67,6 +67,7 @@
23 libindicator_messages_service_la_CFLAGS = \
24 $(APPLET_CFLAGS) \
25 $(COVERAGE_CFLAGS) \
26+ -I$(top_builddir)/src \
27 -Wall \
28 -Wl,-Bsymbolic-functions \
29 -Wl,-z,defs \

Subscribers

People subscribed via source and target branches