Build WebCore as a sub-framework of WebKit in all configurations.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 35632e0feef4aa848d3fb00a589d1597dcb96116..bd3529ec82923e0485068522fe9519fe7af977c1 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-16  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Tim Hatcher.
+
+        Build WebCore as a sub-framework of WebKit in all configurations.
+
+        * Configurations/WebCore.xcconfig:
+        * WebCore.xcodeproj/project.pbxproj:
+
 2007-11-16  Doug Turner  <dougt@meer.net>
 
         Reviewed by Alp.

diff --git a/WebCore/Configurations/WebCore.xcconfig b/WebCore/Configurations/WebCore.xcconfig
index e7c3094b25137785c10173d63f8db06c38231668..e1fbb4044f59b2d1064952eae800cc0e2a701216 100644 (file)
--- a/WebCore/Configurations/WebCore.xcconfig
+++ b/WebCore/Configurations/WebCore.xcconfig
@@ -13,3 +13,4 @@ HEADER_SEARCH_PATHS = ForwardingHeaders icu /usr/include/libxslt /usr/include/li
 INFOPLIST_FILE = Info.plist;
 INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
 PRODUCT_NAME = WebCore;
+OTHER_LDFLAGS = -lobjc -sub_library libobjc -umbrella WebKit;

diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 16cdb376ad61145d48787355b5cb6244b9d56d3a..76eb457e7e449241e58148a3ee83fd5479505933 100644 (file)
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -15482,11 +15482,6 @@
                        buildSettings = {
                                DEBUG_DEFINES = DISABLE_THREAD_CHECK;
                                INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
-                               OTHER_LDFLAGS = (
-                                       "-lobjc",
-                                       "-sub_library",
-                                       libobjc,
-                               );
                        };
                        name = Debug;
                };
@@ -15496,11 +15491,6 @@
                        buildSettings = {
                                DEBUG_DEFINES = NDEBUG;
                                INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
-                               OTHER_LDFLAGS = (
-                                       "-lobjc",
-                                       "-sub_library",
-                                       libobjc,
-                               );
                        };
                        name = Release;
                };
@@ -15509,13 +15499,6 @@
                        baseConfigurationReference = 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */;
                        buildSettings = {
                                DEBUG_DEFINES = NDEBUG;
-                               OTHER_LDFLAGS = (
-                                       "-lobjc",
-                                       "-sub_library",
-                                       libobjc,
-                                       "-umbrella",
-                                       WebKit,
-                               );
                                SECTORDER_FLAGS = (
                                        "-sectorder",
                                        __TEXT,

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6bca424d84749524f562752c18949a065502d3b8..1dedf724e440e03c59809e71fb65a39555a44db8 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-16  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Tim Hatcher.
+
+        Build WebCore as a sub-framework of WebKit in all configurations.
+
+        * WebKit.xcodeproj/project.pbxproj:
+
 2007-11-16  Brady Eidson  <beidson@apple.com>
 
         * WebKit.xcodeproj/project.pbxproj: WebDatabaseManagerPrivate.h, also!

diff --git a/WebKit/WebKit.xcodeproj/project.pbxproj b/WebKit/WebKit.xcodeproj/project.pbxproj
index 95b86e1a451109327a9029343fbb3d12f3d909bb..c5f9372e9edfc63f18df47fdedb148ddeafeb536 100644 (file)
--- a/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/WebKit/WebKit.xcodeproj/project.pbxproj
@@ -1647,9 +1647,7 @@
                                INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                                JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = "$(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/PrivateHeaders";
                                OTHER_LDFLAGS = (
-                                       "-lobjc",
-                                       "-sub_library",
-                                       libobjc,
+                                       "$(OTHER_LDFLAGS)",
                                        "-l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)",
                                );
                                UMBRELLA_FRAMEWORKS_DIR = "$(BUILT_PRODUCTS_DIR)";
@@ -1664,9 +1662,7 @@
                                INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                                JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = "$(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/PrivateHeaders";
                                OTHER_LDFLAGS = (
-                                       "-lobjc",
-                                       "-sub_library",
-                                       libobjc,
+                                       "$(OTHER_LDFLAGS)",
                                        "-l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)",
                                );
                                UMBRELLA_FRAMEWORKS_DIR = "$(BUILT_PRODUCTS_DIR)";
@@ -1679,8 +1675,7 @@
                        buildSettings = {
                                DEBUG_DEFINES = NDEBUG;
                                OTHER_LDFLAGS = (
-                                       "-sub_umbrella",
-                                       WebCore,
+                                       "$(OTHER_LDFLAGS)",
                                        "-lWebKitSystemInterface",
                                );
                                SECTORDER_FLAGS = (

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 81d06b63a75ac70bed58cdae886634a88ca06b87..3f1de4525bef2fa986228651bbbd8e996ef895b4 100644 (file)
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-16  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Tim Hatcher.
+
+        Build WebCore as a sub-framework of WebKit in all configurations.
+
+        * Configurations/WebKit.xcconfig:
+
 2007-11-16  John Sullivan  <sullivan@apple.com>
 
         Reviewed by Brady

diff --git a/WebKit/mac/Configurations/WebKit.xcconfig b/WebKit/mac/Configurations/WebKit.xcconfig
index fcd0e98a24e0fbbe3bd8dda36927ca9934da6a0a..3ff3faa6da287df30fcaa216a0986c323a865861 100644 (file)
--- a/WebKit/mac/Configurations/WebKit.xcconfig
+++ b/WebKit/mac/Configurations/WebKit.xcconfig
@@ -16,3 +16,4 @@ JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Framework
 PRODUCT_NAME = WebKit;
 UMBRELLA_FRAMEWORKS_DIR = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
 WEBCORE_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
+OTHER_LDFLAGS = -sub_umbrella WebCore $(OTHER_LDFLAGS);

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 65202a8703d687955f06c22f9e24fcdb2789bf1d..a2581814bb39b1785030fb62e5b110dfbc9c4ae5 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-16  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Tim Hatcher.
+
+        Don't weak link against WebCore now that it is a sub-framework of WebKit in all configurations.
+
+        * Drosera/mac/Drosera.xcodeproj/project.pbxproj:
+        * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
+
 2007-11-15  Adam Roben  <aroben@apple.com>
 
         Make run-safari actually work on Windows

diff --git a/WebKitTools/Drosera/mac/Drosera.xcodeproj/project.pbxproj b/WebKitTools/Drosera/mac/Drosera.xcodeproj/project.pbxproj
index c6751cc17791822d150683f6ec8a3ea89002bf87..3ef8b646371566780f7a428d696ccdd0e41f8afc 100644 (file)
--- a/WebKitTools/Drosera/mac/Drosera.xcodeproj/project.pbxproj
+++ b/WebKitTools/Drosera/mac/Drosera.xcodeproj/project.pbxproj
@@ -575,12 +575,6 @@
                                GCC_PREFIX_HEADER = "";
                                HEADER_SEARCH_PATHS = ../ForwardingHeaders;
                                INFOPLIST_FILE = Info.plist;
-                               OTHER_LDFLAGS = (
-                                       "-weak_framework",
-                                       JavaScriptCore,
-                                       "-weak_framework",
-                                       WebCore,
-                               );
                                PRODUCT_NAME = Drosera;
                                USER_HEADER_SEARCH_PATHS = ../ForwardingHeaders/;
                                VALID_ARCHS = "ppc7400 ppc970 i386 ppc";
@@ -599,12 +593,6 @@
                                GCC_PREFIX_HEADER = "";
                                HEADER_SEARCH_PATHS = ../ForwardingHeaders;
                                INFOPLIST_FILE = Info.plist;
-                               OTHER_LDFLAGS = (
-                                       "-weak_framework",
-                                       JavaScriptCore,
-                                       "-weak_framework",
-                                       WebCore,
-                               );
                                PRODUCT_NAME = Drosera;
                                USER_HEADER_SEARCH_PATHS = ../ForwardingHeaders/;
                                VALID_ARCHS = "ppc7400 ppc970 i386 ppc";

diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj b/WebKitTools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
index 531884d0aae3c77384c5d34d33522151482a0783..10507bc7c9a0d8dcdad789a3743171c33d552ee2 100644 (file)
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
@@ -524,12 +524,6 @@
                                LIBRARY_STYLE = BUNDLE;
                                OPTIMIZATION_CFLAGS = "-O0";
                                OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = (
-                                       "-framework",
-                                       Carbon,
-                                       "-weak_framework",
-                                       WebCore,
-                               );
                                OTHER_REZFLAGS = "";
                                PREBINDING = NO;
                                PRODUCT_NAME = TestNetscapePlugIn;
@@ -555,12 +549,6 @@
                                LIBRARY_STYLE = BUNDLE;
                                OPTIMIZATION_CFLAGS = "-O0";
                                OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = (
-                                       "-framework",
-                                       Carbon,
-                                       "-weak_framework",
-                                       WebCore,
-                               );
                                OTHER_REZFLAGS = "";
                                PREBINDING = NO;
                                PRODUCT_NAME = TestNetscapePlugIn;
@@ -585,8 +573,6 @@
                                        __DATA,
                                        Ahem,
                                        "qt/fonts/AHEM____.TTF",
-                                       "-weak_framework",
-                                       WebCore,
                                );
                                PRODUCT_NAME = DumpRenderTree;
                                VALID_ARCHS = "ppc7400 ppc970 i386 ppc";
@@ -603,8 +589,6 @@
                                        __DATA,
                                        Ahem,
                                        "qt/fonts/AHEM____.TTF",
-                                       "-weak_framework",
-                                       WebCore,
                                );
                                PRODUCT_NAME = DumpRenderTree;
                                VALID_ARCHS = "ppc7400 ppc970 i386 ppc";
@@ -626,10 +610,6 @@
                                MACOSX_DEPLOYMENT_TARGET_ = 10.4;
                                MACOSX_DEPLOYMENT_TARGET_1040 = 10.4;
                                MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
-                               OTHER_LDFLAGS = (
-                                       "-weak_framework",
-                                       WebCore,
-                               );
                                PREBINDING = NO;
                                WARNING_CFLAGS = (
                                        "-Wall",
@@ -653,10 +633,6 @@
                                MACOSX_DEPLOYMENT_TARGET_ = 10.4;
                                MACOSX_DEPLOYMENT_TARGET_1040 = 10.4;
                                MACOSX_DEPLOYMENT_TARGET_1050 = 10.5;
-                               OTHER_LDFLAGS = (
-                                       "-weak_framework",
-                                       WebCore,
-                               );
                                PREBINDING = NO;
                                WARNING_CFLAGS = (
                                        "-Wall",
@@ -673,10 +649,6 @@
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                OPTIMIZATION_CFLAGS = "-O0";
                                OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = (
-                                       "-weak_framework",
-                                       WebCore,
-                               );
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = All;
                                SECTORDER_FLAGS = "";
@@ -695,10 +667,6 @@
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                OPTIMIZATION_CFLAGS = "-O0";
                                OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = (
-                                       "-weak_framework",
-                                       WebCore,
-                               );
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = All;
                                SECTORDER_FLAGS = "";