frame

Merge lp:~jpakkane/frame/pkgfix into lp:frame

  1. pkgfix
  2. Merge into trunk
Proposed by Jussi Pakkanen
Status: Merged
Merged at revision: 63
Proposed branch: lp:~jpakkane/frame/pkgfix
Merge into: lp:frame
Diff against target: 13 lines (+2/-1)
1 file modified
test/Makefile.am (+2/-1)
To merge this branch: bzr merge lp:~jpakkane/frame/pkgfix
Reviewer Review Type Date Requested Status
Daniel d'Andrada (community) Approve
Review via email: mp+91067@code.launchpad.net

Description of the change

Use the compiler definitions from pkg-config properly.

To post a comment you must log in.
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

Looks good.

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-01-03 20:47:10 +0000
3+++ test/Makefile.am 2012-02-01 12:58:20 +0000
4@@ -36,7 +36,8 @@
5 -I$(top_srcdir) \
6 -I$(top_srcdir)/include \
7 -I../include \
8- $(GTEST_CXXFLAGS)
9+ $(GTEST_CXXFLAGS) \
10+ $(XORG_GTEST_CFLAGS)
11
12 #
13 # Link against the (non-distributed) static lib to pick up the

Subscribers

People subscribed via source and target branches