Sophie

Sophie

distrib > Fedora > 18 > x86_64 > by-pkgid > 23fb5eae5ec486196c250c3e15381b45 > files > 2

mingw-webkitgtk3-1.10.2-1.fc18.src.rpm

Do not build WebKit2 test for WebKit1.

diff -uprN webkit-1.9.6/Source/ThirdParty/gtest/GNUmakefile.am webkit-1.9.6.az/Source/ThirdParty/gtest/GNUmakefile.am
--- webkit-1.9.6/Source/ThirdParty/gtest/GNUmakefile.am	2012-07-19 12:02:14 +0200
+++ webkit-1.9.6.az/Source/ThirdParty/gtest/GNUmakefile.am	2012-08-10 11:55:45 +0200
@@ -1,3 +1,4 @@
+if ENABLE_WEBKIT2
 
 noinst_LTLIBRARIES += \
 	Libraries/libgtest.la
@@ -40,6 +41,8 @@ Libraries_libgtest_la_CXXFLAGS = -DGTEST
 Libraries_libgtest_la_LIBADD = \
 	-lpthread
 
+endif
+
 # gtest source files that we don't compile directly.  They are
 # #included by gtest-all.cc.
 EXTRA_DIST += \
diff -uprN webkit-1.9.6/Tools/TestWebKitAPI/GNUmakefile.am webkit-1.9.6.az/Tools/TestWebKitAPI/GNUmakefile.am
--- webkit-1.9.6/Tools/TestWebKitAPI/GNUmakefile.am	2012-08-06 10:17:52 +0200
+++ webkit-1.9.6.az/Tools/TestWebKitAPI/GNUmakefile.am	2012-08-10 11:55:46 +0200
@@ -1,3 +1,5 @@
+if ENABLE_WEBKIT2
+
 BUILT_SOURCES += \
 	generate-testwebkitapi-forwarding-headers
 wk2_tests_sources = $(shell ls $(srcdir)/Tools/TestWebKitAPI/Tests/WebKit2/*.cpp)
@@ -91,7 +93,6 @@ Programs_TestWebKitAPI_TestGtk_SOURCES =
 	Tools/TestWebKitAPI/config.h \
 	Tools/TestWebKitAPI/Tests/gtk/InputMethodFilter.cpp
 
-if ENABLE_WEBKIT2
 noinst_PROGRAMS += \
 	Programs/TestWebKitAPI/TestWebKit2