Title: [160490] trunk
- Revision
- 160490
- Author
- [email protected]
- Date
- 2013-12-12 09:21:34 -0800 (Thu, 12 Dec 2013)
Log Message
[Autotools] Prepend the WebCore layer archives' names with 'lib'
https://bugs.webkit.org/show_bug.cgi?id=125627
Reviewed by Martin Robinson.
Source/WebKit2:
* GNUmakefile.am: Libtool can complain about the WebCore layer archives not being prepended with 'lib'
when they are used during linking, so the prefix is now added to avoid such issues.
Tools:
* TestWebKitAPI/GNUmakefile.am: Libtool can complain about the WebCore layer archives not being prepended
with 'lib' when they are used during linking, so the prefix is now added to avoid such issues.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (160489 => 160490)
--- trunk/Source/WebKit2/ChangeLog 2013-12-12 17:03:13 UTC (rev 160489)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-12 17:21:34 UTC (rev 160490)
@@ -1,3 +1,13 @@
+2013-12-12 Zan Dobersek <[email protected]>
+
+ [Autotools] Prepend the WebCore layer archives' names with 'lib'
+ https://bugs.webkit.org/show_bug.cgi?id=125627
+
+ Reviewed by Martin Robinson.
+
+ * GNUmakefile.am: Libtool can complain about the WebCore layer archives not being prepended with 'lib'
+ when they are used during linking, so the prefix is now added to avoid such issues.
+
2013-12-12 Csaba Osztrogonác <[email protected]>
Move CertificateInfo to WebCore
Modified: trunk/Source/WebKit2/GNUmakefile.am (160489 => 160490)
--- trunk/Source/WebKit2/GNUmakefile.am 2013-12-12 17:03:13 UTC (rev 160489)
+++ trunk/Source/WebKit2/GNUmakefile.am 2013-12-12 17:21:34 UTC (rev 160490)
@@ -664,7 +664,7 @@
webcore_layer_gtk2_archives = $(foreach lib, $(webcore_layer_gtk2_deps), $(shell echo $(lib) | sed "s/\(.*\)\.la/.libs\/\1.a/"))
-WebCoreLayerGtk2.a: $(webcore_layer_gtk2_deps)
+libWebCoreLayerGtk2.a: $(webcore_layer_gtk2_deps)
$(AM_V_GEN)
$(AM_V_at)$(shell rm -f $@)
$(AM_V_at)$(shell find . -name "*.o" > objects_list)
@@ -672,7 +672,7 @@
$(AM_V_at)$(shell rm -f objects_list)
DISTCLEANFILES += \
- $(top_builddir)/WebCoreLayerGtk2.a
+ $(top_builddir)/libWebCoreLayerGtk2.a
Programs_WebKitPluginProcess_CPPFLAGS = \
-include $(srcdir)/Source/WebKit2/WebKit2Prefix.h \
@@ -733,7 +733,7 @@
Programs_WebKitPluginProcess_LDADD = \
-lpthread \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
- WebCoreLayerGtk2.a \
+ libWebCoreLayerGtk2.a \
libWebKit2Platform.la \
$(CAIRO_LIBS) \
$(COVERAGE_LDFLAGS) \
Modified: trunk/Tools/ChangeLog (160489 => 160490)
--- trunk/Tools/ChangeLog 2013-12-12 17:03:13 UTC (rev 160489)
+++ trunk/Tools/ChangeLog 2013-12-12 17:21:34 UTC (rev 160490)
@@ -1,3 +1,13 @@
+2013-12-12 Zan Dobersek <[email protected]>
+
+ [Autotools] Prepend the WebCore layer archives' names with 'lib'
+ https://bugs.webkit.org/show_bug.cgi?id=125627
+
+ Reviewed by Martin Robinson.
+
+ * TestWebKitAPI/GNUmakefile.am: Libtool can complain about the WebCore layer archives not being prepended
+ with 'lib' when they are used during linking, so the prefix is now added to avoid such issues.
+
2013-12-12 Commit Queue <[email protected]>
Unreviewed, rolling out r160446.
Modified: trunk/Tools/TestWebKitAPI/GNUmakefile.am (160489 => 160490)
--- trunk/Tools/TestWebKitAPI/GNUmakefile.am 2013-12-12 17:03:13 UTC (rev 160489)
+++ trunk/Tools/TestWebKitAPI/GNUmakefile.am 2013-12-12 17:21:34 UTC (rev 160490)
@@ -121,7 +121,7 @@
webcore_layer_archives = $(foreach lib, $(webcore_layer_deps), $(shell echo $(lib) | sed "s/\(.*\)\.la/.libs\/\1.a/"))
-WebCoreLayer.a: $(webcore_layer_deps)
+libWebCoreLayer.a: $(webcore_layer_deps)
$(AM_V_GEN)
$(AM_V_at)$(shell rm -f $@)
$(AM_V_at)$(shell find . -name "*.o" > objects_list)
@@ -129,7 +129,7 @@
$(AM_V_at)$(shell rm -f objects_list)
DISTCLEANFILES += \
- $(top_builddir)/WebCoreLayer.a
+ $(top_builddir)/libWebCoreLayer.a
Programs_TestWebKitAPI_TestWebCore_CPPFLAGS = \
$(Libraries_libTestWebKitAPIMain_la_CPPFLAGS) \
@@ -144,7 +144,7 @@
Libraries/libgtest.la \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
libWTF.la \
- WebCoreLayer.a \
+ libWebCoreLayer.a \
$(CAIRO_LIBS) \
$(FREETYPE_LIBS) \
$(GAMEPAD_LIBS) \
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
