Title: [96087] trunk
- Revision
- 96087
- Author
- carlo...@webkit.org
- Date
- 2011-09-27 02:35:55 -0700 (Tue, 27 Sep 2011)
Log Message
[GTK] Reorganize header files
https://bugs.webkit.org/show_bug.cgi?id=65616
Reviewed by Martin Robinson.
.:
* GNUmakefile.am: Initialize $libwebkitgtkincludedir to
$(prefix)/include/webkitgtk-<api-version>
Source/_javascript_Core:
Install header files under $libwebkitgtkincludedir/_javascript_Core.
* GNUmakefile.am: Use $libwebkitgtkincludedir.
* _javascript_coregtk.pc.in: Use webkitgtk-<api-version> as include dir.
Source/WebKit/gtk:
Install header files under $libwebkitgtkincludedir/webkit.
* GNUmakefile.am: Use $libwebkitgtkincludedir.
* webkit.pc.in: Use webkitgtk-<api-version> as include dir.
Modified Paths
Diff
Modified: trunk/ChangeLog (96086 => 96087)
--- trunk/ChangeLog 2011-09-27 09:31:07 UTC (rev 96086)
+++ trunk/ChangeLog 2011-09-27 09:35:55 UTC (rev 96087)
@@ -1,3 +1,13 @@
+2011-09-27 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Reorganize header files
+ https://bugs.webkit.org/show_bug.cgi?id=65616
+
+ Reviewed by Martin Robinson.
+
+ * GNUmakefile.am: Initialize $libwebkitgtkincludedir to
+ $(prefix)/include/webkitgtk-<api-version>
+
2011-09-26 Raphael Kubo da Costa <k...@profusion.mobi>
[CMake] Remove FindFreetype.cmake
Modified: trunk/GNUmakefile.am (96086 => 96087)
--- trunk/GNUmakefile.am 2011-09-27 09:31:07 UTC (rev 96086)
+++ trunk/GNUmakefile.am 2011-09-27 09:35:55 UTC (rev 96087)
@@ -41,6 +41,7 @@
WebKit := $(srcdir)/Source/WebKit/gtk
WebKit2 := $(srcdir)/Source/WebKit2
pkgconfigdir := $(libdir)/pkgconfig
+libwebkitgtkincludedir := $(prefix)/include/webkitgtk-@WEBKITGTK_API_VERSION@
# Libraries and support components
bin_PROGRAMS :=
Modified: trunk/Source/_javascript_Core/ChangeLog (96086 => 96087)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-27 09:31:07 UTC (rev 96086)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-27 09:35:55 UTC (rev 96087)
@@ -1,3 +1,15 @@
+2011-09-27 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Reorganize header files
+ https://bugs.webkit.org/show_bug.cgi?id=65616
+
+ Reviewed by Martin Robinson.
+
+ Install header files under $libwebkitgtkincludedir/_javascript_Core.
+
+ * GNUmakefile.am: Use $libwebkitgtkincludedir.
+ * _javascript_coregtk.pc.in: Use webkitgtk-<api-version> as include dir.
+
2011-09-26 Geoffrey Garen <gga...@apple.com>
REGRESSION (r95912): Conservative marking doesn't filter out pointers to
Modified: trunk/Source/_javascript_Core/GNUmakefile.am (96086 => 96087)
--- trunk/Source/_javascript_Core/GNUmakefile.am 2011-09-27 09:31:07 UTC (rev 96086)
+++ trunk/Source/_javascript_Core/GNUmakefile.am 2011-09-27 09:35:55 UTC (rev 96087)
@@ -16,7 +16,7 @@
nodist_libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
$(_javascript_core_built_sources)
-libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/_javascript_Core
+libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(libwebkitgtkincludedir)/_javascript_Core
libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = $(_javascript_core_h_api)
libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
Modified: trunk/Source/_javascript_Core/_javascript_coregtk.pc.in (96086 => 96087)
--- trunk/Source/_javascript_Core/_javascript_coregtk.pc.in 2011-09-27 09:31:07 UTC (rev 96086)
+++ trunk/Source/_javascript_Core/_javascript_coregtk.pc.in 2011-09-27 09:35:55 UTC (rev 96087)
@@ -8,4 +8,4 @@
Version: @VERSION@
Requires: glib-2.0
Libs: -L${libdir} -ljavascriptcoregtk-@WEBKITGTK_API_VERSION@
-Cflags: -I${includedir}/webkit-@WEBKITGTK_API_VERSION@
+Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@
Modified: trunk/Source/WebKit/gtk/ChangeLog (96086 => 96087)
--- trunk/Source/WebKit/gtk/ChangeLog 2011-09-27 09:31:07 UTC (rev 96086)
+++ trunk/Source/WebKit/gtk/ChangeLog 2011-09-27 09:35:55 UTC (rev 96087)
@@ -1,3 +1,15 @@
+2011-09-27 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Reorganize header files
+ https://bugs.webkit.org/show_bug.cgi?id=65616
+
+ Reviewed by Martin Robinson.
+
+ Install header files under $libwebkitgtkincludedir/webkit.
+
+ * GNUmakefile.am: Use $libwebkitgtkincludedir.
+ * webkit.pc.in: Use webkitgtk-<api-version> as include dir.
+
2011-09-26 Gustavo Noronha Silva <gustavo.noro...@collabora.com>
Fix documentation generation by specifying the sources
Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (96086 => 96087)
--- trunk/Source/WebKit/gtk/GNUmakefile.am 2011-09-27 09:31:07 UTC (rev 96086)
+++ trunk/Source/WebKit/gtk/GNUmakefile.am 2011-09-27 09:35:55 UTC (rev 96087)
@@ -9,7 +9,7 @@
nodist_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
$(webkitgtk_built_sources)
-libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/webkit
+libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(libwebkitgtkincludedir)/webkit
libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \
$(webkitgtk_static_h_api)
Modified: trunk/Source/WebKit/gtk/webkit.pc.in (96086 => 96087)
--- trunk/Source/WebKit/gtk/webkit.pc.in 2011-09-27 09:31:07 UTC (rev 96086)
+++ trunk/Source/WebKit/gtk/webkit.pc.in 2011-09-27 09:35:55 UTC (rev 96087)
@@ -8,4 +8,4 @@
Version: @VERSION@
Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4
Libs: -L${libdir} -lwebkitgtk-@WEBKITGTK_API_VERSION@
-Cflags: -I${includedir}/webkit-@WEBKITGTK_API_VERSION@
+Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
