[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

Maximiliano Curia maxy at moszumanska.debian.org
Sat May 28 00:17:05 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=753b1b5

The following commit has been merged in the master branch:
commit 753b1b55b499be454371f1df6a24b4e33a2945ff
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Sep 19 15:54:01 2010 +0000

    Turn into a real lib.
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1177145
---
 CMakeLists.txt        |  4 ++--
 app/CMakeLists.txt    | 17 +----------------
 config/CMakeLists.txt |  8 +-------
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02adb26..8ca7699 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ include_directories (${KDE4_INCLUDES}
                      ${QT_QTWEBKIT_INCLUDES}
 )
 
-
+add_subdirectory(lib)
 add_subdirectory(app)
 add_subdirectory(config)
-add_subdirectory(data)
\ No newline at end of file
+add_subdirectory(data)
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 221d6ae..86bea23 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -5,26 +5,11 @@ include_directories(../lib/)
 set(telepathy_chat_handler_SRCS
         main.cpp
         mainwindow.cpp
-        ../lib/chatconnection.cpp
-        ../lib/chatwindow.cpp
-        ../lib/chatwindowstyle.cpp
-        ../lib/chatwindowstylemanager.cpp
-        ../lib/chatview.cpp
-        ../lib/telepathychatmessageinfo.cpp
-        ../lib/telepathychatinfo.cpp
-        ../lib/channelcontactlist.cpp
 )
 
-
-set(telepathy_chat_handler_UI
-    ../lib/chatwindow.ui
-)
-
-kde4_add_ui_files(telepathy_chat_handler_SRCS ${telepathy_chat_handler_UI})
-
 kde4_add_executable(telepathy-chat-handler ${telepathy_chat_handler_SRCS})
 
-target_link_libraries(telepathy-chat-handler ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${TELEPATHY_QT4_LIBRARIES} ${QT_QTWEBKIT_LIBRARY} ${KDE4_KUTILS_LIBS} )
+target_link_libraries(telepathy-chat-handler ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${TELEPATHY_QT4_LIBRARIES} ${QT_QTWEBKIT_LIBRARY} ${KDE4_KUTILS_LIBS} ktelepathy_chat_lib)
 
 configure_file(org.freedesktop.Telepathy.Client.KDEChatHandler.service.in
                ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDEChatHandler.service)
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index ba92b1e..436e045 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -5,15 +5,9 @@ include_directories(../lib/)
 set(telepathy_chat_config_SRCS
         main.cpp
         mainwindow.cpp
-        ../lib/chatwindowstyle.cpp
-        ../lib/chatwindowstylemanager.cpp
-        ../lib/chatview.cpp
-        ../lib/telepathychatmessageinfo.cpp
-        ../lib/telepathychatinfo.cpp
 )
 
 set(telepathy_chat_config_UI
-    ../lib/chatwindow.ui
     chatwindowconfig.ui
 )
 
@@ -21,5 +15,5 @@ kde4_add_ui_files(telepathy_chat_config_SRCS ${telepathy_chat_config_UI})
 
 kde4_add_executable(telepathy-chat-config ${telepathy_chat_config_SRCS})
 
-target_link_libraries(telepathy-chat-config ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTWEBKIT_LIBRARY} ${KDE4_KUTILS_LIBS} )
+target_link_libraries(telepathy-chat-config ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTWEBKIT_LIBRARY} ${KDE4_KUTILS_LIBS} ktelepathy_chat_lib)
 

-- 
ktp-text-ui packaging



More information about the pkg-kde-commits mailing list