From 35aa997ed85c1a31c6b1fce486dc77502bbe0b60 Mon Sep 17 00:00:00 2001 From: staikos Date: Thu, 14 Jun 2007 02:24:08 +0000 Subject: [PATCH] Compile without trying to link ourself. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@23516 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 8 ++++++++ WebCore/ChangeLog | 8 ++++++++ WebCore/WebCore.pro | 1 + WebKit.pri | 2 +- 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 696692b239cf..9ab4d4bf6a3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-06-13 George Staikos + + Reviewed by Lars. + + Compile without self-linking. + + * WebKit.pri: + 2007-06-13 Simon Hausmann Reviewed by Lars. diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 1c331173d592..7584bbd6031e 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,11 @@ +2007-06-13 George Staikos + + Reviewed by Lars. + + Compile without self-linking. + + * WebCore.pro: + 2007-06-13 Darin Adler Reviewed by Kevin Decker. diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro index 95a1148e0470..69de43f6ea9d 100644 --- 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 5853baa6db31..36a63d6e5587 100644 --- 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__ -- 2.36.0