am a5605499: Changing fit column to screen to exclude the padding.

[android-x86/external-webkit.git] / WebKitTools / GNUmakefile.am

diff --git a/WebKitTools/GNUmakefile.am b/WebKitTools/GNUmakefile.am
index 7e98e73..c2029f3 100644 (file)
--- a/WebKitTools/GNUmakefile.am
+++ b/WebKitTools/GNUmakefile.am
@@ -15,14 +15,18 @@ Programs_GtkLauncher_SOURCES = \
 Programs_GtkLauncher_CFLAGS = \
        -ansi \
        -fno-strict-aliasing \
-       -O2 \
        $(global_cflags) \
        $(GTK_CFLAGS) \
        $(LIBSOUP_CFLAGS)
 
 Programs_GtkLauncher_LDADD = \
        libwebkit-1.0.la \
-       $(GTK_LIBS)
+       $(GTK_LIBS) \
+       $(GLIB_LIBS)
+
+Programs_GtkLauncher_LDFLAGS = \
+       -no-fast-install \
+       -no-install
 
 # DumpRenderTree
 dumprendertree_cppflags := \
@@ -36,10 +40,12 @@ dumprendertree_cppflags := \
 Programs_DumpRenderTree_CPPFLAGS = $(dumprendertree_cppflags)
 
 Programs_DumpRenderTree_SOURCES = \
-       WebKitTools/DumpRenderTree/AccessibilityController.h \
-       WebKitTools/DumpRenderTree/AccessibilityUIElement.h \
        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 \
@@ -50,19 +56,24 @@ Programs_DumpRenderTree_SOURCES = \
        WebKitTools/DumpRenderTree/WorkQueue.h \
        WebKitTools/DumpRenderTree/WorkQueueItem.h \
        WebKitTools/DumpRenderTree/config.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/WorkQueueItemGtk.cpp
 
 Programs_DumpRenderTree_CXXFLAGS = \
        $(global_cxxflags) \
+       $(dumprendertree_cppflags) \
        $(Programs_DumpRenderTree_CFLAGS)
 
 Programs_DumpRenderTree_CFLAGS = \
        -fno-strict-aliasing \
-       -O2 \
+       $(dumprendertree_cppflags) \
        $(global_cflags) \
        $(GLOBALDEPS_CFLAGS) \
        $(CAIRO_CFLAGS) \
@@ -71,9 +82,17 @@ Programs_DumpRenderTree_CFLAGS = \
 
 Programs_DumpRenderTree_LDADD = \
        libwebkit-1.0.la \
+       libJavaScriptCore.la \
        $(GLOBALDEPS_LIBS) \
        $(CAIRO_LIBS) \
-       $(GTK_LIBS)
+       $(GTK_LIBS) \
+       $(GLIB_LIBS) \
+       $(LIBSOUP_LIBS) \
+       $(FREETYPE_LIBS)
+
+Programs_DumpRenderTree_LDFLAGS = \
+       -no-fast-install \
+       -no-install
 
 # clean target
 CLEANFILES += \
@@ -89,7 +108,8 @@ noinst_LTLIBRARIES += \
        TestNetscapePlugin/libtestnetscapeplugin.la
 
 dumprendertree_cppflags += \
-       -DTEST_PLUGIN_DIR=\"${shell pwd}/${top_builddir}/TestNetscapePlugin/.libs\"
+       -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 \