Title: [91078] trunk
Revision
91078
Author
[email protected]
Date
2011-07-15 11:11:24 -0700 (Fri, 15 Jul 2011)

Log Message

Build fixes for WebKit2. Ensure that all generated sources are
on nodist primaries, that they are on forward declared variables
so that BUILT_SOURCES is calculated properly and that zlib is
included during linking (for WOFF support).

.:

* GNUmakefile.am:
* Source/autotools/webkit.m4: Include test for zlib.

Source/WebKit/gtk:

* GNUmakefile.am:

Source/WebKit2:

* GNUmakefile.am:

Tools:

* WebKitTestRunner/GNUmakefile.am:

Modified Paths

Diff

Modified: trunk/ChangeLog (91077 => 91078)


--- trunk/ChangeLog	2011-07-15 17:23:54 UTC (rev 91077)
+++ trunk/ChangeLog	2011-07-15 18:11:24 UTC (rev 91078)
@@ -1,3 +1,13 @@
+2011-07-15  Martin Robinson  <[email protected]>
+
+        Build fixes for WebKit2. Ensure that all generated sources are
+        on nodist primaries, that they are on forward declared variables
+        so that BUILT_SOURCES is calculated properly and that zlib is 
+        included during linking (for WOFF support).
+
+        * GNUmakefile.am:
+        * Source/autotools/webkit.m4: Include test for zlib.
+
 2011-07-15  Carlos Garcia Campos  <[email protected]>
 
         [GTK] Build plugin process by default when building WebKit2

Modified: trunk/GNUmakefile.am (91077 => 91078)


--- trunk/GNUmakefile.am	2011-07-15 17:23:54 UTC (rev 91077)
+++ trunk/GNUmakefile.am	2011-07-15 18:11:24 UTC (rev 91078)
@@ -73,6 +73,8 @@
 webkitgtk_built_sources :=
 webkitgtk_built_nosources :=
 webkit2_built_sources :=
+webkit2_plugin_process_built_sources :=
+webkittestrunner_built_sources :=
 libwebcoreinternals_built_sources :=
 global_cppflags :=
 global_cflags :=

Modified: trunk/Source/WebKit/gtk/ChangeLog (91077 => 91078)


--- trunk/Source/WebKit/gtk/ChangeLog	2011-07-15 17:23:54 UTC (rev 91077)
+++ trunk/Source/WebKit/gtk/ChangeLog	2011-07-15 18:11:24 UTC (rev 91078)
@@ -1,3 +1,12 @@
+2011-07-15  Martin Robinson  <[email protected]>
+
+        Build fixes for WebKit2. Ensure that all generated sources are
+        on nodist primaries, that they are on forward declared variables
+        so that BUILT_SOURCES is calculated properly and that zlib is 
+        included during linking (for WOFF support).
+
+        * GNUmakefile.am:
+
 2011-07-14  Lukasz Slachciak  <[email protected]>
 
         Reviewed by Gustavo Noronha.

Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (91077 => 91078)


--- trunk/Source/WebKit/gtk/GNUmakefile.am	2011-07-15 17:23:54 UTC (rev 91077)
+++ trunk/Source/WebKit/gtk/GNUmakefile.am	2011-07-15 18:11:24 UTC (rev 91078)
@@ -71,7 +71,8 @@
 	$(LIBXSLT_CFLAGS) \
 	$(SQLITE3_CFLAGS) \
 	$(UNICODE_CFLAGS) \
-	$(XT_CFLAGS)
+	$(XT_CFLAGS) \
+	$(ZLIB_CFLAGS)
 
 libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \
 	-version-info @LIBWEBKITGTK_VERSION@ \
@@ -107,7 +108,8 @@
 	$(XT_LIBS) \
 	$(WINMM_LIBS) \
 	$(SHLWAPI_LIBS) \
-	$(OLE32_LIBS)
+	$(OLE32_LIBS) \
+	$(ZLIB_LIBS)
 
 webkitgtk_static_h_api += \
 	$(srcdir)/Source/WebKit/gtk/webkit/webkit.h \

Modified: trunk/Source/WebKit2/ChangeLog (91077 => 91078)


--- trunk/Source/WebKit2/ChangeLog	2011-07-15 17:23:54 UTC (rev 91077)
+++ trunk/Source/WebKit2/ChangeLog	2011-07-15 18:11:24 UTC (rev 91078)
@@ -1,3 +1,12 @@
+2011-07-15  Martin Robinson  <[email protected]>
+
+        Build fixes for WebKit2. Ensure that all generated sources are
+        on nodist primaries, that they are on forward declared variables
+        so that BUILT_SOURCES is calculated properly and that zlib is 
+        included during linking (for WOFF support).
+
+        * GNUmakefile.am:
+
 2011-07-15  Kenneth Rohde Christiansen  <[email protected]>
 
         Upstream QtWebKit/N9 changes related to visibleContentRect

Modified: trunk/Source/WebKit2/GNUmakefile.am (91077 => 91078)


--- trunk/Source/WebKit2/GNUmakefile.am	2011-07-15 17:23:54 UTC (rev 91077)
+++ trunk/Source/WebKit2/GNUmakefile.am	2011-07-15 18:11:24 UTC (rev 91078)
@@ -69,8 +69,79 @@
 	$(WebKit2)/UIProcess/API/gtk/WebKitWebViewBase.h \
 	$(WebKit2)/UIProcess/API/gtk/webkit/webkit.h
 
-nodist_libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
-	$(webkit2_built_sources)
+webkit2_built_sources += \
+	DerivedSources/WebKit2/AuthenticationManagerMessageReceiver.cpp \
+	DerivedSources/WebKit2/AuthenticationManagerMessages.h \
+	DerivedSources/WebKit2/DrawingAreaMessageReceiver.cpp \
+	DerivedSources/WebKit2/DrawingAreaMessages.h \
+	DerivedSources/WebKit2/DrawingAreaProxyMessages.h \
+	DerivedSources/WebKit2/DrawingAreaProxyMessageReceiver.cpp \
+	DerivedSources/WebKit2/DownloadProxyMessageReceiver.cpp \
+	DerivedSources/WebKit2/DownloadProxyMessages.h \
+	DerivedSources/WebKit2/NPObjectMessageReceiverMessageReceiver.cpp \
+	DerivedSources/WebKit2/NPObjectMessageReceiverMessages.h \
+	DerivedSources/WebKit2/PluginControllerProxyMessageReceiver.cpp \
+	DerivedSources/WebKit2/PluginControllerProxyMessages.h \
+	DerivedSources/WebKit2/PluginProcessMessageReceiver.cpp \
+	DerivedSources/WebKit2/PluginProcessMessages.h \
+	DerivedSources/WebKit2/PluginProcessProxyMessageReceiver.cpp \
+	DerivedSources/WebKit2/PluginProcessProxyMessages.h \
+	DerivedSources/WebKit2/PluginProxyMessageReceiver.cpp \
+	DerivedSources/WebKit2/PluginProxyMessages.h \
+	DerivedSources/WebKit2/WebApplicationCacheManagerMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebApplicationCacheManagerMessages.h \
+	DerivedSources/WebKit2/WebApplicationCacheManagerProxyMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebApplicationCacheManagerProxyMessages.h \
+	DerivedSources/WebKit2/WebContextMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebContextMessages.h \
+	DerivedSources/WebKit2/WebCookieManagerMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebCookieManagerMessages.h \
+	DerivedSources/WebKit2/WebCookieManagerProxyMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebCookieManagerProxyMessages.h \
+	DerivedSources/WebKit2/WebDatabaseManagerMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebDatabaseManagerMessages.h \
+	DerivedSources/WebKit2/WebDatabaseManagerProxyMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebDatabaseManagerProxyMessages.h \
+	DerivedSources/WebKit2/WebFullScreenManagerMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebFullScreenManagerMessages.h \
+	DerivedSources/WebKit2/WebFullScreenManagerProxyMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebFullScreenManagerProxyMessages.h \
+	DerivedSources/WebKit2/WebGeolocationManagerMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebGeolocationManagerMessages.h \
+	DerivedSources/WebKit2/WebGeolocationManagerProxyMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebGeolocationManagerProxyMessages.h \
+	DerivedSources/WebKit2/WebIconDatabaseMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebIconDatabaseMessages.h \
+	DerivedSources/WebKit2/WebIconDatabaseProxyMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebIconDatabaseProxyMessages.h \
+	DerivedSources/WebKit2/WebInspectorMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebInspectorMessages.h \
+	DerivedSources/WebKit2/WebInspectorProxyMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebInspectorProxyMessages.h \
+	DerivedSources/WebKit2/WebKeyValueStorageManagerMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebKeyValueStorageManagerMessages.h \
+	DerivedSources/WebKit2/WebKeyValueStorageManagerProxyMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebKeyValueStorageManagerProxyMessages.h \
+	DerivedSources/WebKit2/WebMediaCacheManagerMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebMediaCacheManagerMessages.h \
+	DerivedSources/WebKit2/WebMediaCacheManagerProxyMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebMediaCacheManagerProxyMessages.h \
+	DerivedSources/WebKit2/WebPageProxyMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebPageProxyMessages.h \
+	DerivedSources/WebKit2/WebPageMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebPageMessages.h \
+	DerivedSources/WebKit2/WebResourceCacheManagerMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebResourceCacheManagerMessages.h \
+	DerivedSources/WebKit2/WebResourceCacheManagerProxyMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebResourceCacheManagerProxyMessages.h \
+	DerivedSources/WebKit2/WebProcessConnectionMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebProcessConnectionMessages.h \
+	DerivedSources/WebKit2/WebProcessMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebProcessMessages.h \
+	DerivedSources/WebKit2/WebProcessProxyMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebProcessProxyMessages.h
+BUILT_SOURCES += $(webkit2_built_sources)
+nodist_libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES =$(webkit2_built_sources)
 
 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
 	Source/WebKit/gtk/webkit/webkiterror.h \
@@ -840,86 +911,11 @@
 pkgconfig_DATA += Source/WebKit2/gtk/@WEBKITGTK_PC_NAME@2-@[email protected]
 
 # WebKit2 specific variables
-webkit2_built_sources += \
-	DerivedSources/WebKit2/AuthenticationManagerMessageReceiver.cpp \
-	DerivedSources/WebKit2/AuthenticationManagerMessages.h \
-	DerivedSources/WebKit2/DrawingAreaMessageReceiver.cpp \
-	DerivedSources/WebKit2/DrawingAreaMessages.h \
-	DerivedSources/WebKit2/DrawingAreaProxyMessages.h \
-	DerivedSources/WebKit2/DrawingAreaProxyMessageReceiver.cpp \
-	DerivedSources/WebKit2/DownloadProxyMessageReceiver.cpp \
-	DerivedSources/WebKit2/DownloadProxyMessages.h \
-	DerivedSources/WebKit2/NPObjectMessageReceiverMessageReceiver.cpp \
-	DerivedSources/WebKit2/NPObjectMessageReceiverMessages.h \
-	DerivedSources/WebKit2/PluginControllerProxyMessageReceiver.cpp \
-	DerivedSources/WebKit2/PluginControllerProxyMessages.h \
-	DerivedSources/WebKit2/PluginProcessMessageReceiver.cpp \
-	DerivedSources/WebKit2/PluginProcessMessages.h \
-	DerivedSources/WebKit2/PluginProcessProxyMessageReceiver.cpp \
-	DerivedSources/WebKit2/PluginProcessProxyMessages.h \
-	DerivedSources/WebKit2/PluginProxyMessageReceiver.cpp \
-	DerivedSources/WebKit2/PluginProxyMessages.h \
-	DerivedSources/WebKit2/WebApplicationCacheManagerMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebApplicationCacheManagerMessages.h \
-	DerivedSources/WebKit2/WebApplicationCacheManagerProxyMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebApplicationCacheManagerProxyMessages.h \
-	DerivedSources/WebKit2/WebContextMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebContextMessages.h \
-	DerivedSources/WebKit2/WebCookieManagerMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebCookieManagerMessages.h \
-	DerivedSources/WebKit2/WebCookieManagerProxyMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebCookieManagerProxyMessages.h \
-	DerivedSources/WebKit2/WebDatabaseManagerMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebDatabaseManagerMessages.h \
-	DerivedSources/WebKit2/WebDatabaseManagerProxyMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebDatabaseManagerProxyMessages.h \
-	DerivedSources/WebKit2/WebFullScreenManagerMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebFullScreenManagerMessages.h \
-	DerivedSources/WebKit2/WebFullScreenManagerProxyMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebFullScreenManagerProxyMessages.h \
-	DerivedSources/WebKit2/WebGeolocationManagerMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebGeolocationManagerMessages.h \
-	DerivedSources/WebKit2/WebGeolocationManagerProxyMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebGeolocationManagerProxyMessages.h \
-	DerivedSources/WebKit2/WebIconDatabaseMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebIconDatabaseMessages.h \
-	DerivedSources/WebKit2/WebIconDatabaseProxyMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebIconDatabaseProxyMessages.h \
-	DerivedSources/WebKit2/WebInspectorMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebInspectorMessages.h \
-	DerivedSources/WebKit2/WebInspectorProxyMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebInspectorProxyMessages.h \
-	DerivedSources/WebKit2/WebKeyValueStorageManagerMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebKeyValueStorageManagerMessages.h \
-	DerivedSources/WebKit2/WebKeyValueStorageManagerProxyMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebKeyValueStorageManagerProxyMessages.h \
-	DerivedSources/WebKit2/WebMediaCacheManagerMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebMediaCacheManagerMessages.h \
-	DerivedSources/WebKit2/WebMediaCacheManagerProxyMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebMediaCacheManagerProxyMessages.h \
-	DerivedSources/WebKit2/WebPageProxyMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebPageProxyMessages.h \
-	DerivedSources/WebKit2/WebPageMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebPageMessages.h \
-	DerivedSources/WebKit2/WebResourceCacheManagerMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebResourceCacheManagerMessages.h \
-	DerivedSources/WebKit2/WebResourceCacheManagerProxyMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebResourceCacheManagerProxyMessages.h \
-	DerivedSources/WebKit2/WebProcessConnectionMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebProcessConnectionMessages.h \
-	DerivedSources/WebKit2/WebProcessMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebProcessMessages.h \
-	DerivedSources/WebKit2/WebProcessProxyMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebProcessProxyMessages.h
-
-BUILT_SOURCES += \
-	$(webkit2_built_sources) \
-	generate-webkit2-forwarding-headers
-
 forwarding_headers := $(GENSOURCES_WEBKIT2)/include
 generate-webkit2-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(libWebKit2_la_SOURCES)
 	$(AM_V_GEN)$(PERL) $< $(WebKit2) $(forwarding_headers) gtk
 	$(AM_V_GEN)$(PERL) $< $(WebKit2) $(forwarding_headers) soup 
+BUILT_SOURCES += generate-webkit2-forwarding-headers
 
 vpath %.messages.in = \
 	$(WebKit2)/PluginProcess \
@@ -981,7 +977,8 @@
 	$(CAIRO_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
-	$(LIBSOUP_CFLAGS)
+	$(LIBSOUP_CFLAGS) \
+	$(ZLIB_CFLAGS)
 
 Programs_WebKitWebProcess_SOURCES = \
 	Source/WebKit2/gtk/MainGtk.cpp
@@ -990,7 +987,8 @@
 	libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
 	$(GLIB_LIBS) \
 	$(GTK_LIBS) \
-	$(LIBSOUP_LIBS)
+	$(LIBSOUP_LIBS) \
+	$(ZLIB_CFLAGS)
 
 Programs_WebKitWebProcess_LDFLAGS = \
 	-no-fast-install \
@@ -1035,18 +1033,9 @@
 	$(SQLITE3_CFLAGS) \
 	$(UNICODE_CFLAGS) \
 	$(XRENDER_CFLAGS) \
-	$(XT_CFLAGS)
+	$(XT_CFLAGS) \
+	$(ZLIB_LIBS)
 
-plugin_process_built_sources = \
-	DerivedSources/WebKit2/NPObjectMessageReceiverMessageReceiver.cpp \
-	DerivedSources/WebKit2/NPObjectMessageReceiverMessages.h \
-	DerivedSources/WebKit2/PluginControllerProxyMessageReceiver.cpp \
-	DerivedSources/WebKit2/PluginControllerProxyMessages.h \
-	DerivedSources/WebKit2/PluginProcessMessageReceiver.cpp \
-	DerivedSources/WebKit2/PluginProcessMessages.h \
-	DerivedSources/WebKit2/WebProcessConnectionMessageReceiver.cpp \
-	DerivedSources/WebKit2/WebProcessConnectionMessages.h
-
 bin_PROGRAMS += \
 	Programs/WebKitPluginProcess
 
@@ -1093,8 +1082,19 @@
 	$(LIBSOUP_CFLAGS) \
 	$(UNICODE_CFLAGS)
 
+webkit2_plugin_process_built_sources += \
+	DerivedSources/WebKit2/NPObjectMessageReceiverMessageReceiver.cpp \
+	DerivedSources/WebKit2/NPObjectMessageReceiverMessages.h \
+	DerivedSources/WebKit2/PluginControllerProxyMessageReceiver.cpp \
+	DerivedSources/WebKit2/PluginControllerProxyMessages.h \
+	DerivedSources/WebKit2/PluginProcessMessageReceiver.cpp \
+	DerivedSources/WebKit2/PluginProcessMessages.h \
+	DerivedSources/WebKit2/WebProcessConnectionMessageReceiver.cpp \
+	DerivedSources/WebKit2/WebProcessConnectionMessages.h
+nodist_Programs_WebKitPluginProcess_SOURCES = $(webkit2_plugin_process_built_sources)
+BUILT_SOURCES += $(nodist_Programs_WebKitPluginProcess_SOURCES)
+
 Programs_WebKitPluginProcess_SOURCES = \
-	$(plugin_process_built_sources) \
 	Source/WebKit2/Platform/CoreIPC/ArgumentCoder.h \
 	Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h \
 	Source/WebKit2/Platform/CoreIPC/ArgumentCoders.cpp \
@@ -1192,6 +1192,7 @@
 	libWebCore.la \
 	libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
 	libWebCoreGtk2.la \
+	$(webcore_ldflags) \
 	$(CAIRO_LIBS) \
 	$(COVERAGE_LDFLAGS) \
 	$(GEOCLUE_LIBS) \
@@ -1202,11 +1203,16 @@
 	$(LIBSOUP_LIBS) \
 	$(LIBXML_LIBS) \
 	$(LIBXSLT_LIBS) \
+	$(OLE32_LIBS) \
 	$(PANGO_LIBS) \
 	$(PNG_LIBS) \
+	$(SHLWAPI_LIBS) \
 	$(SQLITE3_LIBS) \
 	$(UNICODE_LIBS) \
-	$(XT_LIBS)
+	$(XRENDER_LIBS) \
+	$(XT_LIBS) \
+	$(WINMM_LIBS) \
+	$(ZLIB_LIBS)
 
 Programs_WebKitPluginProcess_LDFLAGS = \
 	-no-fast-install \
@@ -1216,4 +1222,4 @@
 	$(SYMBOL_VISIBILITY_INLINES) \
 	$(global_cxxflags)
 
-endif
\ No newline at end of file
+endif

Modified: trunk/Source/autotools/webkit.m4 (91077 => 91078)


--- trunk/Source/autotools/webkit.m4	2011-07-15 17:23:54 UTC (rev 91077)
+++ trunk/Source/autotools/webkit.m4	2011-07-15 18:11:24 UTC (rev 91078)
@@ -163,4 +163,9 @@
 
 AC_SUBST([UNICODE_CFLAGS])
 AC_SUBST([UNICODE_LIBS])
+
+PKG_CHECK_MODULES([ZLIB], [zlib])
+AC_SUBST([ZLIB_CFLAGS])
+AC_SUBST([ZLIB_LIBS])
+
 ])

Modified: trunk/Tools/ChangeLog (91077 => 91078)


--- trunk/Tools/ChangeLog	2011-07-15 17:23:54 UTC (rev 91077)
+++ trunk/Tools/ChangeLog	2011-07-15 18:11:24 UTC (rev 91078)
@@ -1,3 +1,12 @@
+2011-07-15  Martin Robinson  <[email protected]>
+
+        Build fixes for WebKit2. Ensure that all generated sources are
+        on nodist primaries, that they are on forward declared variables
+        so that BUILT_SOURCES is calculated properly and that zlib is 
+        included during linking (for WOFF support).
+
+        * WebKitTestRunner/GNUmakefile.am:
+
 2011-07-15  Dimitri Glazkov  <[email protected]>
 
         Store error and warning information on TestExpectationLine.

Modified: trunk/Tools/WebKitTestRunner/GNUmakefile.am (91077 => 91078)


--- trunk/Tools/WebKitTestRunner/GNUmakefile.am	2011-07-15 17:23:54 UTC (rev 91077)
+++ trunk/Tools/WebKitTestRunner/GNUmakefile.am	2011-07-15 18:11:24 UTC (rev 91078)
@@ -51,14 +51,14 @@
 # The InjectedBundle library allows the render process to load harness code.
 noinst_LTLIBRARIES += Libraries/libTestRunnerInjectedBundle.la
 
-nodist_injected_bundle_built_sources = \
+webkittestrunner_built_sources += \
 	DerivedSources/InjectedBundle/JSEventSendingController.cpp \
 	DerivedSources/InjectedBundle/JSGCController.cpp \
 	DerivedSources/InjectedBundle/JSLayoutTestController.cpp
-BUILT_SOURCES += $(nodist_injected_bundle_built_sources)
+nodist_Libraries_libTestRunnerInjectedBundle_la_SOURCES = $(webkittestrunner_built_sources)
+BUILT_SOURCES += $(webkittestrunner_built_sources)
 
 Libraries_libTestRunnerInjectedBundle_la_SOURCES = \
-	$(nodist_injected_bundle_built_sources) \
 	Tools/WebKitTestRunner/InjectedBundle/ActivateFonts.h \
 	Tools/WebKitTestRunner/InjectedBundle/Bindings/JSWrappable.h \
 	Tools/WebKitTestRunner/InjectedBundle/Bindings/JSWrapper.cpp \
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to