Changeset 85595 in webkit


Ignore:
Timestamp:
May 3, 2011 2:53:26 AM (13 years ago)
Author:
Carlos Garcia Campos
Message:

2011-05-03 Carlos Garcia Campos <cgarcia@igalia.com>

Reviewed by Eric Seidel.

[GTK] Build webkit1 even when webkit2 is enabled
https://bugs.webkit.org/show_bug.cgi?id=59695

  • GNUmakefile.am:
  • configure.ac:

2011-05-03 Carlos Garcia Campos <cgarcia@igalia.com>

Reviewed by Eric Seidel.

[GTK] Build webkit1 even when webkit2 is enabled
https://bugs.webkit.org/show_bug.cgi?id=59695

  • GNUmakefile.am:
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r85426 r85595  
     12011-05-03  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        [GTK] Build webkit1 even when webkit2 is enabled
     6        https://bugs.webkit.org/show_bug.cgi?id=59695
     7
     8        * GNUmakefile.am:
     9        * configure.ac:
     10
    1112011-05-01  ojab  <ojab@ojab.ru>
    212
  • trunk/GNUmakefile.am

    r85224 r85595  
    192192include Source/JavaScriptCore/GNUmakefile.am
    193193include Source/WebCore/GNUmakefile.am
     194include Source/WebKit/gtk/GNUmakefile.am
     195include Source/WebCore/bindings/gobject/GNUmakefile.am
     196include Tools/GNUmakefile.am
     197include Source/WebKit/gtk/po/GNUmakefile.am
    194198if ENABLE_WEBKIT2
    195199include Source/WebKit2/GNUmakefile.am
     
    197201# [GTK] Refactor the translations now that we have webkit2
    198202# https://bugs.webkit.org/show_bug.cgi?id=55153
    199 stamp-po:
    200 else
    201 include Source/WebKit/gtk/GNUmakefile.am
    202 include Source/WebCore/bindings/gobject/GNUmakefile.am
    203 include Tools/GNUmakefile.am
    204 include Source/WebKit/gtk/po/GNUmakefile.am
    205203endif
    206204
  • trunk/Source/WebKit2/ChangeLog

    r85584 r85595  
     12011-05-03  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        [GTK] Build webkit1 even when webkit2 is enabled
     6        https://bugs.webkit.org/show_bug.cgi?id=59695
     7
     8        * GNUmakefile.am:
     9
    1102011-05-02  Yael Aharon  <yael.aharon@nokia.com>
    211
  • trunk/Source/WebKit2/GNUmakefile.am

    r85224 r85595  
    802802        $(XT_LIBS)
    803803
    804 pkgconfigdir = $(libdir)/pkgconfig
    805 pkgconfig_DATA = Source/WebKit2/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc
     804pkgconfig_DATA += Source/WebKit2/gtk/@WEBKITGTK_PC_NAME@2-@WEBKITGTK_API_VERSION@.pc
    806805
    807806# WebKit2 specific variables
  • trunk/configure.ac

    r85426 r85595  
    10451045                [], [enable_webkit2="no"])
    10461046AC_MSG_RESULT([$enable_webkit2])
    1047 if test "$enable_webkit2" = "yes"; then
    1048     WEBKITGTK_PC_NAME=${WEBKITGTK_PC_NAME}2
    1049     AC_SUBST([WEBKITGTK_PC_NAME])
    1050 fi
    10511047
    10521048GTK_DOC_CHECK([1.10])
     
    11441140])
    11451141 
    1146 if test "$enable_webkit2" = "no"; then
     1142
     1143AC_CONFIG_FILES([
     1144Source/WebKit/gtk/webkit/webkitversion.h
     1145Source/WebKit/gtk/docs/GNUmakefile
     1146Source/WebKit/gtk/docs/version.xml
     1147])
     1148
     1149AC_CONFIG_FILES([
     1150Source/WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/webkit.pc.in
     1151Source/WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:Source/WebKit/gtk/JSCore.gir.in
     1152Source/WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:Source/WebKit/gtk/org.webkitgtk.gschema.xml.in
     1153Source/WebKit/gtk/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/javascriptcoregtk.pc.in
     1154]
     1155,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
     1156)
     1157
     1158if test "$enable_webkit2" = "yes"; then
    11471159    AC_CONFIG_FILES([
    1148     Source/WebKit/gtk/webkit/webkitversion.h
    1149     Source/WebKit/gtk/docs/GNUmakefile
    1150     Source/WebKit/gtk/docs/version.xml
    1151     ]
    1152     )
    1153 
    1154     AC_CONFIG_FILES([
    1155     Source/WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/webkit.pc.in
    1156     Source/WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:Source/WebKit/gtk/JSCore.gir.in
    1157     Source/WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:Source/WebKit/gtk/org.webkitgtk.gschema.xml.in
    1158     Source/WebKit/gtk/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/javascriptcoregtk.pc.in
    1159     ]
    1160     ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
    1161     )
    1162 else
    1163     AC_CONFIG_FILES([
    1164     Source/WebKit2/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/gtk/webkit2.pc.in
     1160    Source/WebKit2/gtk/${WEBKITGTK_PC_NAME}2-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/gtk/webkit2.pc.in
    11651161    ]
    11661162    ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
Note: See TracChangeset for help on using the changeset viewer.