Skip to content
Permalink
Browse files
[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.


Canonical link: https://commits.webkit.org/143671@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@160490 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
zdobersek committed Dec 12, 2013
1 parent 898d1db commit e1df0f2629a0f6db40e712e3170a1a2f725e691a
Showing with 26 additions and 6 deletions.
  1. +10 −0 Source/WebKit2/ChangeLog
  2. +3 −3 Source/WebKit2/GNUmakefile.am
  3. +10 −0 Tools/ChangeLog
  4. +3 −3 Tools/TestWebKitAPI/GNUmakefile.am
@@ -1,3 +1,13 @@
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,15 +664,15 @@ 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)
$(AM_V_at)$(foreach archive, $(webcore_layer_gtk2_archives), $(shell $(AR) t $(archive) | xargs -n1 basename | xargs -I obj_file grep -F obj_file objects_list | xargs -n50 $(AR) $(AR_FLAGS) $@))
$(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) \
@@ -1,3 +1,13 @@
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,15 +121,15 @@ 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)
$(AM_V_at)$(foreach archive, $(webcore_layer_archives), $(shell $(AR) t $(archive) | xargs -n1 basename | xargs -I obj_file grep -F obj_file objects_list | xargs -n50 $(AR) $(AR_FLAGS) $@))
$(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) \

0 comments on commit e1df0f2

Please sign in to comment.