Title: [132317] trunk/Tools
- Revision
- 132317
- Author
- carlo...@webkit.org
- Date
- 2012-10-23 23:44:14 -0700 (Tue, 23 Oct 2012)
Log Message
[GTK] TestWebKitAPI/TestWebKit2 and TestWebKitAPI/TestGtk link to the installed libs
https://bugs.webkit.org/show_bug.cgi?id=100134
Reviewed by Martin Robinson.
Do not share the LDADD variable among TestWTF, TestWebKit2 and
TestGtk.
* TestWebKitAPI/GNUmakefile.am:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (132316 => 132317)
--- trunk/Tools/ChangeLog 2012-10-24 06:43:28 UTC (rev 132316)
+++ trunk/Tools/ChangeLog 2012-10-24 06:44:14 UTC (rev 132317)
@@ -1,3 +1,15 @@
+2012-10-23 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] TestWebKitAPI/TestWebKit2 and TestWebKitAPI/TestGtk link to the installed libs
+ https://bugs.webkit.org/show_bug.cgi?id=100134
+
+ Reviewed by Martin Robinson.
+
+ Do not share the LDADD variable among TestWTF, TestWebKit2 and
+ TestGtk.
+
+ * TestWebKitAPI/GNUmakefile.am:
+
2012-10-23 Kihong Kwon <kihong.k...@samsung.com>
Unreviewed. Adding myself as committer.
Modified: trunk/Tools/TestWebKitAPI/GNUmakefile.am (132316 => 132317)
--- trunk/Tools/TestWebKitAPI/GNUmakefile.am 2012-10-24 06:43:28 UTC (rev 132316)
+++ trunk/Tools/TestWebKitAPI/GNUmakefile.am 2012-10-24 06:44:14 UTC (rev 132317)
@@ -23,9 +23,7 @@
-I$(srcdir)/Source/ThirdParty/gtest/include \
-I$(top_builddir)/DerivedSources/WebKit2/include \
$(global_cppflags) \
- $(_javascript_core_cppflags) \
- $(GLIB_CFLAGS) \
- $(GTK_CFLAGS)
+ $(_javascript_core_cppflags)
noinst_PROGRAMS += \
Programs/TestWebKitAPI/TestWTF
@@ -33,17 +31,13 @@
Programs_TestWebKitAPI_TestWTF_CPPFLAGS = \
$(Libraries_libTestWebKitAPIMain_la_CPPFLAGS) \
$(GLIB_LIBS) \
- $(CAIRO_CFLAGS) \
- $(LIBSOUP_CFLAGS)
+ $(CAIRO_CFLAGS)
Programs_TestWebKitAPI_TestWTF_LDADD = \
Libraries/libTestWebKitAPIMain.la \
Libraries/libgtest.la \
libWTF.la \
- $(CAIRO_LIBS) \
- $(GLIB_LIBS) \
- $(GTK_LIBS) \
- $(LIBSOUP_LIBS)
+ $(GLIB_LIBS)
Programs_TestWebKitAPI_TestWTF_LDFLAGS = \
-no-install \
@@ -75,15 +69,18 @@
Programs_TestWebKitAPI_TestGtk_CPPFLAGS = \
$(Programs_TestWebKitAPI_TestWTF_CPPFLAGS) \
- $(webcore_cppflags) \
- $(webcoregtk_cppflags) \
- $(CAIRO_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(GTK_CFLAGS) \
$(LIBSOUP_CFLAGS)
Programs_TestWebKitAPI_TestGtk_LDADD = \
- $(Programs_TestWebKitAPI_TestWTF_LDADD) \
+ Libraries/libTestWebKitAPIMain.la \
+ Libraries/libgtest.la \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
- libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
+ libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+ $(GLIB_LIBS) \
+ $(GTK_LIBS) \
+ $(LIBSOUP_LIBS)
Programs_TestWebKitAPI_TestGtk_LDFLAGS = \
$(Programs_TestWebKitAPI_TestWTF_LDFLAGS)
@@ -102,12 +99,19 @@
Programs_TestWebKitAPI_TestWebKit2_CPPFLAGS = \
$(Programs_TestWebKitAPI_TestWTF_CPPFLAGS) \
- -I$(top_builddir)/DerivedSources/WebKit2/include
+ -I$(top_builddir)/DerivedSources/WebKit2/include \
+ $(GLIB_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(LIBSOUP_CFLAGS)
Programs_TestWebKitAPI_TestWebKit2_LDADD = \
- $(Programs_TestWebKitAPI_TestWTF_LDADD) \
+ Libraries/libTestWebKitAPIMain.la \
+ Libraries/libgtest.la \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
- libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
+ libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+ $(GLIB_LIBS) \
+ $(GTK_LIBS) \
+ $(LIBSOUP_LIBS)
Programs_TestWebKitAPI_TestWebKit2_LDFLAGS = \
$(Programs_TestWebKitAPI_TestWTF_LDFLAGS)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
