[GTK] Reorganize header files
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Sep 2011 09:35:55 +0000 (09:35 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Sep 2011 09:35:55 +0000 (09:35 +0000)
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: https://svn.webkit.org/repository/webkit/trunk@96087 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
GNUmakefile.am
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/GNUmakefile.am
Source/JavaScriptCore/javascriptcoregtk.pc.in
Source/WebKit/gtk/ChangeLog
Source/WebKit/gtk/GNUmakefile.am
Source/WebKit/gtk/webkit.pc.in

index 3565254..99b252f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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
index 8131048..2ce3e23 100644 (file)
@@ -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 :=
index a9ec707..b656057 100644 (file)
@@ -1,3 +1,15 @@
+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
index add3a83..6f80464 100644 (file)
@@ -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 = \
index d43f78d..ca7c8e3 100644 (file)
@@ -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@
index 774fa26..ebffb98 100644 (file)
@@ -1,3 +1,15 @@
+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
index 1141bee..de0e860 100644 (file)
@@ -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)
 
index 9bed0f3..4b2ad1f 100644 (file)
@@ -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@