Commit 4643e48a authored by carlosgc@webkit.org's avatar carlosgc@webkit.org

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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@85595 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 187c26f7
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-01 ojab <ojab@ojab.ru>
Reviewed by Eric Seidel.
......
......@@ -191,17 +191,15 @@ EXTRA_DIST += \
# Include module makefiles
include Source/JavaScriptCore/GNUmakefile.am
include Source/WebCore/GNUmakefile.am
include Source/WebKit/gtk/GNUmakefile.am
include Source/WebCore/bindings/gobject/GNUmakefile.am
include Tools/GNUmakefile.am
include Source/WebKit/gtk/po/GNUmakefile.am
if ENABLE_WEBKIT2
include Source/WebKit2/GNUmakefile.am
include Tools/MiniBrowser/gtk/GNUmakefile.am
# [GTK] Refactor the translations now that we have webkit2
# https://bugs.webkit.org/show_bug.cgi?id=55153
stamp-po:
else
include Source/WebKit/gtk/GNUmakefile.am
include Source/WebCore/bindings/gobject/GNUmakefile.am
include Tools/GNUmakefile.am
include Source/WebKit/gtk/po/GNUmakefile.am
endif
# Autogenerated sources
......
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:
2011-05-02 Yael Aharon <yael.aharon@nokia.com>
Reviewed by Andreas Kling.
......
......@@ -801,8 +801,7 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIB
$(UNICODE_LIBS) \
$(XT_LIBS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = Source/WebKit2/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc
pkgconfig_DATA += Source/WebKit2/gtk/@WEBKITGTK_PC_NAME@2-@WEBKITGTK_API_VERSION@.pc
# WebKit2 specific variables
webkit2_built_sources += \
......
......@@ -1044,10 +1044,6 @@ AC_ARG_ENABLE(webkit2,
[build webkit2 [default=no]]),
[], [enable_webkit2="no"])
AC_MSG_RESULT([$enable_webkit2])
if test "$enable_webkit2" = "yes"; then
WEBKITGTK_PC_NAME=${WEBKITGTK_PC_NAME}2
AC_SUBST([WEBKITGTK_PC_NAME])
fi
GTK_DOC_CHECK([1.10])
......@@ -1143,25 +1139,25 @@ AC_CONFIG_FILES([
GNUmakefile
])
if test "$enable_webkit2" = "no"; then
AC_CONFIG_FILES([
Source/WebKit/gtk/webkit/webkitversion.h
Source/WebKit/gtk/docs/GNUmakefile
Source/WebKit/gtk/docs/version.xml
]
)
AC_CONFIG_FILES([
Source/WebKit/gtk/webkit/webkitversion.h
Source/WebKit/gtk/docs/GNUmakefile
Source/WebKit/gtk/docs/version.xml
])
AC_CONFIG_FILES([
Source/WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/webkit.pc.in
Source/WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:Source/WebKit/gtk/JSCore.gir.in
Source/WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:Source/WebKit/gtk/org.webkitgtk.gschema.xml.in
Source/WebKit/gtk/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/javascriptcoregtk.pc.in
]
,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
)
if test "$enable_webkit2" = "yes"; then
AC_CONFIG_FILES([
Source/WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/webkit.pc.in
Source/WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:Source/WebKit/gtk/JSCore.gir.in
Source/WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:Source/WebKit/gtk/org.webkitgtk.gschema.xml.in
Source/WebKit/gtk/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/javascriptcoregtk.pc.in
]
,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
)
else
AC_CONFIG_FILES([
Source/WebKit2/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/gtk/webkit2.pc.in
Source/WebKit2/gtk/${WEBKITGTK_PC_NAME}2-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/gtk/webkit2.pc.in
]
,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
)
......
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