Merge lp:~alan-griffiths/mir/fix-libmircommon into lp:mir

[Alan Griffiths]

shared, platform: link the shared objects into the mircommon shared library and not the libraries that link against it. (Partial fix for lp:1347522)

shared, platform: link the shared objects into the mircommon shared library and not the libraries that link against it

This still ends up with the android-input archive in libmirserver.so which seems a bit odd as that satisfies shared/input/android/android_input_lexicon.cpp etc. which are still in libmircommon. These seem to be laregely to support the *client* code via InputPlatform::create(...), not the sever code. But android-input needs mir::mir::terminate_with_current_exception() which is also in mibmirserver.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1791
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2217/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1051/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1057/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1043/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/739/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/740/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3592/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2217/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

This isn't a fix for everything in the linked bug, but does (mostly) get the .../shared/... code into libmircommon instead of a mixture of other libraries.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1794
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2218/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1053/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1059/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1045/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/740/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/741/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3613/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2218/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1795
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2221/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1056
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1062
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1048
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/743
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/743/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/744
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/744/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3621
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3621/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2165
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10303

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2221/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good. Daniel mentioned an alternative (add_library(name OBJECT)), which perhaps is worth looking into it before landing this.

Also on my system MIR_COMMON_LIBRARIES, as printed in the cmake output, is empty. Do we need it any more?

review: Needs Information

[Alan Griffiths (alan-griffiths)]

> Looks good. Daniel mentioned an alternative (add_library(name OBJECT)), which
> perhaps is worth looking into it before landing this.

Yes, trying it now.

> Also on my system MIR_COMMON_LIBRARIES, as printed in the cmake output, is
> empty. Do we need it any more?

Not right now, but I'm not yet sure how to untangle the dependencies around android-input - I promise to remove it in a later MP if it doesn't get used.

[Kevin DuBois (kdub)]

looks good

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1798
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2224/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1064
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1070
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1055
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/746
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/746/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/747
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/747/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3671
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3671/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2171
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10350

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2224/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

OK.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1800
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2228/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1069
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1075
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1060/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/750
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/750/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/751
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/751/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3688
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3688/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2177/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10367

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2228/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

-c 1792 probably fixes the error - re-approving

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1801
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2239/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1093
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1099
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1084
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/761
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/761/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/762
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/762/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/19
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2204
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10443

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2239/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-07-24 14:18:00 +0000
+++ debian/control	2014-07-25 13:59:43 +0000
@@ -48,34 +48,6 @@
 # just go ahead. ~mir-team will notice and sync up the code again.
 Vcs-Bzr: https://code.launchpad.net/~mir-team/mir/trunk
 
-Package: libmirprotobuf0
-Section: libs
-Architecture: i386 amd64 armhf arm64
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Display server for Ubuntu - protocol implementation
- Mir is a display server running on linux systems, with a focus on efficiency,
- robust operation and a well-defined driver model.
- .
- Contains the protocol's shared library.
-
-Package: libmirprotobuf-dev
-Section: libdevel
-Architecture: i386 amd64 armhf arm64
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirprotobuf0 (= ${binary:Version}),
-         libprotobuf-dev,
-         ${misc:Depends},
-         ${shlibs:Depends},
-Description: Display server for Ubuntu - protocol definition
- Mir is a display server running on linux systems, with a focus on efficiency,
- robust operation and a well-defined driver model.
- .
- Contains the protocol's definition files.
-
 Package: libmirserver24
 Section: libs
 Architecture: i386 amd64 armhf arm64

=== removed file 'debian/libmirprotobuf-dev.install'
--- debian/libmirprotobuf-dev.install	2013-06-24 12:15:28 +0000
+++ debian/libmirprotobuf-dev.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/libmirprotobuf.so
-usr/share/mir/protocol

=== removed file 'debian/libmirprotobuf0.install'
--- debian/libmirprotobuf0.install	2013-08-28 03:41:48 +0000
+++ debian/libmirprotobuf0.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/libmirprotobuf.so.0
-

=== added directory 'include/shared/mir/udev'
=== renamed file 'include/platform/mir/udev/wrapper.h' => 'include/shared/mir/udev/wrapper.h'
--- include/platform/mir/udev/wrapper.h	2014-03-06 06:05:17 +0000
+++ include/shared/mir/udev/wrapper.h	2014-07-25 13:59:43 +0000
@@ -21,7 +21,6 @@
 
 #include <memory>
 #include <libudev.h>
-#include <mir/graphics/event_handler_register.h>
 
 namespace mir
 {

=== modified file 'server-ABI-sha1sums'
--- server-ABI-sha1sums	2014-07-24 11:44:53 +0000
+++ server-ABI-sha1sums	2014-07-25 13:59:43 +0000
@@ -185,7 +185,7 @@
 69a0f4d11e14ef67d0cdcca3a243b4ba4a918360  include/platform/mir/graphics/gl_primitive.h
 f62525771ca2612959ff88498883630458513235  include/platform/mir/graphics/gl_program.h
 871e609c0fed0d566ddbaaa8ac2d7cd5c06dd09a  include/platform/mir/abnormal_exit.h
-c0508e73dc0eda00276c252e2758a6d016b82aa6  include/platform/mir/udev/wrapper.h
+9f646fa12eaca5fc3b7a8fde6208673c071c8ef3  include/shared/mir/udev/wrapper.h
 b45f14082c4f8b29efaa1b13de795dcb29deb738  include/platform/mir/options/option.h
 f42afacda33e598f9c29f2f5b72932f75dd7d27c  include/platform/mir/options/program_option.h
 5879da8056f9a4ff8960f586d27117c87b110b2a  include/platform/mir/options/default_configuration.h

=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2014-07-22 20:42:40 +0000
+++ src/client/CMakeLists.txt	2014-07-25 13:59:43 +0000
@@ -70,17 +70,13 @@
 
 set(
   MIR_CLIENT_LIBRARIES
+  mirclientrpc
+  mirclientlttngstatic
+  mircommon
+
   ${Boost_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT}
-  ${PROTOBUF_LIBRARIES}
   ${XKBCOMMON_LIBRARIES}
-
-  mirprotobuf
-  mirclientrpc
-  mirclientlttngstatic
-  mircommon
-
-  3rd_party
 )
 
 target_link_libraries(

=== modified file 'src/client/lttng/CMakeLists.txt'
--- src/client/lttng/CMakeLists.txt	2014-07-14 10:57:28 +0000
+++ src/client/lttng/CMakeLists.txt	2014-07-25 13:59:43 +0000
@@ -27,6 +27,8 @@
   -ldl
 )
 
+add_dependencies(mirclientlttngstatic mircommonprotobuf)
+
 target_link_libraries(
   mirclientlttng
 

=== modified file 'src/client/rpc/CMakeLists.txt'
--- src/client/rpc/CMakeLists.txt	2014-07-22 20:42:40 +0000
+++ src/client/rpc/CMakeLists.txt	2014-07-25 13:59:43 +0000
@@ -1,8 +1,3 @@
-include_directories(
-  ${PROTOBUF_INCLUDE_DIRS}
-  ${CMAKE_CURRENT_BINARY_DIR}
-)
-
 add_library(
   mirclientrpc STATIC
 
@@ -11,11 +6,9 @@
   mir_protobuf_rpc_channel.cpp
   make_socket_rpc_channel.cpp
   stream_socket_transport.cpp
-  ${PROTO_SRCS}
 )
 
 target_link_libraries(
   mirclientrpc
-
-  ${PROTOBUF_LIBRARIES}
+  mircommon
 )

=== modified file 'src/platform/CMakeLists.txt'
--- src/platform/CMakeLists.txt	2014-07-14 15:05:00 +0000
+++ src/platform/CMakeLists.txt	2014-07-25 13:59:43 +0000
@@ -4,15 +4,12 @@
 add_library(
   mirplatform SHARED
   shared_library_loader.cpp
-  udev_wrapper.cpp
 )
 
 target_link_libraries(
   mirplatform
   mirplatformgraphicscommon
   mircommon
-
-  ${UDEV_LDFLAGS} ${UDEV_LIBRARIES}
 )
 
 install(TARGETS mirplatform LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})

=== modified file 'src/platform/graphics/mesa/display.cpp'
--- src/platform/graphics/mesa/display.cpp	2014-06-23 16:29:17 +0000
+++ src/platform/graphics/mesa/display.cpp	2014-07-25 13:59:43 +0000
@@ -25,6 +25,7 @@
 #include "kms_page_flipper.h"
 #include "virtual_terminal.h"
 #include "mir/graphics/overlapping_output_grouping.h"
+#include "mir/graphics/event_handler_register.h"
 
 #include "mir/graphics/display_report.h"
 #include "mir/graphics/gl_context.h"

=== modified file 'src/server/frontend/CMakeLists.txt'
--- src/server/frontend/CMakeLists.txt	2014-07-14 15:05:00 +0000
+++ src/server/frontend/CMakeLists.txt	2014-07-25 13:59:43 +0000
@@ -32,7 +32,7 @@
 )
 
 # Fix build race condition - ensure the protobuf header is built before us.
-add_dependencies(mirfrontend mircommon)
+add_dependencies(mirfrontend mircommonprotobuf)
 
 target_link_libraries(
   mirfrontend

=== modified file 'src/shared/CMakeLists.txt'
--- src/shared/CMakeLists.txt	2014-07-24 11:44:53 +0000
+++ src/shared/CMakeLists.txt	2014-07-25 13:59:43 +0000
@@ -1,5 +1,6 @@
 set(MIR_GENERATED_INCLUDE_DIRECTORIES)
-set(MIR_COMMON_LIBRARIES)
+set(MIR_COMMON_SOURCES)
+set(MIR_COMMON_REFERENCES)
 add_subdirectory(protobuf/)
 
 if (MIR_BUILD_PLATFORM_ANDROID)
@@ -31,20 +32,22 @@
   PARENT_SCOPE)
 
 
-add_library(
-  mircommon SHARED
+MESSAGE( STATUS "MIR_COMMON_SOURCES. . . : ${MIR_COMMON_SOURCES}" )
+MESSAGE( STATUS "MIR_COMMON_REFERENCES . : ${MIR_COMMON_REFERENCES}" )
+
+add_library(mircommon
+  SHARED
+  ${MIR_COMMON_SOURCES}
 )
 
-target_link_libraries(
-  mircommon
-  ${MIR_COMMON_LIBRARIES}
+target_link_libraries(mircommon
+  ${MIR_COMMON_REFERENCES}
 )
 
 # TODO we need a place to manage ABI and related versioning but use this as placeholder
 set(MIR_SHARED_ABI 1)
 
-set_target_properties(
-  mircommon
+set_target_properties(mircommon
 
   PROPERTIES
   SOVERSION ${MIR_SHARED_ABI}

=== modified file 'src/shared/env/CMakeLists.txt'
--- src/shared/env/CMakeLists.txt	2014-07-14 16:32:14 +0000
+++ src/shared/env/CMakeLists.txt	2014-07-25 13:59:43 +0000
@@ -14,12 +14,12 @@
 #
 # Authored by: Daniel van Vugt <[e-mail]>
 
-add_library(mirsharedenv STATIC
+add_library(mirsharedenv OBJECT
   default_configuration.cpp
 )
 
-list(APPEND MIR_COMMON_LIBRARIES
-  mirsharedenv
+list(APPEND MIR_COMMON_SOURCES
+  $<TARGET_OBJECTS:mirsharedenv>
 )
 
-set(MIR_COMMON_LIBRARIES ${MIR_COMMON_LIBRARIES} PARENT_SCOPE)
+set(MIR_COMMON_SOURCES ${MIR_COMMON_SOURCES} PARENT_SCOPE)

=== modified file 'src/shared/fd/CMakeLists.txt'
--- src/shared/fd/CMakeLists.txt	2014-07-23 16:53:13 +0000
+++ src/shared/fd/CMakeLists.txt	2014-07-25 13:59:43 +0000
@@ -14,12 +14,12 @@
 #
 # Authored by: Kevin DuBois <[e-mail]>
 
-add_library(mirsharedfd STATIC
+add_library(mirsharedfd OBJECT
   fd.cpp
 )
 
-list(APPEND MIR_COMMON_LIBRARIES
-  mirsharedfd
+list(APPEND MIR_COMMON_SOURCES
+  $<TARGET_OBJECTS:mirsharedfd>
 )
 
-set(MIR_COMMON_LIBRARIES ${MIR_COMMON_LIBRARIES} PARENT_SCOPE)
+set(MIR_COMMON_SOURCES ${MIR_COMMON_SOURCES} PARENT_SCOPE)
\ No newline at end of file

=== modified file 'src/shared/geometry/CMakeLists.txt'
--- src/shared/geometry/CMakeLists.txt	2014-07-14 16:32:14 +0000
+++ src/shared/geometry/CMakeLists.txt	2014-07-25 13:59:43 +0000
@@ -14,16 +14,14 @@
 #
 # Authored by: Alexandros Frantzis <[e-mail]>
 
-add_library(
-  mirsharedgeometry STATIC
-
+add_library(mirsharedgeometry OBJECT
   rectangle.cpp
   rectangles.cpp
   ostream.cpp
 )
 
-list(APPEND MIR_COMMON_LIBRARIES
-  mirsharedgeometry
+list(APPEND MIR_COMMON_SOURCES
+  $<TARGET_OBJECTS:mirsharedgeometry>
 )
 
-set(MIR_COMMON_LIBRARIES ${MIR_COMMON_LIBRARIES} PARENT_SCOPE)
+set(MIR_COMMON_SOURCES ${MIR_COMMON_SOURCES} PARENT_SCOPE)

=== modified file 'src/shared/input/CMakeLists.txt'
--- src/shared/input/CMakeLists.txt	2014-07-14 16:32:14 +0000
+++ src/shared/input/CMakeLists.txt	2014-07-25 13:59:43 +0000
@@ -24,20 +24,22 @@
 
 add_subdirectory(android)
 
-add_library(
-  mirsharedinput STATIC
+add_library(mirsharedinput OBJECT
   ${ANDROID_SHARED_INPUT_SOURCES}
-)
-
-target_link_libraries(
-  mirsharedinput
-  
-  android-input
-  ${XKBCOMMON_LIBRARIES}
-)
-
-list(APPEND MIR_COMMON_LIBRARIES
-  mirsharedinput
-)
-
-set(MIR_COMMON_LIBRARIES ${MIR_COMMON_LIBRARIES} PARENT_SCOPE)
+  udev_wrapper.cpp
+)
+
+list(APPEND MIR_COMMON_SOURCES
+  $<TARGET_OBJECTS:mirsharedinput>
+)
+
+# As we put android-input in MIR_COMMON_REFERENCES it ends up linked into
+# libmirserver. But linking into libmircommon fails as it in turn needs
+# mir::mir::terminate_with_current_exception() from mirserver
+list(APPEND MIR_COMMON_REFERENCES android-input)
+
+list(APPEND MIR_COMMON_REFERENCES ${XKBCOMMON_LIBRARIES})
+list(APPEND MIR_COMMON_REFERENCES ${UDEV_LDFLAGS} ${UDEV_LIBRARIES})
+
+set(MIR_COMMON_SOURCES ${MIR_COMMON_SOURCES} PARENT_SCOPE)
+set(MIR_COMMON_REFERENCES ${MIR_COMMON_REFERENCES} PARENT_SCOPE)

=== modified file 'src/shared/input/android/CMakeLists.txt'
--- src/shared/input/android/CMakeLists.txt	2013-04-30 18:51:07 +0000
+++ src/shared/input/android/CMakeLists.txt	2014-07-25 13:59:43 +0000
@@ -22,8 +22,4 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/android_input_platform.cpp
 )
 
-set(
-  ANDROID_SHARED_INPUT_SOURCES
-  ${ANDROID_SHARED_INPUT_SOURCES}
-  PARENT_SCOPE
-)
+set(ANDROID_SHARED_INPUT_SOURCES ${ANDROID_SHARED_INPUT_SOURCES} PARENT_SCOPE)

=== renamed file 'src/platform/udev_wrapper.cpp' => 'src/shared/input/udev_wrapper.cpp'
=== modified file 'src/shared/logging/CMakeLists.txt'
--- src/shared/logging/CMakeLists.txt	2014-07-14 16:32:14 +0000
+++ src/shared/logging/CMakeLists.txt	2014-07-25 13:59:43 +0000
@@ -14,13 +14,13 @@
 #
 # Authored by: Alexandros Frantzis <[e-mail]>
 
-add_library(mirsharedlogging STATIC
+add_library(mirsharedlogging OBJECT
   dumb_console_logger.cpp
   input_timestamp.cpp
 )
 
-list(APPEND MIR_COMMON_LIBRARIES
-  mirsharedlogging
+list(APPEND MIR_COMMON_SOURCES
+  $<TARGET_OBJECTS:mirsharedlogging>
 )
 
-set(MIR_COMMON_LIBRARIES ${MIR_COMMON_LIBRARIES} PARENT_SCOPE)
+set(MIR_COMMON_SOURCES ${MIR_COMMON_SOURCES} PARENT_SCOPE)

=== modified file 'src/shared/protobuf/CMakeLists.txt'
--- src/shared/protobuf/CMakeLists.txt	2014-07-14 16:32:14 +0000
+++ src/shared/protobuf/CMakeLists.txt	2014-07-25 13:59:43 +0000
@@ -13,27 +13,16 @@
   ${MIR_PROTOBUF_PROTOCOL_SPEC}
 )
 
-add_library(
-  mirprotobuf SHARED
-   
+add_library(mirprotobuf OBJECT
   google_protobuf_guard.cpp
   ${GENERATED_PROTOBUF_SRCS}
-  ${GENERATED_PROTOBUF_HDRS})
-
-set(MIRPROTOBUF_ABI 0)
-
-set_target_properties(
-  mirprotobuf
-
-  PROPERTIES
-  SOVERSION ${MIRPROTOBUF_ABI}
-)
-
-target_link_libraries(
-  mirprotobuf
-
-  ${PROTOBUF_LIBRARIES}
-)
+  ${GENERATED_PROTOBUF_HDRS}
+)
+
+list(APPEND MIR_COMMON_SOURCES
+  $<TARGET_OBJECTS:mirprotobuf>
+)
+
 
 # Export the include directories
 list(APPEND MIR_GENERATED_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR})
@@ -43,21 +32,9 @@
   ${MIR_GENERATED_INCLUDE_DIRECTORIES}
   PARENT_SCOPE)
 
-# Install the protobuf library
-install(
-  TARGETS mirprotobuf
-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-)
-
-install(
-  FILES ${MIR_PROTOBUF_PROTOCOL_SPEC}
-  DESTINATION share/mir/protocol
-)
-
-list(APPEND MIR_COMMON_LIBRARIES
-  mirprotobuf
-)
-
-set(MIR_COMMON_LIBRARIES ${MIR_COMMON_LIBRARIES} PARENT_SCOPE)
\ No newline at end of file
+list(APPEND MIR_COMMON_REFERENCES
+  ${PROTOBUF_LIBRARIES}
+)
+
+set(MIR_COMMON_SOURCES ${MIR_COMMON_SOURCES} PARENT_SCOPE)
+set(MIR_COMMON_REFERENCES ${MIR_COMMON_REFERENCES} PARENT_SCOPE)

=== modified file 'src/shared/report/lttng/CMakeLists.txt'
--- src/shared/report/lttng/CMakeLists.txt	2014-07-14 16:32:14 +0000
+++ src/shared/report/lttng/CMakeLists.txt	2014-07-25 13:59:43 +0000
@@ -1,13 +1,12 @@
 add_definitions(-DMIR_TRACEPOINT_LIB_INSTALL_PATH="${CMAKE_INSTALL_PREFIX}/${MIR_TRACEPOINT_LIB_INSTALL_DIR}")
 
-add_library(
-  mirsharedlttng STATIC
+add_library(mirsharedlttng OBJECT
 
   tracepoint_provider.cpp
 )
 
-list(APPEND MIR_COMMON_LIBRARIES
-  mirsharedlttng
+list(APPEND MIR_COMMON_SOURCES
+  $<TARGET_OBJECTS:mirsharedlttng>
 )
 
-set(MIR_COMMON_LIBRARIES ${MIR_COMMON_LIBRARIES} PARENT_SCOPE)
\ No newline at end of file
+set(MIR_COMMON_SOURCES ${MIR_COMMON_SOURCES} PARENT_SCOPE)
\ No newline at end of file

=== modified file 'src/shared/sharedlibrary/CMakeLists.txt'
--- src/shared/sharedlibrary/CMakeLists.txt	2014-07-14 16:32:14 +0000
+++ src/shared/sharedlibrary/CMakeLists.txt	2014-07-25 13:59:43 +0000
@@ -14,17 +14,15 @@
 #
 # Authored by: Alexandros Frantzis <[e-mail]>
 
-add_library(mirsharedsharedlibrary STATIC
+add_library(mirsharedsharedlibrary OBJECT
   shared_library.cpp
 )
 
-target_link_libraries(
-    mirsharedsharedlibrary
-    dl
-)
-
-list(APPEND MIR_COMMON_LIBRARIES
-  mirsharedsharedlibrary
-)
-
-set(MIR_COMMON_LIBRARIES ${MIR_COMMON_LIBRARIES} PARENT_SCOPE)
+list(APPEND MIR_COMMON_SOURCES
+  $<TARGET_OBJECTS:mirsharedsharedlibrary>
+)
+
+list(APPEND MIR_COMMON_REFERENCES dl)
+
+set(MIR_COMMON_SOURCES ${MIR_COMMON_SOURCES} PARENT_SCOPE)
+set(MIR_COMMON_REFERENCES ${MIR_COMMON_REFERENCES} PARENT_SCOPE)

=== modified file 'src/shared/thread/CMakeLists.txt'
--- src/shared/thread/CMakeLists.txt	2014-07-14 16:32:14 +0000
+++ src/shared/thread/CMakeLists.txt	2014-07-25 13:59:43 +0000
@@ -14,17 +14,13 @@
 #
 # Authored by: Alexandros Frantzis <[e-mail]>
 
-add_library(mirsharedthread STATIC
+add_library(mirsharedthread OBJECT
   thread_name.cpp
   recursive_read_write_mutex.cpp
 )
 
-target_link_libraries(
-    mirsharedthread
-)
-
-list(APPEND MIR_COMMON_LIBRARIES
-  mirsharedthread
-)
-
-set(MIR_COMMON_LIBRARIES ${MIR_COMMON_LIBRARIES} PARENT_SCOPE)
\ No newline at end of file
+list(APPEND MIR_COMMON_SOURCES
+  $<TARGET_OBJECTS:mirsharedthread>
+)
+
+set(MIR_COMMON_SOURCES ${MIR_COMMON_SOURCES} PARENT_SCOPE)
\ No newline at end of file

=== modified file 'tests/mir_test/CMakeLists.txt'
--- tests/mir_test/CMakeLists.txt	2014-06-09 17:16:32 +0000
+++ tests/mir_test/CMakeLists.txt	2014-07-25 13:59:43 +0000
@@ -11,3 +11,5 @@
   wait_object.cpp
   current_thread_name.cpp
 )
+
+add_dependencies(mir-test mircommonprotobuf)

=== modified file 'tests/unit-tests/graphics/mesa/test_platform.cpp'
--- tests/unit-tests/graphics/mesa/test_platform.cpp	2014-06-19 15:44:20 +0000
+++ tests/unit-tests/graphics/mesa/test_platform.cpp	2014-07-25 13:59:43 +0000
@@ -18,6 +18,7 @@
 
 #include "mir/graphics/platform_ipc_package.h"
 #include "mir/graphics/drm_authenticator.h"
+#include "mir/graphics/event_handler_register.h"
 #include "src/platform/graphics/mesa/platform.h"
 #include "src/platform/graphics/mesa/internal_client.h"
 #include "src/server/report/null_report_factory.h"