welcome to the world of kdeinit applications

svn path=/trunk/KDE/kdebase/apps/; revision=1103978

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a8e9c89c0e0c7c77e0dec71bb86e5849407264a4..f6d63fc1161486310dd4338c6c37d485f811e4cd 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -203,9 +203,9 @@ qt4_add_dbus_adaptor(dolphin_SRCS
 
 kde4_add_app_icon(dolphin_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/system-file-manager.png")
 
-kde4_add_executable(dolphin ${dolphin_SRCS})
+kde4_add_kdeinit_executable(dolphin ${dolphin_SRCS})
 
-target_link_libraries(dolphin
+target_link_libraries(kdeinit_dolphin
     ${KDE4_KDEPRINT_LIBS}
     ${KDE4_KFILE_LIBS}
     ${KDE4_KUTILS_LIBRARY}
@@ -216,13 +216,14 @@ target_link_libraries(dolphin
 )
 
 if (Nepomuk_FOUND)
-    target_link_libraries(dolphin
+    target_link_libraries(kdeinit_dolphin
         ${NEPOMUK_LIBRARIES}
         ${SOPRANO_LIBRARIES}
         ${NEPOMUK_QUERY_LIBRARIES}
     )
 endif (Nepomuk_FOUND)
 
+install(TARGETS kdeinit_dolphin ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(TARGETS dolphin ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ##########################################

diff --git a/src/main.cpp b/src/main.cpp
index 3418c333f8790f78960a23b6294a8ed0323e8938..290ca18ab0d52489ddc571e422eee9409c24ae87 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,7 +28,8 @@
 #include <kmainwindow.h>
 #include <kdebug.h>
 
-int main(int argc, char **argv)
+extern "C"
+KDE_EXPORT int kdemain(int argc, char **argv)
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),