frame

Merge lp:~bregma/frame/ftbfs-on-jhbuild into lp:frame

  1. ftbfs-on-jhbuild
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Approved by: Francis Ginther
Approved revision: 120
Merged at revision: 119
Proposed branch: lp:~bregma/frame/ftbfs-on-jhbuild
Merge into: lp:frame
Diff against target: 94 lines (+12/-7)
5 files modified
include/oif/frame.h.in (+2/-2)
include/oif/frame_x11.h (+2/-2)
src/Makefile.am (+3/-2)
test/regular/Makefile.am (+1/-0)
tools/Makefile.am (+4/-1)
To merge this branch: bzr merge lp:~bregma/frame/ftbfs-on-jhbuild
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Daniel d'Andrada (community) Approve
Review via email: mp+138519@code.launchpad.net

Commit message

Fix a fail-to-build-from-source in an out-of-source build (lp: #1152741).

Description of the change

Frame fails to build in an out-of-source directory, which causes jhbuild failures.

The header search paths in Makefile.am files needs to be adjusted, as do the header search path in nested include paths.

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

It still doesn't work for me:

http://paste.ubuntu.com/1415171/

review: Needs Fixing
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

* out-of-source "make" now works, but "make check" does not.
* "make install" doesn't install frame.h

review: Needs Fixing
Revision history for this message
Stephen M. Webb (bregma) wrote :

Finally, out-of-source make works, make distcheck works, make install works.

Revision history for this message
Daniel d'Andrada (dandrader) wrote :

Everything works now.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/frame-mbs-autolanding/10/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/frame-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/frame-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/10/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Failure due to networking issues in the jenkins lab. Re-approving.

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

If only jenkins could try again when there are such failures...

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'include/oif/frame.h.in'
--- include/oif/frame.h.in 2012-12-04 18:46:01 +0000
+++ include/oif/frame.h.in 2013-03-08 20:15:27 +0000
@@ -2,7 +2,7 @@
2 *2 *
3 * frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2010-2012 Canonical Ltd.5 * Copyright (C) 2010-2013 Canonical Ltd.
6 *6 *
7 * This library is free software: you can redistribute it and/or modify it 7 * This library is free software: you can redistribute it and/or modify it
8 * under the terms of the GNU Lesser General Public License version 38 * under the terms of the GNU Lesser General Public License version 3
@@ -780,7 +780,7 @@
780780
781/** @} */781/** @} */
782782
783#include "frame_internal.h"783#include "oif/frame_internal.h"
784784
785#ifdef __cplusplus785#ifdef __cplusplus
786}786}
787787
=== modified file 'include/oif/frame_x11.h'
--- include/oif/frame_x11.h 2012-12-04 18:46:01 +0000
+++ include/oif/frame_x11.h 2013-03-08 20:15:27 +0000
@@ -2,7 +2,7 @@
2 *2 *
3 * frame - Touch Frame Library3 * frame - Touch Frame Library
4 *4 *
5 * Copyright (C) 2010-2012 Canonical Ltd.5 * Copyright (C) 2010-2013 Canonical Ltd.
6 *6 *
7 * This library is free software: you can redistribute it and/or modify it 7 * This library is free software: you can redistribute it and/or modify it
8 * under the terms of the GNU Lesser General Public License version 38 * under the terms of the GNU Lesser General Public License version 3
@@ -21,7 +21,7 @@
21#ifndef FRAME_OIF_FRAME_X11_H_21#ifndef FRAME_OIF_FRAME_X11_H_
22#define FRAME_OIF_FRAME_X11_H_22#define FRAME_OIF_FRAME_X11_H_
2323
24#include "frame.h"24#include "oif/frame.h"
25#include <X11/Xlib.h>25#include <X11/Xlib.h>
2626
27#ifdef __cplusplus27#ifdef __cplusplus
2828
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2012-11-20 14:13:20 +0000
+++ src/Makefile.am 2013-03-08 20:15:27 +0000
@@ -14,6 +14,7 @@
14 $(CXX_LIBS)14 $(CXX_LIBS)
1515
16AM_CPPFLAGS = \16AM_CPPFLAGS = \
17 -I$(top_builddir)/include \
17 -I$(top_srcdir)/include/ \18 -I$(top_srcdir)/include/ \
18 -I$(top_srcdir)/src \19 -I$(top_srcdir)/src \
19 $(WARNING_CPPFLAGS) \20 $(WARNING_CPPFLAGS) \
@@ -29,7 +30,7 @@
2930
30libframeincludedir = $(includedir)/oif31libframeincludedir = $(includedir)/oif
31libframeinclude_HEADERS = \32libframeinclude_HEADERS = \
32 $(top_srcdir)/include/oif/frame.h \33 $(top_builddir)/include/oif/frame.h \
33 $(top_srcdir)/include/oif/frame_backend.h \34 $(top_srcdir)/include/oif/frame_backend.h \
34 $(top_srcdir)/include/oif/frame_internal.h35 $(top_srcdir)/include/oif/frame_internal.h
3536
@@ -69,4 +70,4 @@
69 x11/window_x11.cpp70 x11/window_x11.cpp
70endif71endif
7172
72EXTRA_DIST = $(version_script)73EXTRA_DIST = $(version_script)
7374
=== modified file 'test/regular/Makefile.am'
--- test/regular/Makefile.am 2012-12-04 18:46:01 +0000
+++ test/regular/Makefile.am 2013-03-08 20:15:27 +0000
@@ -15,6 +15,7 @@
15 $(COVERAGE_CFLAGS)15 $(COVERAGE_CFLAGS)
1616
17AM_CPPFLAGS = \17AM_CPPFLAGS = \
18 -I$(top_builddir)/include \
18 -I$(top_srcdir)/include \19 -I$(top_srcdir)/include \
19 -iquote$(srcdir)20 -iquote$(srcdir)
2021
2122
=== modified file 'tools/Makefile.am'
--- tools/Makefile.am 2012-06-21 19:41:40 +0000
+++ tools/Makefile.am 2013-03-08 20:15:27 +0000
@@ -1,4 +1,7 @@
1AM_CPPFLAGS = -I$(top_srcdir)/include/ $(WARNING_CPPFLAGS)1AM_CPPFLAGS = \
2 -I$(top_builddir)/include \
3 -I$(top_srcdir)/include \
4 $(WARNING_CPPFLAGS)
25
3AM_CFLAGS = $(C11_CFLAGS) $(COVERAGE_CFLAGS)6AM_CFLAGS = $(C11_CFLAGS) $(COVERAGE_CFLAGS)
47

Subscribers

People subscribed via source and target branches