Commit 0d422e8f authored by zandobersek@gmail.com's avatar zandobersek@gmail.com

[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.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@160490 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 755a020d
2013-12-12 Zan Dobersek <zdobersek@igalia.com>
[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 <ossy@webkit.org>
Move CertificateInfo to WebCore
......
......@@ -664,7 +664,7 @@ endif
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 @@ WebCoreLayerGtk2.a: $(webcore_layer_gtk2_deps)
$(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_SOURCES = \
Programs_WebKitPluginProcess_LDADD = \
-lpthread \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
WebCoreLayerGtk2.a \
libWebCoreLayerGtk2.a \
libWebKit2Platform.la \
$(CAIRO_LIBS) \
$(COVERAGE_LDFLAGS) \
......
2013-12-12 Zan Dobersek <zdobersek@igalia.com>
[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 <commit-queue@webkit.org>
Unreviewed, rolling out r160446.
......
......@@ -121,7 +121,7 @@ endif
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 @@ WebCoreLayer.a: $(webcore_layer_deps)
$(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 @@ Programs_TestWebKitAPI_TestWebCore_LDADD = \
Libraries/libgtest.la \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
libWTF.la \
WebCoreLayer.a \
libWebCoreLayer.a \
$(CAIRO_LIBS) \
$(FREETYPE_LIBS) \
$(GAMEPAD_LIBS) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment