Diff
Modified: trunk/ChangeLog (92262 => 92263)
--- trunk/ChangeLog 2011-08-03 07:06:56 UTC (rev 92262)
+++ trunk/ChangeLog 2011-08-03 07:43:44 UTC (rev 92263)
@@ -1,3 +1,14 @@
+2011-08-03 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Reorganize pkg-config files
+ https://bugs.webkit.org/show_bug.cgi?id=65548
+
+ Reviewed by Martin Robinson.
+
+ * GNUmakefile.am: Initialize pkgconfigdir and pkgconfig_DATA which
+ are common to all libraries.
+ * configure.ac: Update pkg-config files.
+
2011-08-02 Varun Jain <[email protected]>
Missing null check in WebViewImpl::selectionRange
Modified: trunk/GNUmakefile.am (92262 => 92263)
--- trunk/GNUmakefile.am 2011-08-03 07:06:56 UTC (rev 92262)
+++ trunk/GNUmakefile.am 2011-08-03 07:43:44 UTC (rev 92263)
@@ -40,6 +40,7 @@
WebCore := $(srcdir)/Source/WebCore
WebKit := $(srcdir)/Source/WebKit/gtk
WebKit2 := $(srcdir)/Source/WebKit2
+pkgconfigdir := $(libdir)/pkgconfig
# Libraries and support components
bin_PROGRAMS :=
@@ -89,6 +90,7 @@
CLEANFILES :=
DISTCLEANFILES :=
MAINTAINERCLEANFILES :=
+pkgconfig_DATA :=
# We do not care at all about this implicit built-in make rules,
# disable them to save some build time
Modified: trunk/Source/_javascript_Core/ChangeLog (92262 => 92263)
--- trunk/Source/_javascript_Core/ChangeLog 2011-08-03 07:06:56 UTC (rev 92262)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-08-03 07:43:44 UTC (rev 92263)
@@ -1,3 +1,13 @@
+2011-08-03 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Reorganize pkg-config files
+ https://bugs.webkit.org/show_bug.cgi?id=65548
+
+ Reviewed by Martin Robinson.
+
+ * GNUmakefile.am:
+ * _javascript_coregtk.pc.in: Renamed from Source/WebKit/gtk/_javascript_coregtk.pc.in.
+
2011-08-01 David Levin <[email protected]>
Add asserts to RefCounted to make sure ref/deref happens on the right thread.
Modified: trunk/Source/_javascript_Core/GNUmakefile.am (92262 => 92263)
--- trunk/Source/_javascript_Core/GNUmakefile.am 2011-08-03 07:06:56 UTC (rev 92262)
+++ trunk/Source/_javascript_Core/GNUmakefile.am 2011-08-03 07:43:44 UTC (rev 92263)
@@ -73,6 +73,8 @@
$(GLIB_CFLAGS) \
$(UNICODE_CFLAGS)
+pkgconfig_DATA += Source/_javascript_Core/_javascript_coregtk-@[email protected]
+
Source/_javascript_Core/Lexer.lut.h: $(srcdir)/Source/_javascript_Core/create_hash_table $(srcdir)/Source/_javascript_Core/parser/Keywords.table
$(AM_V_GEN)$(PERL) $^ > $@
@@ -175,3 +177,6 @@
Programs/jsc \
Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@ \
Programs/minidom
+
+DISTCLEANFILES += \
+ $(top_builddir)/Source/_javascript_Core/_javascript_coregtk-@[email protected]
Copied: trunk/Source/_javascript_Core/_javascript_coregtk.pc.in (from rev 92262, trunk/Source/WebKit/gtk/_javascript_coregtk.pc.in) (0 => 92263)
--- trunk/Source/_javascript_Core/_javascript_coregtk.pc.in (rev 0)
+++ trunk/Source/_javascript_Core/_javascript_coregtk.pc.in 2011-08-03 07:43:44 UTC (rev 92263)
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: _javascript_CoreGTK+
+Description: GTK+ version of the _javascript_Core engine
+Version: @VERSION@
+Requires: glib-2.0
+Libs: -L${libdir} -ljavascriptcoregtk-@WEBKITGTK_API_VERSION@
+Cflags: -I${includedir}/webkit-@WEBKITGTK_API_VERSION@
Modified: trunk/Source/WebKit/gtk/ChangeLog (92262 => 92263)
--- trunk/Source/WebKit/gtk/ChangeLog 2011-08-03 07:06:56 UTC (rev 92262)
+++ trunk/Source/WebKit/gtk/ChangeLog 2011-08-03 07:43:44 UTC (rev 92263)
@@ -1,3 +1,12 @@
+2011-08-03 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Reorganize pkg-config files
+ https://bugs.webkit.org/show_bug.cgi?id=65548
+
+ Reviewed by Martin Robinson.
+
+ * GNUmakefile.am: Remove _javascript_core pc file references.
+
2011-07-30 Patrick Gansterer <[email protected]>
Remove inclusion of MainThread.h from Threading.h
Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (92262 => 92263)
--- trunk/Source/WebKit/gtk/GNUmakefile.am 2011-08-03 07:06:56 UTC (rev 92262)
+++ trunk/Source/WebKit/gtk/GNUmakefile.am 2011-08-03 07:43:44 UTC (rev 92263)
@@ -258,10 +258,7 @@
Source/WebKit/gtk/webkit/webkitwebwindowfeatures.cpp \
Source/WebKit/gtk/webkit/webkitwebwindowfeaturesprivate.h
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = \
- Source/WebKit/gtk/@WEBKITGTK_PC_NAME@-@[email protected] \
- Source/WebKit/gtk/_javascript_coregtk-@[email protected]
+pkgconfig_DATA += Source/WebKit/gtk/@WEBKITGTK_PC_NAME@-@[email protected]
if ENABLE_INTROSPECTION
@@ -594,7 +591,6 @@
$(top_builddir)/Source/WebKit/gtk/docs/version.xml \
$(top_builddir)/Source/WebKit/gtk/docs/GNUmakefile \
$(top_builddir)/Source/WebKit/gtk/@WEBKITGTK_PC_NAME@-@[email protected] \
- $(top_builddir)/Source/WebKit/gtk/_javascript_coregtk-@[email protected] \
$(top_builddir)/Source/WebKit/gtk/org.webkitgtk-@[email protected] \
$(top_builddir)/Source/WebKit/gtk/webkit/webkitversion.h
Deleted: trunk/Source/WebKit/gtk/_javascript_coregtk.pc.in (92262 => 92263)
--- trunk/Source/WebKit/gtk/_javascript_coregtk.pc.in 2011-08-03 07:06:56 UTC (rev 92262)
+++ trunk/Source/WebKit/gtk/_javascript_coregtk.pc.in 2011-08-03 07:43:44 UTC (rev 92263)
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: _javascript_CoreGTK+
-Description: GTK+ version of the _javascript_Core engine
-Version: @VERSION@
-Requires: glib-2.0
-Libs: -L${libdir} -ljavascriptcoregtk-@WEBKITGTK_API_VERSION@
-Cflags: -I${includedir}/webkit-@WEBKITGTK_API_VERSION@
Modified: trunk/Source/WebKit2/ChangeLog (92262 => 92263)
--- trunk/Source/WebKit2/ChangeLog 2011-08-03 07:06:56 UTC (rev 92262)
+++ trunk/Source/WebKit2/ChangeLog 2011-08-03 07:43:44 UTC (rev 92263)
@@ -1,3 +1,15 @@
+2011-08-03 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Reorganize pkg-config files
+ https://bugs.webkit.org/show_bug.cgi?id=65548
+
+ Reviewed by Martin Robinson.
+
+ * GNUmakefile.am: Rename pc file as webkit2gtk.pc.in. WebKit2
+ depends on gtk3 unconditionally so we don't need to use
+ WEBKITGTK_PC_NAME.
+ * webkit2gtk.pc.in: Renamed from Source/WebKit2/gtk/webkit2.pc.in.
+
2011-08-01 Michael Saboff <[email protected]>
Virtual copying of FastMalloc allocated memory causes madvise MADV_FREE_REUSABLE errors
Modified: trunk/Source/WebKit2/GNUmakefile.am (92262 => 92263)
--- trunk/Source/WebKit2/GNUmakefile.am 2011-08-03 07:06:56 UTC (rev 92262)
+++ trunk/Source/WebKit2/GNUmakefile.am 2011-08-03 07:43:44 UTC (rev 92263)
@@ -907,7 +907,7 @@
$(UNICODE_LIBS) \
$(XT_LIBS)
-pkgconfig_DATA += Source/WebKit2/gtk/@WEBKITGTK_PC_NAME@2-@[email protected]
+pkgconfig_DATA += Source/WebKit2/webkit2gtk-@[email protected]
# WebKit2 specific variables
forwarding_headers := $(GENSOURCES_WEBKIT2)/include
@@ -954,9 +954,11 @@
CLEANFILES += \
$(BUILT_SOURCES) \
- $(top_builddir)/WebKit2/gtk/@WEBKITGTK_PC_NAME@-@[email protected] \
$(top_builddir)/Programs/WebKitWebProcess
+DISTCLEANFILES += \
+ $(top_builddir)/WebKit2/webkit2gtk-@[email protected]
+
# WebKitWebProcess
bin_PROGRAMS += \
Programs/WebKitWebProcess
Deleted: trunk/Source/WebKit2/gtk/webkit2.pc.in (92262 => 92263)
--- trunk/Source/WebKit2/gtk/webkit2.pc.in 2011-08-03 07:06:56 UTC (rev 92262)
+++ trunk/Source/WebKit2/gtk/webkit2.pc.in 2011-08-03 07:43:44 UTC (rev 92263)
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: WebKit2
-Description: Web content engine for GTK+
-Version: @VERSION@
-Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4
-Libs: -L${libdir} -lwebkit2gtk-@WEBKITGTK_API_VERSION@
-Cflags: -I${includedir}/webkit2-@WEBKITGTK_API_VERSION@
Copied: trunk/Source/WebKit2/webkit2gtk.pc.in (from rev 92262, trunk/Source/WebKit2/gtk/webkit2.pc.in) (0 => 92263)
--- trunk/Source/WebKit2/webkit2gtk.pc.in (rev 0)
+++ trunk/Source/WebKit2/webkit2gtk.pc.in 2011-08-03 07:43:44 UTC (rev 92263)
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: WebKit2
+Description: Web content engine for GTK+
+Version: @VERSION@
+Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4
+Libs: -L${libdir} -lwebkit2gtk-@WEBKITGTK_API_VERSION@
+Cflags: -I${includedir}/webkit2-@WEBKITGTK_API_VERSION@
Modified: trunk/configure.ac (92262 => 92263)
--- trunk/configure.ac 2011-08-03 07:06:56 UTC (rev 92262)
+++ trunk/configure.ac 2011-08-03 07:43:44 UTC (rev 92263)
@@ -1237,14 +1237,14 @@
Source/WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/webkit.pc.in
Source/WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:Source/WebKit/gtk/JSCore.gir.in
Source/WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:Source/WebKit/gtk/org.webkitgtk.gschema.xml.in
-Source/WebKit/gtk/_javascript_coregtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/_javascript_coregtk.pc.in
+Source/_javascript_Core/_javascript_coregtk-${WEBKITGTK_API_VERSION}.pc:Source/_javascript_Core/_javascript_coregtk.pc.in
]
,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
)
if test "$enable_webkit2" = "yes"; then
AC_CONFIG_FILES([
- Source/WebKit2/gtk/${WEBKITGTK_PC_NAME}2-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/gtk/webkit2.pc.in
+ Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/webkit2gtk.pc.in
]
,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
)
