frame

Merge lp://staging/~bregma/frame/ftbfs-on-jhbuild into lp://staging/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://staging/~bregma/frame/ftbfs-on-jhbuild
Merge into: lp://staging/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://staging/~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.staging.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
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches