Changeset 85595 in webkit
- Timestamp:
- May 3, 2011 2:53:26 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r85426 r85595 1 2011-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 1 11 2011-05-01 ojab <ojab@ojab.ru> 2 12 -
trunk/GNUmakefile.am
r85224 r85595 192 192 include Source/JavaScriptCore/GNUmakefile.am 193 193 include Source/WebCore/GNUmakefile.am 194 include Source/WebKit/gtk/GNUmakefile.am 195 include Source/WebCore/bindings/gobject/GNUmakefile.am 196 include Tools/GNUmakefile.am 197 include Source/WebKit/gtk/po/GNUmakefile.am 194 198 if ENABLE_WEBKIT2 195 199 include Source/WebKit2/GNUmakefile.am … … 197 201 # [GTK] Refactor the translations now that we have webkit2 198 202 # https://bugs.webkit.org/show_bug.cgi?id=55153 199 stamp-po:200 else201 include Source/WebKit/gtk/GNUmakefile.am202 include Source/WebCore/bindings/gobject/GNUmakefile.am203 include Tools/GNUmakefile.am204 include Source/WebKit/gtk/po/GNUmakefile.am205 203 endif 206 204 -
trunk/Source/WebKit2/ChangeLog
r85584 r85595 1 2011-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 1 10 2011-05-02 Yael Aharon <yael.aharon@nokia.com> 2 11 -
trunk/Source/WebKit2/GNUmakefile.am
r85224 r85595 802 802 $(XT_LIBS) 803 803 804 pkgconfigdir = $(libdir)/pkgconfig 805 pkgconfig_DATA = Source/WebKit2/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc 804 pkgconfig_DATA += Source/WebKit2/gtk/@WEBKITGTK_PC_NAME@2-@WEBKITGTK_API_VERSION@.pc 806 805 807 806 # WebKit2 specific variables -
trunk/configure.ac
r85426 r85595 1045 1045 [], [enable_webkit2="no"]) 1046 1046 AC_MSG_RESULT([$enable_webkit2]) 1047 if test "$enable_webkit2" = "yes"; then1048 WEBKITGTK_PC_NAME=${WEBKITGTK_PC_NAME}21049 AC_SUBST([WEBKITGTK_PC_NAME])1050 fi1051 1047 1052 1048 GTK_DOC_CHECK([1.10]) … … 1144 1140 ]) 1145 1141 1146 if test "$enable_webkit2" = "no"; then 1142 1143 AC_CONFIG_FILES([ 1144 Source/WebKit/gtk/webkit/webkitversion.h 1145 Source/WebKit/gtk/docs/GNUmakefile 1146 Source/WebKit/gtk/docs/version.xml 1147 ]) 1148 1149 AC_CONFIG_FILES([ 1150 Source/WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/webkit.pc.in 1151 Source/WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:Source/WebKit/gtk/JSCore.gir.in 1152 Source/WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:Source/WebKit/gtk/org.webkitgtk.gschema.xml.in 1153 Source/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 1158 if test "$enable_webkit2" = "yes"; then 1147 1159 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 1165 1161 ] 1166 1162 ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
Note: See TracChangeset
for help on using the changeset viewer.