2008-03-02 Alp Toker <alp@atoker.com>
Reviewed by Mark Rowe.
Split the WebKit GTK+ build out of the WebCore build and change the
shared object name to match the package name.
* GNUmakefile.am:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@30702 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 4f2c1dc..64c836a 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -79,11 +79,12 @@
# Shared libraries
lib_LTLIBRARIES = \
- libWebKitGtk.la
+ libwebkit-1.0.la
# Convenience libraries
noinst_LTLIBRARIES = \
- libJavaScriptCore.la
+ libJavaScriptCore.la \
+ libWebCore.la
#
# JavaScriptCore
@@ -95,7 +96,7 @@
# The variables above are already included below so no need to touch
# these variables unless you really have to
-libJavaScriptCore_ladir = $(prefix)/include/WebKit/JavaScriptCore
+libJavaScriptCore_ladir = $(prefix)/include/webkit-1.0/JavaScriptCore
libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api)
libJavaScriptCore_la_SOURCES = \
@@ -128,36 +129,27 @@
webcore_cppflags :=
webcore_sources :=
webcore_headers :=
+webcore_libadd :=
webcore_built_sources :=
webcore_built_nosources :=
-# WebKitGtk
+webcore_cppflags += $(HILDON_CPPFLAGS)
+
+# WebKit
webkitgtk_h_api :=
webkitgtk_headers :=
webkitgtk_sources :=
webkitgtk_cppflags :=
-webkitgtk_libadd :=
webkitgtk_built_sources :=
webkitgtk_built_nosources :=
webkitgtk_cleanfiles :=
-webkitgtk_cppflags += $(HILDON_CPPFLAGS)
-
-# No need to touch the following variables unless you have to. If you need to change the values
-# for the following variables, use the "webkitgtk_" variables above
-libWebKitGtk_ladir := $(prefix)/include/WebKit/webkit
-
-libWebKitGtk_la_HEADERS = $(webkitgtk_h_api)
-
-libWebKitGtk_la_SOURCES = \
+libWebCore_la_SOURCES = \
$(webcore_built_sources) \
$(webcore_headers) \
- $(webcore_sources) \
- $(webkitgtk_built_sources) \
- $(webkitgtk_headers) \
- $(webkitgtk_sources)
+ $(webcore_sources)
-libWebKitGtk_la_CXXFLAGS = \
+libWebCore_la_CXXFLAGS = \
-fno-strict-aliasing \
$(global_cxxflags) \
$(global_cflags) \
@@ -170,7 +162,7 @@
$(COVERAGE_CFLAGS) \
$(HILDON_CFLAGS)
-libWebKitGtk_la_CFLAGS = \
+libWebCore_la_CFLAGS = \
-fno-strict-aliasing \
$(global_cflags) \
$(GLOBALDEPS_CFLAGS) \
@@ -182,14 +174,15 @@
$(COVERAGE_CFLAGS) \
$(HILDON_CFLAGS)
-libWebKitGtk_la_CPPFLAGS = \
+libWebCore_la_CPPFLAGS = \
$(global_cppflags) \
$(webcore_cppflags) \
$(webkitgtk_cppflags) \
$(ICU_CPPFLAGS)
-libWebKitGtk_la_LIBADD = libJavaScriptCore.la \
- $(webkitgtk_libadd) \
+libWebCore_la_LIBADD = \
+ libJavaScriptCore.la \
+ $(webcore_libadd) \
$(GLOBALDEPS_LIBS) \
$(WEBKITDEPS_LIBS) \
$(LIBCURL_LIBS) \
@@ -201,10 +194,30 @@
-lpthread \
-ljpeg
-libWebKitGtk_la_LDFLAGS = \
+libwebkit_1_0_ladir = $(prefix)/include/webkit-1.0/webkit
+libwebkit_1_0_la_HEADERS = $(webkitgtk_h_api)
+
+libwebkit_1_0_la_SOURCES = \
+ $(webkitgtk_built_sources) \
+ $(webkitgtk_headers) \
+ $(webkitgtk_sources)
+
+libwebkit_1_0_la_CXXFLAGS = \
+ $(libWebCore_la_CXXFLAGS)
+
+libwebkit_1_0_la_CFLAGS = \
+ $(libWebCore_la_CFLAGS)
+
+libwebkit_1_0_la_CPPFLAGS = \
+ $(libWebCore_la_CPPFLAGS)
+
+libwebkit_1_0_la_LDFLAGS = \
$(COVERAGE_LDFLAGS) \
-version-info @LIBWEBKITGTK_VERSION@
+libwebkit_1_0_la_LIBADD = \
+ libWebCore.la
+
#
# Extra checks and flags
global_cppflags += \
@@ -250,11 +263,9 @@
endif
if ENABLE_VIDEO
-webkitgtk_libadd += -lgstinterfaces-0.10 -lgstvideo-0.10
+webcore_libadd += -lgstinterfaces-0.10 -lgstvideo-0.10
endif
-#
-# WEBKIT GTK+
webkitgtk_cppflags += \
-I$(top_builddir)/WebKit/gtk/webkit \
-DBUILDING_CAIRO__=1 \
