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

[Stephen M. Webb]

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

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.

[Daniel d'Andrada (dandrader)]

It still doesn't work for me:

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

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

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

review: Needs Fixing

[Stephen M. Webb (bregma)]

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

[Daniel d'Andrada (dandrader)]

Everything works now.

review: Approve

[PS Jenkins bot (ps-jenkins)]

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)

[Francis Ginther (fginther)]

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

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

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

review: Approve

=== 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 @@
  *
  * frame - Touch Frame Library
  *
- * Copyright (C) 2010-2012 Canonical Ltd.
+ * Copyright (C) 2010-2013 Canonical Ltd.
  *
  * This library is free software: you can redistribute it and/or modify it 
  * under the terms of the GNU Lesser General Public License version 3
@@ -780,7 +780,7 @@
 
 /** @} */
 
-#include "frame_internal.h"
+#include "oif/frame_internal.h"
 
 #ifdef __cplusplus
 }

=== 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 @@
  *
  * frame - Touch Frame Library
  *
- * Copyright (C) 2010-2012 Canonical Ltd.
+ * Copyright (C) 2010-2013 Canonical Ltd.
  *
  * This library is free software: you can redistribute it and/or modify it 
  * under the terms of the GNU Lesser General Public License version 3
@@ -21,7 +21,7 @@
 #ifndef FRAME_OIF_FRAME_X11_H_
 #define FRAME_OIF_FRAME_X11_H_
 
-#include "frame.h"
+#include "oif/frame.h"
 #include <X11/Xlib.h>
 
 #ifdef __cplusplus

=== 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 @@
 	$(CXX_LIBS)
 
 AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include/ \
 	-I$(top_srcdir)/src \
 	$(WARNING_CPPFLAGS) \
@@ -29,7 +30,7 @@
 
 libframeincludedir = $(includedir)/oif
 libframeinclude_HEADERS = \
-	$(top_srcdir)/include/oif/frame.h \
+	$(top_builddir)/include/oif/frame.h \
 	$(top_srcdir)/include/oif/frame_backend.h \
 	$(top_srcdir)/include/oif/frame_internal.h
 
@@ -69,4 +70,4 @@
 	x11/window_x11.cpp
 endif
 
-EXTRA_DIST = $(version_script)
+EXTRA_DIST = $(version_script) 

=== 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 @@
 	$(COVERAGE_CFLAGS)
 
 AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include \
 	-iquote$(srcdir)
 

=== 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 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include/ $(WARNING_CPPFLAGS)
+AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/include \
+	$(WARNING_CPPFLAGS)
 
 AM_CFLAGS = $(C11_CFLAGS) $(COVERAGE_CFLAGS)