Compile without trying to link ourself.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@23516 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 696692b239cf459f7405aea98c4bfe1503e7eefe..9ab4d4bf6a3c6de8f3fa1e0e2bf8737ba4d3ce47 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-13  George Staikos  <staikos@kde.org>
+
+        Reviewed by Lars.
+
+        Compile without self-linking.
+
+        * WebKit.pri:
+
 2007-06-13  Simon Hausmann  <hausmann@kde.org>
 
         Reviewed by Lars.

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1c331173d592f19e75efc3e21ffffab3533efcd4..7584bbd6031ee151423758e32bc50a65428f69fd 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-13  George Staikos  <staikos@kde.org>
+
+        Reviewed by Lars.
+
+        Compile without self-linking.
+
+        * WebCore.pro:
+
 2007-06-13  Darin Adler  <darin@apple.com>
 
         Reviewed by Kevin Decker.

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 95a1148e0470fa7855f307e082c3cacbfaccdea4..69de43f6ea9dd0a548eb6cb8b84550ece6bed01b 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -1,5 +1,6 @@
 # -*- Mode:makefile -*-
 # WebCore - qmake build info
+CONFIG += building-libs
 include($$PWD/../WebKit.pri)
 qt-port:LIBS -= -lWebKitQt
 gdk-port:LIBS -= -lWebKitGdk

diff --git a/WebKit.pri b/WebKit.pri
index 5853baa6db3132584a7cfe4b0dcf7c833024c2b3..36a63d6e558781fc19144f8f1c88c9515403c567 100644 (file)
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -5,7 +5,7 @@ isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD/WebKitBuild/Release
 
 !gdk-port:CONFIG += qt-port
 qt-port:DEFINES += BUILDING_QT__=1
-qt-port:LIBS += -L$$OUTPUT_DIR/lib -lQtWebKit
+qt-port:!building-libs:LIBS += -L$$OUTPUT_DIR/lib -lQtWebKit
 gdk-port:CONFIG += link_pkgconfig
 gdk-port:PKGCONFIG += cairo gdk-2.0 gtk+-2.0 libcurl
 gdk-port:DEFINES += BUILDING_GDK__=1 BUILDING_CAIRO__