summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-11-02 17:22:37 +0100
committerAndrea Diamantini <adjam7@gmail.com>2009-11-02 17:22:37 +0100
commit07665d5cacd70a871794fe3ec5dbcfc234b7cbf9 (patch)
treeefb64f872a54873bef9831e2d8b8a9cd1dd82059
parentsource fixes (diff)
downloadrekonq-07665d5cacd70a871794fe3ec5dbcfc234b7cbf9.tar.xz
Compiling rekonq as a kdeinit executable
-rw-r--r--src/CMakeLists.txt14
-rw-r--r--src/main.cpp2
2 files changed, 8 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 279d9519..b9bb78a8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
### ------- SETTING REKONQ FILES..
-SET( rekonq_SRCS
+SET( rekonq_KDEINIT_SRCS
homepage.cpp
previewimage.cpp
websnap.cpp
@@ -18,8 +18,7 @@ SET( rekonq_SRCS
urlbar.cpp
findbar.cpp
settings.cpp
- webview.cpp
- main.cpp
+ webview.cpp
sidepanel.cpp
panelhistory.cpp
lineedit.cpp
@@ -29,7 +28,7 @@ SET( rekonq_SRCS
)
-KDE4_ADD_UI_FILES( rekonq_SRCS
+KDE4_ADD_UI_FILES( rekonq_KDEINIT_SRCS
settings_general.ui
settings_tabs.ui
settings_fonts.ui
@@ -37,7 +36,7 @@ KDE4_ADD_UI_FILES( rekonq_SRCS
cleardata.ui
)
-KDE4_ADD_KCFG_FILES( rekonq_SRCS rekonq.kcfgc )
+KDE4_ADD_KCFG_FILES( rekonq_KDEINIT_SRCS rekonq.kcfgc )
### ------------- INCLUDING DIRECTORIES...
@@ -55,12 +54,12 @@ ADD_DEFINITIONS ( ${KDE4_DEFINITIONS} )
### --------------- ADDING EXECUTABLE...
-KDE4_ADD_EXECUTABLE( rekonq ${rekonq_SRCS} )
+KDE4_ADD_KDEINIT_EXECUTABLE( rekonq ${rekonq_KDEINIT_SRCS} main.cpp )
### --------------- TARGETTING LINK LIBRARIES...
-TARGET_LINK_LIBRARIES ( rekonq
+TARGET_LINK_LIBRARIES ( kdeinit_rekonq
${QT_LIBRARIES}
${QT_QTNETWORK_LIBRARY}
${QT_QTWEBKIT_LIBRARY}
@@ -74,4 +73,5 @@ TARGET_LINK_LIBRARIES ( rekonq
### ------------ INSTALL FILES...
INSTALL( TARGETS rekonq ${INSTALL_TARGETS_DEFAULT_ARGS} )
+INSTALL( TARGETS kdeinit_rekonq ${INSTALL_TARGETS_DEFAULT_ARGS} )
INSTALL( FILES rekonq.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
diff --git a/src/main.cpp b/src/main.cpp
index c874debd..c0e4b70d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -41,7 +41,7 @@ static const char description[] =
I18N_NOOP("A lightweight Web Browser for KDE based on WebKit");
-int main(int argc, char **argv)
+extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
{
KAboutData about("rekonq",
0,