Compile without trying to link ourself.
authorstaikos <staikos@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Jun 2007 02:24:08 +0000 (02:24 +0000)
committerstaikos <staikos@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Jun 2007 02:24:08 +0000 (02:24 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@23516 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
WebCore/ChangeLog
WebCore/WebCore.pro
WebKit.pri

index 696692b..9ab4d4b 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.
index 1c33117..7584bbd 100644 (file)
@@ -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.
index 95a1148..69de43f 100644 (file)
@@ -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
index 5853baa..36a63d6 100644 (file)
@@ -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__