Changeset 96087 in webkit


Ignore:
Timestamp:
Sep 27, 2011 2:35:55 AM (13 years ago)
Author:
Carlos Garcia Campos
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/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.
Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r95998 r96087  
     12011-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
    1112011-09-26  Raphael Kubo da Costa  <kubo@profusion.mobi>
    212

  • trunk/GNUmakefile.am

    r95996 r96087  
    4242WebKit2 := $(srcdir)/Source/WebKit2
    4343pkgconfigdir := $(libdir)/pkgconfig
     44libwebkitgtkincludedir := $(prefix)/include/webkitgtk-@WEBKITGTK_API_VERSION@
    4445
    4546# Libraries and support components

  • trunk/Source/JavaScriptCore/ChangeLog

    r96068 r96087  
     12011-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
    1132011-09-26  Geoffrey Garen  <ggaren@apple.com>
    214

  • trunk/Source/JavaScriptCore/GNUmakefile.am

    r94559 r96087  
    1717        $(javascriptcore_built_sources)
    1818
    19 libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/JavaScriptCore
     19libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(libwebkitgtkincludedir)/JavaScriptCore
    2020libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = $(javascriptcore_h_api)
    2121

  • trunk/Source/JavaScriptCore/javascriptcoregtk.pc.in

    r92263 r96087  
    99Requires: glib-2.0
    1010Libs: -L${libdir} -ljavascriptcoregtk-@WEBKITGTK_API_VERSION@
    11 Cflags: -I${includedir}/webkit-@WEBKITGTK_API_VERSION@
     11Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@

  • trunk/Source/WebKit/gtk/ChangeLog

    r95948 r96087  
     12011-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
    1132011-09-26  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
    214

  • trunk/Source/WebKit/gtk/GNUmakefile.am

    r93092 r96087  
    1010        $(webkitgtk_built_sources)
    1111
    12 libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/webkit
     12libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(libwebkitgtkincludedir)/webkit
    1313libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \
    1414        $(webkitgtk_static_h_api)

  • trunk/Source/WebKit/gtk/webkit.pc.in

    r62001 r96087  
    99Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4
    1010Libs: -L${libdir} -lwebkitgtk-@WEBKITGTK_API_VERSION@
    11 Cflags: -I${includedir}/webkit-@WEBKITGTK_API_VERSION@
     11Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@
Note: See TracChangeset for help on using the changeset viewer.