Merge lp:~oif-team/geis/geis2-move-geisimpl into lp:geis

[Stephen M. Webb]

Two minor changes to build infrastructure.

(1) Relocated geisimpl.h header file so "make distcheck" runs cleanly.

(2) Added backend subdirectory to libutouch-geis subproject for upcoming work.

[Henrik Rydberg (rydberg)]

looks fine with me.

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2010-12-21 13:59:31 +0000
+++ ChangeLog	2010-12-31 20:37:54 +0000
@@ -1,3 +1,23 @@
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Added backend subdirectory to libutouch-geis.
+
+  * libutouch-geis/backend/Makefile.am: new file
+  * configure.ac (AC_OUTPUT): added libutouch-geis/backend/Makefile
+  * libutouch-geis/Makefile.am (SUBDORS): added backend
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Moved geis/geisimpl.h into GEIS v2.0 sources.
+
+  * libutouch-geis/geis/geisimple.h: renamed from libutouch-geis-xcb/geis
+  * libutouch-geis-xcb/Makefile.am: changed header search path
+  * libutouch-geis/Makefile.am: changed header search path
+  * testsuite/geis1/Makefile.am: changed header search path
+  * testsuite/geis2/Makefile.am: changed header search path
+  * testsuite/geistest/Makefile.am: changed header search path
+  * testsuite/libutouch-geis/Makefile.am: changed header search path
+
 2010-12-20  Stephen M. Webb  <[e-mail]>
 
   Added GEIS v2.0 input device implementation.

=== modified file 'configure.ac'
--- configure.ac	2010-11-24 20:15:13 +0000
+++ configure.ac	2010-12-31 20:37:54 +0000
@@ -87,6 +87,7 @@
                  libutouch-geis-xcb/Makefile
                  libutouch-geis-xcb/xcb_gesture.xml
                  libutouch-geis/Makefile
+                 libutouch-geis/backend/Makefile
                  testsuite/Makefile
                  testsuite/libutouch-geis/Makefile
                  testsuite/geis1/Makefile

=== modified file 'libutouch-geis-xcb/Makefile.am'
--- libutouch-geis-xcb/Makefile.am	2010-11-23 18:06:40 +0000
+++ libutouch-geis-xcb/Makefile.am	2010-12-31 20:37:54 +0000
@@ -8,8 +8,6 @@
 # work around a problem with XCB tools
 XCB_CFLAGS += -I$(includedir)/xcb -I$(XCBINCLUDEDIR)/xcb
 
-dist_inc_HEADERS = geis/geisimpl.h
-
 noinst_LTLIBRARIES = libutouch-geis.la
 
 libutouch_geis_la_SOURCES = \

=== modified file 'libutouch-geis/Makefile.am'
--- libutouch-geis/Makefile.am	2010-12-21 01:47:05 +0000
+++ libutouch-geis/Makefile.am	2010-12-31 20:37:54 +0000
@@ -20,8 +20,12 @@
 #
 version_script = $(srcdir)/libutouch-geis.ver
 
+SUBDIRS = backend
+
 lib_LTLIBRARIES = libutouch-geis.la
 
+nobase_include_HEADERS = geis/geisimpl.h
+
 libutouch_geis_la_SOURCES = \
 	geis_attr.h                 geis_attr.c \
 	geis_backend.h              geis_backend.c \
@@ -43,7 +47,7 @@
 	-DGEIS_BUILDING_DSO=1 \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/libutouch-geis-xcb \
+	-I$(srcdir)/backend \
 	$(GRAIL_CFLAGS) 
 
 libutouch_geis_la_LDFLAGS = \

=== added directory 'libutouch-geis/backend'
=== added file 'libutouch-geis/backend/Makefile.am'
--- libutouch-geis/backend/Makefile.am	1970-01-01 00:00:00 +0000
+++ libutouch-geis/backend/Makefile.am	2010-12-31 20:37:54 +0000
@@ -0,0 +1,23 @@
+#
+# @file libutouch-geis/backends/Makefile.am 
+# @brief automake recipe for the uTouch GEIS v2.0 implementation back ends
+#
+# Copyright 2010 Canonical, Ltd.
+#
+# This file is part of the utouch-geis library. This library is free software;
+# you can redistribute it and/or modify it under the terms of the GNU Lesser
+# General Public License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+SUBDIRS = 
+

=== renamed directory 'libutouch-geis-xcb/geis' => 'libutouch-geis/geis'
=== modified file 'testsuite/geis1/Makefile.am'
--- testsuite/geis1/Makefile.am	2010-11-23 18:06:40 +0000
+++ testsuite/geis1/Makefile.am	2010-12-31 20:37:54 +0000
@@ -9,8 +9,6 @@
   test_targets = 
 endif
 
-geis_impl = xcb
-
 TESTS = $(test_targets)
 
 check_PROGRAMS = $(test_targets)
@@ -22,7 +20,7 @@
 check_geis_internals_CFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/libutouch-geis-$(geis_impl) \
+	-I$(top_srcdir)/libutouch-geis \
 	$(CHECK_CFLAGS)
 
 check_geis_internals_LDADD = \

=== modified file 'testsuite/geis2/Makefile.am'
--- testsuite/geis2/Makefile.am	2010-12-21 01:47:05 +0000
+++ testsuite/geis2/Makefile.am	2010-12-31 20:37:54 +0000
@@ -29,14 +29,11 @@
 check_geis2_api_CFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/libutouch-geis-xcb \
+	-I$(top_srcdir)/libutouch-geis \
 	$(CHECK_CFLAGS)
 
 check_geis2_api_LDADD = \
 	$(top_builddir)/libutouch-geis/libutouch-geis.la \
-	$(X11XCB_LIBS) \
-	$(XCB_LIBS) \
-	$(XI2_LIBS) \
 	$(CHECK_LIBS)
 
 MOSTLYCLEANFILES = geis2_api.log

=== modified file 'testsuite/geistest/Makefile.am'
--- testsuite/geistest/Makefile.am	2010-12-20 18:06:36 +0000
+++ testsuite/geistest/Makefile.am	2010-12-31 20:37:54 +0000
@@ -7,7 +7,7 @@
 geistest_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/libutouch-geis-xcb \
+	-I$(top_srcdir)/libutouch-geis \
 	$(XCB_CFLAGS)
 
 geistest_LDADD = \

=== modified file 'testsuite/libutouch-geis/Makefile.am'
--- testsuite/libutouch-geis/Makefile.am	2010-12-21 13:59:31 +0000
+++ testsuite/libutouch-geis/Makefile.am	2010-12-31 20:37:54 +0000
@@ -44,7 +44,7 @@
 check_geis2_internals_CFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/libutouch-geis-xcb \
+	-I$(top_srcdir)/libutouch-geis \
 	$(CHECK_CFLAGS)
 
 #