From 2d39416ea7806bb1ba7f2fd7e277117abd01cf65 Mon Sep 17 00:00:00 2001
From: John Brooks <john.brooks@jollamobile.com>
Date: Mon, 12 Nov 2012 13:35:58 -0700
Subject: [PATCH] Install libapplauncherd as a proper library

Headers are now installed, it has a soname, and is installed to /usr/lib
properly.
---
 CMakeLists.txt                 | 6 ------
 src/launcher/CMakeLists.txt    | 2 +-
 src/launcherlib/CMakeLists.txt | 9 +++++++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65582fa..f768dae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,12 +15,6 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -W -Wall -Wextra -g -O3")
 set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
 set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
 
-set(CMAKE_SKIP_BUILD_RPATH FALSE)
-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-set(CMAKE_INSTALL_RPATH "/usr/lib/applauncherd/")
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
-
-
 # Find libdl
 find_library(LIBDL NAMES dl)
 
diff --git a/src/launcher/CMakeLists.txt b/src/launcher/CMakeLists.txt
index 8ed60a8..a487558 100644
--- a/src/launcher/CMakeLists.txt
+++ b/src/launcher/CMakeLists.txt
@@ -23,7 +23,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -D_POSIX_C_SOURCE=200112L -Wl,--no-
 
 # Set precompiler flags
 add_definitions(-DLIBRARIES_CONFIG_FILE="/etc/applauncherd.conf")
-add_definitions(-DLAUNCHER_LIBRARY="/usr/lib/applauncherd/libapplauncherd.so")
+add_definitions(-DLAUNCHER_LIBRARY="/usr/lib/libapplauncherd.so.0")
 
 link_libraries(${LIBDL})
 
diff --git a/src/launcherlib/CMakeLists.txt b/src/launcherlib/CMakeLists.txt
index 8c14d80..b97c8dc 100644
--- a/src/launcherlib/CMakeLists.txt
+++ b/src/launcherlib/CMakeLists.txt
@@ -11,6 +11,9 @@ set(SRC appdata.cpp booster.cpp boosterfactory.cpp boosterpluginregistry.cpp
         connection.cpp daemon.cpp logger.cpp main.cpp 
         singleinstance.cpp socketmanager.cpp)
 
+set(HEADERS appdata.h booster.h boosterfactory.h boosterpluginregistry.h
+    connection.h daemon.h logger.h launcherlib.h singleinstance.h socketmanager.h)
+
 qt4_wrap_cpp(MOC_SRC ${MOC_HDRS})
 
 # Set libraries to be linked. Shared libraries to be preloaded are not linked in anymore,
@@ -19,7 +22,9 @@ link_libraries(${LIBDL} ${X11_LIBRARIES})
 
 # Set executable
 add_library(applauncherd MODULE ${SRC} ${MOC_SRC})
+set_target_properties(applauncherd PROPERTIES VERSION 0.1 SOVERSION 0)
 
 # Add install rule
-install(FILES libapplauncherd.so DESTINATION /usr/lib/applauncherd/)
-
+install(TARGETS applauncherd DESTINATION /usr/lib)
+install(FILES ${HEADERS} DESTINATION /usr/include/applauncherd
+  PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)