diff options
| author | Steve Block <steveblock@google.com> | 2011-05-06 11:45:16 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-12 13:44:10 +0100 |
| commit | cad810f21b803229eb11403f9209855525a25d57 (patch) | |
| tree | 29a6fd0279be608e0fe9ffe9841f722f0f4e4269 /Tools/GNUmakefile.am | |
| parent | 121b0cf4517156d0ac5111caf9830c51b69bae8f (diff) | |
| download | external_webkit-cad810f21b803229eb11403f9209855525a25d57.zip external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.gz external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.bz2 | |
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
Diffstat (limited to 'Tools/GNUmakefile.am')
| -rw-r--r-- | Tools/GNUmakefile.am | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Tools/GNUmakefile.am b/Tools/GNUmakefile.am index bf21418..4813346 100644 --- a/Tools/GNUmakefile.am +++ b/Tools/GNUmakefile.am @@ -6,7 +6,7 @@ noinst_PROGRAMS += \ # GtkLauncher Programs_GtkLauncher_CPPFLAGS = \ -I$(srcdir)/WebKit/gtk \ - -I$(srcdir)/WebCore/platform/network/soup/cache/ \ + -I$(srcdir)/Source/WebCore/platform/network/soup/cache/ \ -I$(top_builddir)/WebKit/gtk \ -I$(top_builddir)/DerivedSources \ $(global_cppflags) \ @@ -38,8 +38,8 @@ dumprendertree_cppflags := \ -I$(srcdir)/Tools/DumpRenderTree/cairo \ -I$(srcdir)/Tools/DumpRenderTree/gtk \ -I$(srcdir)/WebKit/gtk \ - -I$(srcdir)/WebCore/platform/gtk \ - -I$(srcdir)/WebCore/platform/network/soup/cache/ \ + -I$(srcdir)/Source/WebCore/platform/gtk \ + -I$(srcdir)/Source/WebCore/platform/network/soup/cache/ \ -I$(top_builddir)/WebKit/gtk \ -I$(top_builddir)/DerivedSources \ $(global_cppflags) \ @@ -81,7 +81,7 @@ Programs_DumpRenderTree_SOURCES = \ Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp \ Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp \ Tools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp \ - WebCore/platform/gtk/GtkVersioning.c + Source/WebCore/platform/gtk/GtkVersioning.c Programs_DumpRenderTree_CXXFLAGS = \ $(global_cxxflags) \ @@ -155,9 +155,9 @@ dumprendertree_cppflags += \ TestNetscapePlugin_libtestnetscapeplugin_la_CPPFLAGS = \ -I$(srcdir)/Tools/DumpRenderTree \ -I$(srcdir)/Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders \ - -I$(srcdir)/WebCore \ - -I$(srcdir)/WebCore/bridge \ - -I$(srcdir)/WebCore/plugins \ + -I$(srcdir)/Source/WebCore \ + -I$(srcdir)/Source/WebCore/bridge \ + -I$(srcdir)/Source/WebCore/plugins \ -I$(srcdir)/Tools/DumpRenderTree/TestNetscapePlugIn \ $(global_cppflags) \ $(javascriptcore_cppflags) |