From aed420786ac026a7415543b0f92e50f7093bf668 Mon Sep 17 00:00:00 2001 From: "changseok.oh@collabora.com" Date: Wed, 11 Sep 2013 13:53:38 +0000 Subject: [PATCH] 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: http://svn.webkit.org/repository/webkit/trunk@155522 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit2/ChangeLog | 7 +++++++ Source/WebKit2/GNUmakefile.list.am | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index 23ceb165b3f..31f1a36dc20 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,10 @@ +2013-09-11 ChangSeok Oh + + 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 Generate more HTML type checks and casting diff --git a/Source/WebKit2/GNUmakefile.list.am b/Source/WebKit2/GNUmakefile.list.am index 85a6b5c95d3..c4f2495e27a 100644 --- 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 \ -- GitLab