Commit 28f29836 authored by carlosgc@webkit.org's avatar carlosgc@webkit.org

[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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@96087 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 3054915b
2011-09-27 Carlos Garcia Campos <cgarcia@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 <kubo@profusion.mobi>
[CMake] Remove FindFreetype.cmake
......
......@@ -41,6 +41,7 @@ WebCore := $(srcdir)/Source/WebCore
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 :=
......
2011-09-27 Carlos Garcia Campos <cgarcia@igalia.com>
[GTK] Reorganize header files
https://bugs.webkit.org/show_bug.cgi?id=65616
Reviewed by Martin Robinson.
Install header files under $libwebkitgtkincludedir/JavaScriptCore.
* GNUmakefile.am: Use $libwebkitgtkincludedir.
* javascriptcoregtk.pc.in: Use webkitgtk-<api-version> as include dir.
2011-09-26 Geoffrey Garen <ggaren@apple.com>
REGRESSION (r95912): Conservative marking doesn't filter out pointers to
......@@ -16,7 +16,7 @@ nodist_EXTRA_libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_M
nodist_libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
$(javascriptcore_built_sources)
libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/JavaScriptCore
libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(libwebkitgtkincludedir)/JavaScriptCore
libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = $(javascriptcore_h_api)
libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
......
......@@ -8,4 +8,4 @@ Description: GTK+ version of the JavaScriptCore engine
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@
2011-09-27 Carlos Garcia Campos <cgarcia@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.noronha@collabora.com>
Fix documentation generation by specifying the sources
......
......@@ -9,7 +9,7 @@ lib_LTLIBRARIES += \
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)
......
......@@ -8,4 +8,4 @@ Description: Web content engine for GTK+
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@
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment