Build fix: r142549 broke EFL build

https://bugs.webkit.org/show_bug.cgi?id=109527

Patch by Adenilson Cavalcanti <cavalcantii@gmail.com> on 2013-02-11
Reviewed by Kentaro Hara.

Source/WebCore:

No new tests, no change on behavior.

* CMakeLists.txt:

Source/WebKit:

Build fix.

* CMakeLists.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142563 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index f1c5dd5189ab78fae0d84dadc9e3e739e26ddcb3..d331aeb80cd7cf2675462e6478e33384144b1ffa 100644 (file)
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -5,7 +5,6 @@ set(WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/Modules/gamepad"
     "${WEBCORE_DIR}/Modules/geolocation"
     "${WEBCORE_DIR}/Modules/indexeddb"
-    "${WEBCORE_DIR}/Modules/intents"
     "${WEBCORE_DIR}/Modules/mediasource"
     "${WEBCORE_DIR}/Modules/mediastream"
     "${WEBCORE_DIR}/Modules/navigatorcontentutils"
@@ -117,7 +116,6 @@ set(WebCore_IDL_INCLUDES
     Modules/gamepad
     Modules/geolocation
     Modules/indexeddb
-    Modules/intents
     Modules/mediastream
     Modules/networkinfo
     Modules/notifications
@@ -203,12 +201,6 @@ set(WebCore_IDL_FILES
     Modules/indexeddb/IDBVersionChangeEvent.idl
     Modules/indexeddb/WorkerContextIndexedDatabase.idl
 
-    Modules/intents/DeliveredIntent.idl
-    Modules/intents/DOMWindowIntents.idl
-    Modules/intents/Intent.idl
-    Modules/intents/IntentResultCallback.idl
-    Modules/intents/NavigatorIntents.idl
-
     Modules/mediasource/MediaSource.idl
     Modules/mediasource/SourceBuffer.idl
     Modules/mediasource/SourceBufferList.idl
@@ -458,7 +450,6 @@ set(WebCore_IDL_FILES
     html/HTMLHtmlElement.idl
     html/HTMLIFrameElement.idl
     html/HTMLImageElement.idl
-    html/HTMLIntentElement.idl
     html/HTMLInputElement.idl
     html/HTMLKeygenElement.idl
     html/HTMLLabelElement.idl
@@ -849,12 +840,6 @@ set(WebCore_SOURCES
     Modules/indexeddb/PageGroupIndexedDatabase.cpp
     Modules/indexeddb/WorkerContextIndexedDatabase.cpp
 
-    Modules/intents/DOMWindowIntents.cpp
-    Modules/intents/DeliveredIntent.cpp
-    Modules/intents/Intent.cpp
-    Modules/intents/IntentRequest.cpp
-    Modules/intents/NavigatorIntents.cpp
-
     Modules/mediasource/MediaSource.cpp
     Modules/mediasource/SourceBuffer.cpp
     Modules/mediasource/SourceBufferList.cpp
@@ -1420,7 +1405,6 @@ set(WebCore_SOURCES
     html/HTMLIFrameElement.cpp
     html/HTMLImageElement.cpp
     html/HTMLImageLoader.cpp
-    html/HTMLIntentElement.cpp
     html/HTMLInputElement.cpp
     html/HTMLKeygenElement.cpp
     html/HTMLLIElement.cpp

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index bcc62fef2e9d3cbf7bd8d302da7afa52ee9a76d9..eb7631241f09bde6b822632b6106d04bd63bc5ae 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2013-02-11  Adenilson Cavalcanti  <cavalcantii@gmail.com>
+
+        Build fix: r142549 broke EFL build
+        https://bugs.webkit.org/show_bug.cgi?id=109527
+
+        Reviewed by Kentaro Hara.
+
+        No new tests, no change on behavior.
+
+        * CMakeLists.txt:
+
 2013-02-11  Simon Fraser  <simon.fraser@apple.com>
 
         REGRESSION (r142520?): Space no longer scrolls the page

diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
index 4c4830d361ce355b900586f04027a9f95c3b8a09..37b5c0ece8cd15311ba2eaa68bf4f55cc41efb8d 100644 (file)
--- a/Source/WebKit/CMakeLists.txt
+++ b/Source/WebKit/CMakeLists.txt
@@ -1,7 +1,6 @@
 set(WebKit_INCLUDE_DIRECTORIES
     "${WEBKIT_DIR}"
     "${WEBCORE_DIR}"
-    "${WEBCORE_DIR}/Modules/intents"
     "${WEBCORE_DIR}/Modules/networkinfo"
     "${WEBCORE_DIR}/Modules/webdatabase"
     "${WEBCORE_DIR}/accessibility"

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 7f3490fb65253e7135c9e866a8377bc07e9998e9..f2a85ce5c4e15566a20d655718bc041a80b9924b 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2013-02-11  Adenilson Cavalcanti  <cavalcantii@gmail.com>
+
+        Build fix: r142549 broke EFL build
+        https://bugs.webkit.org/show_bug.cgi?id=109527
+
+        Reviewed by Kentaro Hara.
+
+        Build fix.
+
+        * CMakeLists.txt:
+
 2013-02-11  Brent Fulgham  <bfulgham@webkit.org>
 
         Rename Visual Studio solution folders to avoid conflicts with project names