WebCore:
[WebKit-https.git] / WebKitTools / GNUmakefile.am
index e07058762a433cb438dbe74f91ea5d0ddca375ac..e42a06417d81e2315bcc6606f7be6a6c0f47c8a4 100644 (file)
@@ -4,7 +4,7 @@ noinst_PROGRAMS += \
 
 # GtkLauncher
 Programs_GtkLauncher_CPPFLAGS = \
-       -I $(srcdir)/WebKit/gtk/WebView \
+       -I$(srcdir)/WebKit/gtk \
        $(global_cppflags)
 
 Programs_GtkLauncher_SOURCES = \
@@ -12,17 +12,10 @@ Programs_GtkLauncher_SOURCES = \
 
 Programs_GtkLauncher_CFLAGS = \
        $(DEPENDENCIES_CFLAGS) \
-       $(ICU_CFLAGS) \
-       $(SQLITE3_CFLAGS) \
-       $(GSTREAMER_CFLAGS) \
-       $(LIBXSLT_CFLAGS)
+       $(global_cflags)
 
 Programs_GtkLauncher_LDADD = \
        $(DEPENDENCIES_LIBS) \
-       $(ICU_LIBS) \
-       $(SQLITE3_LIBS) \
-       $(GSTREAMER_LIBS) \
-       $(LIBXSLT_LIBS) \
        libJavaScriptCore.la \
        libWebKitGtk.la
 
@@ -30,9 +23,9 @@ Programs_GtkLauncher_LDFLAGS = -ljpeg -rpath $(CURDIR)/.libs
 
 # DumpRenderTree
 Programs_DumpRenderTree_CPPFLAGS = \
-       -I $(srcdir)/WebKitTools/DumpRenderTree \
-       -I $(srcdir)/WebKitTools/DumpRenderTree/gtk \
-       -I $(srcdir)/WebKit/gtk/WebView \
+       -I$(srcdir)/WebKitTools/DumpRenderTree \
+       -I$(srcdir)/WebKitTools/DumpRenderTree/gtk \
+       -I$(srcdir)/WebKit/gtk \
        $(global_cppflags)
 
 Programs_DumpRenderTree_SOURCES = \
@@ -44,6 +37,14 @@ Programs_DumpRenderTree_SOURCES = \
        WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp \
        WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
 
-Programs_DumpRenderTree_CXXFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CXXFLAGS)
-Programs_DumpRenderTree_LDADD = $(DEPENDENCIES_LIBS) libJavaScriptCore.la libWebKitGtk.la
-Programs_DumpRenderTree_LDFLAGS = -rpath $(CURDIR)/.libs 
+Programs_DumpRenderTree_CXXFLAGS = \
+       $(DEPENDENCIES_CFLAGS) \
+       $(global_cxxflags) \
+       $(global_cflags)
+
+Programs_DumpRenderTree_LDADD = \
+       $(DEPENDENCIES_LIBS) \
+       libJavaScriptCore.la \
+       libWebKitGtk.la
+
+Programs_DumpRenderTree_LDFLAGS = -rpath $(CURDIR)/.libs