Skip to content

Commit 5a81c6b

Browse files
carlosgcamposcarlosgcampos
committed
[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/JavaScriptCore: Install header files under $libwebkitgtkincludedir/JavaScriptCore. * GNUmakefile.am: Use $libwebkitgtkincludedir. * javascriptcoregtk.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. Canonical link: https://commits.webkit.org/84860@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@96087 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 0312142 commit 5a81c6b

8 files changed

Lines changed: 39 additions & 4 deletions

File tree

‎ChangeLog‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2011-09-27 Carlos Garcia Campos <cgarcia@igalia.com>
2+
3+
[GTK] Reorganize header files
4+
https://bugs.webkit.org/show_bug.cgi?id=65616
5+
6+
Reviewed by Martin Robinson.
7+
8+
* GNUmakefile.am: Initialize $libwebkitgtkincludedir to
9+
$(prefix)/include/webkitgtk-<api-version>
10+
111
2011-09-26 Raphael Kubo da Costa <kubo@profusion.mobi>
212

313
[CMake] Remove FindFreetype.cmake

‎GNUmakefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ WebCore := $(srcdir)/Source/WebCore
4141
WebKit := $(srcdir)/Source/WebKit/gtk
4242
WebKit2 := $(srcdir)/Source/WebKit2
4343
pkgconfigdir := $(libdir)/pkgconfig
44+
libwebkitgtkincludedir := $(prefix)/include/webkitgtk-@WEBKITGTK_API_VERSION@
4445

4546
# Libraries and support components
4647
bin_PROGRAMS :=

‎Source/JavaScriptCore/ChangeLog‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
2011-09-27 Carlos Garcia Campos <cgarcia@igalia.com>
2+
3+
[GTK] Reorganize header files
4+
https://bugs.webkit.org/show_bug.cgi?id=65616
5+
6+
Reviewed by Martin Robinson.
7+
8+
Install header files under $libwebkitgtkincludedir/JavaScriptCore.
9+
10+
* GNUmakefile.am: Use $libwebkitgtkincludedir.
11+
* javascriptcoregtk.pc.in: Use webkitgtk-<api-version> as include dir.
12+
113
2011-09-26 Geoffrey Garen <ggaren@apple.com>
214

315
REGRESSION (r95912): Conservative marking doesn't filter out pointers to

‎Source/JavaScriptCore/GNUmakefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ nodist_EXTRA_libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_M
1616
nodist_libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
1717
$(javascriptcore_built_sources)
1818

19-
libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/JavaScriptCore
19+
libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(libwebkitgtkincludedir)/JavaScriptCore
2020
libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = $(javascriptcore_h_api)
2121

2222
libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \

‎Source/JavaScriptCore/javascriptcoregtk.pc.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ Description: GTK+ version of the JavaScriptCore engine
88
Version: @VERSION@
99
Requires: glib-2.0
1010
Libs: -L${libdir} -ljavascriptcoregtk-@WEBKITGTK_API_VERSION@
11-
Cflags: -I${includedir}/webkit-@WEBKITGTK_API_VERSION@
11+
Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@

‎Source/WebKit/gtk/ChangeLog‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
2011-09-27 Carlos Garcia Campos <cgarcia@igalia.com>
2+
3+
[GTK] Reorganize header files
4+
https://bugs.webkit.org/show_bug.cgi?id=65616
5+
6+
Reviewed by Martin Robinson.
7+
8+
Install header files under $libwebkitgtkincludedir/webkit.
9+
10+
* GNUmakefile.am: Use $libwebkitgtkincludedir.
11+
* webkit.pc.in: Use webkitgtk-<api-version> as include dir.
12+
113
2011-09-26 Gustavo Noronha Silva <gustavo.noronha@collabora.com>
214

315
Fix documentation generation by specifying the sources

‎Source/WebKit/gtk/GNUmakefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ lib_LTLIBRARIES += \
99
nodist_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
1010
$(webkitgtk_built_sources)
1111

12-
libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/webkit
12+
libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(libwebkitgtkincludedir)/webkit
1313
libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \
1414
$(webkitgtk_static_h_api)
1515

‎Source/WebKit/gtk/webkit.pc.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ Description: Web content engine for GTK+
88
Version: @VERSION@
99
Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4
1010
Libs: -L${libdir} -lwebkitgtk-@WEBKITGTK_API_VERSION@
11-
Cflags: -I${includedir}/webkit-@WEBKITGTK_API_VERSION@
11+
Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@

0 commit comments

Comments
 (0)