diff -r 000000000000 -r 4f2f89ce4247 WebKitTools/GNUmakefile.am
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/WebKitTools/GNUmakefile.am	Fri Sep 17 09:02:29 2010 +0300
@@ -0,0 +1,173 @@
+noinst_PROGRAMS += \
+	Programs/DumpRenderTree \
+	Programs/GtkLauncher \
+	Programs/ImageDiff
+
+# GtkLauncher
+Programs_GtkLauncher_CPPFLAGS = \
+	-I$(srcdir)/WebKit/gtk \
+	-I$(top_builddir)/WebKit/gtk \
+	-I$(top_builddir)/DerivedSources \
+	$(global_cppflags) \
+	$(javascriptcore_cppflags)
+
+Programs_GtkLauncher_SOURCES = \
+	WebKitTools/GtkLauncher/main.c
+
+Programs_GtkLauncher_CFLAGS = \
+	-ansi \
+	-fno-strict-aliasing \
+	$(global_cflags) \
+	$(GTK_CFLAGS) \
+	$(LIBSOUP_CFLAGS)
+
+Programs_GtkLauncher_LDADD = \
+	libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+	$(GTK_LIBS) \
+	$(GLIB_LIBS)
+
+Programs_GtkLauncher_LDFLAGS = \
+	-no-fast-install \
+	-no-install
+
+# DumpRenderTree
+dumprendertree_cppflags := \
+	-I$(srcdir)/WebKitTools/DumpRenderTree \
+	-I$(srcdir)/WebKitTools/DumpRenderTree/cairo \
+	-I$(srcdir)/WebKitTools/DumpRenderTree/gtk \
+	-I$(srcdir)/WebKit/gtk \
+	-I$(top_builddir)/WebKit/gtk \
+	-I$(top_builddir)/DerivedSources \
+	$(global_cppflags) \
+	$(javascriptcore_cppflags)
+
+Programs_DumpRenderTree_CPPFLAGS = $(dumprendertree_cppflags)
+
+Programs_DumpRenderTree_SOURCES = \
+	WebKitTools/DumpRenderTree/DumpRenderTree.h \
+	WebKitTools/DumpRenderTree/DumpRenderTreePrefix.h \
+	WebKitTools/DumpRenderTree/AccessibilityController.cpp \
+	WebKitTools/DumpRenderTree/AccessibilityController.h \
+	WebKitTools/DumpRenderTree/AccessibilityUIElement.cpp \
+	WebKitTools/DumpRenderTree/AccessibilityUIElement.h \
+	WebKitTools/DumpRenderTree/GCController.cpp \
+	WebKitTools/DumpRenderTree/GCController.h \
+	WebKitTools/DumpRenderTree/JavaScriptThreading.h \
+	WebKitTools/DumpRenderTree/LayoutTestController.cpp \
+	WebKitTools/DumpRenderTree/LayoutTestController.h \
+	WebKitTools/DumpRenderTree/PixelDumpSupport.cpp \
+	WebKitTools/DumpRenderTree/PixelDumpSupport.h \
+	WebKitTools/DumpRenderTree/WorkQueue.cpp \
+	WebKitTools/DumpRenderTree/WorkQueue.h \
+	WebKitTools/DumpRenderTree/WorkQueueItem.h \
+	WebKitTools/DumpRenderTree/config.h \
+	WebKitTools/DumpRenderTree/cairo/PixelDumpSupportCairo.cpp \
+	WebKitTools/DumpRenderTree/cairo/PixelDumpSupportCairo.h \
+	WebKitTools/DumpRenderTree/gtk/AccessibilityControllerGtk.cpp \
+	WebKitTools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp \
+	WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp \
+	WebKitTools/DumpRenderTree/gtk/DumpRenderTreeGtk.h \
+	WebKitTools/DumpRenderTree/gtk/EventSender.h \
+	WebKitTools/DumpRenderTree/gtk/EventSender.cpp \
+	WebKitTools/DumpRenderTree/gtk/GCControllerGtk.cpp \
+	WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp \
+	WebKitTools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp \
+	WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
+
+Programs_DumpRenderTree_CXXFLAGS = \
+	$(global_cxxflags) \
+	$(dumprendertree_cppflags) \
+	$(Programs_DumpRenderTree_CFLAGS)
+
+Programs_DumpRenderTree_CFLAGS = \
+	-fno-strict-aliasing \
+	$(dumprendertree_cppflags) \
+	$(global_cflags) \
+	$(GLOBALDEPS_CFLAGS) \
+	$(CAIRO_CFLAGS) \
+	$(GTK_CFLAGS) \
+	$(LIBSOUP_CFLAGS)
+
+Programs_DumpRenderTree_LDADD = \
+	libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+	libJavaScriptCore.la \
+	$(GLOBALDEPS_LIBS) \
+	$(CAIRO_LIBS) \
+	$(GTK_LIBS) \
+	$(GLIB_LIBS) \
+	$(LIBSOUP_LIBS) \
+	$(FREETYPE_LIBS)
+
+Programs_DumpRenderTree_LDFLAGS = \
+	-no-fast-install \
+	-no-install
+
+# ImageDiff
+Programs_ImageDiff_CPPFLAGS = $(global_cppflags)
+
+Programs_ImageDiff_SOURCES = \
+   WebKitTools/DumpRenderTree/gtk/ImageDiff.cpp
+
+Programs_ImageDiff_CXXFLAGS = \
+   $(global_cxxflags) \
+   $(global_cppflags) \
+   $(Programs_ImageDiff_CFLAGS)
+
+Programs_ImageDiff_CFLAGS = \
+   -fno-strict-aliasing \
+   $(global_cflags) \
+   $(GLOBALDEPS_CFLAGS) \
+   $(GTK_CFLAGS)
+
+Programs_ImageDiff_LDADD = \
+   $(GTK_LIBS)
+
+Programs_ImageDiff_LDFLAGS = \
+   -no-fast-install \
+   -no-install
+
+# clean target
+CLEANFILES += \
+	Programs/DumpRenderTree \
+	Programs/GtkLauncher \
+	Programs/ImageDiff
+
+if TARGET_X11
+
+# Build TestNetscapePlugin only for X11
+# since we don't support plugins for non-X11 builds at the moment.
+noinst_LTLIBRARIES += \
+	TestNetscapePlugin/libtestnetscapeplugin.la
+
+dumprendertree_cppflags += \
+	-DTEST_PLUGIN_DIR=\"${shell pwd}/${top_builddir}/TestNetscapePlugin/.libs\" \
+	-DFONTS_CONF_FILE=\"${shell pwd}/${srcdir}/WebKitTools/DumpRenderTree/gtk/fonts.conf\"
+
+TestNetscapePlugin_libtestnetscapeplugin_la_CPPFLAGS = \
+	-I$(srcdir)/WebKitTools/DumpRenderTree \
+	-I$(srcdir)/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders \
+	-I$(srcdir)/WebCore \
+	-I$(srcdir)/WebCore/bridge \
+	-I$(srcdir)/WebCore/plugins \
+	-I$(srcdir)/WebKitTools/DumpRenderTree/TestNetscapePlugIn \
+	$(global_cppflags) \
+	$(javascriptcore_cppflags)
+
+TestNetscapePlugin_libtestnetscapeplugin_la_SOURCES = \
+	WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npapi.h \
+	WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npfunctions.h \
+	WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npruntime.h \
+	WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp \
+	WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp \
+	WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginObject.h \
+	WebKitTools/DumpRenderTree/TestNetscapePlugIn/TestObject.cpp \
+	WebKitTools/DumpRenderTree/TestNetscapePlugIn/TestObject.h
+
+TestNetscapePlugin_libtestnetscapeplugin_la_LDFLAGS = \
+	-rpath ${shell pwd}/$(top_builddir)/../unix/TestNetscapePlugin/.libs \
+	$(no_undefined) \
+	-avoid-version \
+	-module
+
+CLEANFILES += TestNetscapePlugin/libtestnetscapeplugin.la
+endif