Unreviewed build fix.

* GNUmakefile.list.am: Duplicated NetscapePluginModuleNone.cpp & NetscapePluginNone.cpp.
They cause build breaks of multiple definitions when targeting wayland build.

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

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 23ceb165b3f1abae0b1e9d5c98d1f48088dfbefa..31f1a36dc2090dfaef700b4c2a219eb0c052c313 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2013-09-11  ChangSeok Oh  <changseok.oh@collabora.com>
+
+        Unreviewed build fix.
+
+        * GNUmakefile.list.am: Duplicated NetscapePluginModuleNone.cpp & NetscapePluginNone.cpp.
+        They cause build breaks of multiple definitions when targeting wayland build.
+
 2013-09-11  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 
         Generate more HTML type checks and casting

diff --git a/Source/WebKit2/GNUmakefile.list.am b/Source/WebKit2/GNUmakefile.list.am
index 85a6b5c95d351871906275bf9feb43e6aaab5086..c4f2495e27a4683164a1ee42487b21db2426f1cc 100644 (file)
--- a/Source/WebKit2/GNUmakefile.list.am
+++ b/Source/WebKit2/GNUmakefile.list.am
@@ -442,7 +442,6 @@ webkit2_sources += \
        Source/WebKit2/Shared/PrintInfo.h \
        Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp \
        Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h \
-       Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModuleNone.cpp \
        Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp \
        Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.h \
        Source/WebKit2/Shared/Plugins/NPIdentifierData.cpp \
@@ -1130,7 +1129,6 @@ webkit2_sources += \
        Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.h \
        Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp \
        Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h \
-       Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginNone.cpp \
        Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp \
        Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h \
        Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp \