1 |
--- webkitgtk-2.2.4/Source/WebKit2/GNUmakefile.am.0000 2014-01-20 15:57:54.000000000 +0800 |
--- webkitgtk-2.2.4/Source/WebKit2/GNUmakefile.am.0000 2014-01-20 15:57:54.000000000 +0800 |
2 |
+++ webkitgtk-2.2.4/Source/WebKit2/GNUmakefile.am 2014-02-06 15:48:22.146826960 +0800 |
+++ webkitgtk-2.2.4/Source/WebKit2/GNUmakefile.am 2014-02-06 17:34:38.784638391 +0800 |
3 |
@@ -558,6 +558,9 @@ |
@@ -558,6 +558,9 @@ |
4 |
-module \ |
-module \ |
5 |
-avoid-version |
-avoid-version |
11 |
-fno-strict-aliasing \ |
-fno-strict-aliasing \ |
12 |
-I$(srcdir)/Source/WebKit2/Platform \ |
-I$(srcdir)/Source/WebKit2/Platform \ |
13 |
--- webkitgtk-2.2.4/Tools/GNUmakefile.am.0000 2014-01-20 15:57:54.000000000 +0800 |
--- webkitgtk-2.2.4/Tools/GNUmakefile.am.0000 2014-01-20 15:57:54.000000000 +0800 |
14 |
+++ webkitgtk-2.2.4/Tools/GNUmakefile.am 2014-02-06 15:48:22.146826960 +0800 |
+++ webkitgtk-2.2.4/Tools/GNUmakefile.am 2014-02-06 17:34:38.784638391 +0800 |
15 |
@@ -302,6 +302,8 @@ |
@@ -302,6 +302,8 @@ |
16 |
-avoid-version \ |
-avoid-version \ |
17 |
-module |
-module |
22 |
endif |
endif |
23 |
|
|
24 |
--- webkitgtk-2.2.4/Tools/TestWebKitAPI/GNUmakefile.am.0000 2014-01-20 20:48:13.000000000 +0800 |
--- webkitgtk-2.2.4/Tools/TestWebKitAPI/GNUmakefile.am.0000 2014-01-20 20:48:13.000000000 +0800 |
25 |
+++ webkitgtk-2.2.4/Tools/TestWebKitAPI/GNUmakefile.am 2014-02-06 16:54:16.567511256 +0800 |
+++ webkitgtk-2.2.4/Tools/TestWebKitAPI/GNUmakefile.am 2014-02-06 17:37:06.428733516 +0800 |
26 |
@@ -670,6 +670,9 @@ |
@@ -628,10 +628,10 @@ |
27 |
|
|
28 |
|
if ENABLE_WEBKIT2 |
29 |
|
noinst_LTLIBRARIES += \ |
30 |
|
- Libraries/libTestWebKitAPIInjectedBundle.la |
31 |
|
+ Libraries/libTestWebKitAPIInjectedBundle.a |
32 |
|
endif # ENABLE_WEBKIT2 |
33 |
|
|
34 |
|
-Libraries_libTestWebKitAPIInjectedBundle_la_SOURCES = \ |
35 |
|
+Libraries_libTestWebKitAPIInjectedBundle_a_SOURCES = \ |
36 |
|
Tools/TestWebKitAPI/InjectedBundleController.cpp \ |
37 |
|
Tools/TestWebKitAPI/InjectedBundleController.h \ |
38 |
|
Tools/TestWebKitAPI/InjectedBundleMain.cpp \ |
39 |
|
@@ -664,79 +664,80 @@ |
40 |
|
Tools/TestWebKitAPI/gtk/InjectedBundleControllerGtk.cpp \ |
41 |
|
Tools/TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp |
42 |
|
|
43 |
|
-Libraries_libTestWebKitAPIInjectedBundle_la_LDFLAGS = \ |
44 |
|
+Libraries_libTestWebKitAPIInjectedBundle_a_LDFLAGS = \ |
45 |
|
-rpath ${shell pwd}/$(top_builddir)/Libraries/.libs \ |
46 |
|
- $(no_undefined) \ |
47 |
-avoid-version \ |
-avoid-version \ |
48 |
-module |
-module |
49 |
|
|
50 |
+Libraries_libTestWebKitAPIInjectedBundle_la_LIBADD = libWTF.la \ |
-Libraries_libTestWebKitAPIInjectedBundle_la_CPPFLAGS = \ |
51 |
|
- $(Libraries_libTestWebKitAPIMain_la_CPPFLAGS) \ |
52 |
|
+Libraries_libTestWebKitAPIInjectedBundle_a_LIBADD = libWTF.la \ |
53 |
+ libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la $(GTK_LIBS) |
+ libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la $(GTK_LIBS) |
54 |
+ |
+ |
55 |
Libraries_libTestWebKitAPIInjectedBundle_la_CPPFLAGS = \ |
+Libraries_libTestWebKitAPIInjectedBundle_a_CPPFLAGS = \ |
56 |
$(Libraries_libTestWebKitAPIMain_la_CPPFLAGS) \ |
+ $(Libraries_libTestWebKitAPIMain_a_CPPFLAGS) \ |
57 |
-I$(top_builddir)/DerivedSources/InjectedBundle \ |
-I$(top_builddir)/DerivedSources/InjectedBundle \ |
58 |
@@ -711,32 +714,32 @@ |
$(GTK_CFLAGS) |
59 |
|
|
60 |
|
-Libraries_libTestWebKitAPIInjectedBundle_la_CXXFLAGS = \ |
61 |
|
+Libraries_libTestWebKitAPIInjectedBundle_a_CXXFLAGS = \ |
62 |
|
-DGTEST_HAS_RTTI=0 \ |
63 |
|
$(global_cxxflags) |
64 |
|
|
65 |
|
-Libraries_libTestWebKitAPIInjectedBundle_la_CFLAGS = \ |
66 |
|
+Libraries_libTestWebKitAPIInjectedBundle_a_CFLAGS = \ |
67 |
|
$(global_cflags) |
68 |
|
|
69 |
|
|
70 |
|
if ENABLE_WEBKIT2 |
71 |
|
-noinst_LTLIBRARIES += Libraries/WebExtensions/libWebExtensionTest.la |
72 |
|
+noinst_LTLIBRARIES += Libraries/WebExtensions/libWebExtensionTest.a |
73 |
|
endif |
74 |
|
|
75 |
|
-Libraries_WebExtensions_libWebExtensionTest_la_SOURCES = \ |
76 |
|
+Libraries_WebExtensions_libWebExtensionTest_a_SOURCES = \ |
77 |
|
Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp |
78 |
|
|
79 |
|
-Libraries_WebExtensions_libWebExtensionTest_la_LDFLAGS = \ |
80 |
|
+Libraries_WebExtensions_libWebExtensionTest_a_LDFLAGS = \ |
81 |
|
-rpath ${shell pwd}/$(top_builddir)/Libraries/WebExtensions/.libs \ |
82 |
|
- $(no_undefined) \ |
83 |
|
-avoid-version \ |
84 |
|
-module |
85 |
|
|
86 |
|
-Libraries_WebExtensions_libWebExtensionTest_la_CPPFLAGS = \ |
87 |
|
+Libraries_WebExtensions_libWebExtensionTest_a_CPPFLAGS = \ |
88 |
|
-I$(srcdir)/Source/WebKit2/WebProcess/InjectedBundle/API/gtk \ |
89 |
|
-I$(top_builddir)/DerivedSources \ |
90 |
|
-I$(top_builddir)/DerivedSources/WebKit2/webkit2extension/include \ |
91 |
|
-DWEBKIT2_COMPILATION \ |
92 |
|
$(webkit2gtk_tests_cppflags) |
93 |
|
|
94 |
|
-Libraries_WebExtensions_libWebExtensionTest_la_CXXFLAGS = \ |
95 |
|
+Libraries_WebExtensions_libWebExtensionTest_a_CXXFLAGS = \ |
96 |
|
$(global_cxxflags) |
97 |
|
|
98 |
|
-Libraries_WebExtensions_libWebExtensionTest_la_CFLAGS = \ |
99 |
|
+Libraries_WebExtensions_libWebExtensionTest_a_CFLAGS = \ |
100 |
|
$(global_cflags) |
101 |
|
|
102 |
|
|
103 |
if ENABLE_WEBKIT2 |
if ENABLE_WEBKIT2 |
137 |
|
|
138 |
|
|
139 |
--- webkitgtk-2.2.4/Tools/WebKitTestRunner/GNUmakefile.am.0000 2014-01-20 15:57:54.000000000 +0800 |
--- webkitgtk-2.2.4/Tools/WebKitTestRunner/GNUmakefile.am.0000 2014-01-20 15:57:54.000000000 +0800 |
140 |
+++ webkitgtk-2.2.4/Tools/WebKitTestRunner/GNUmakefile.am 2014-02-06 15:48:22.146826960 +0800 |
+++ webkitgtk-2.2.4/Tools/WebKitTestRunner/GNUmakefile.am 2014-02-06 17:34:38.784638391 +0800 |
141 |
@@ -117,7 +117,8 @@ |
@@ -117,7 +117,8 @@ |
142 |
Tools/WebKitTestRunner/InjectedBundle/TextInputController.h |
Tools/WebKitTestRunner/InjectedBundle/TextInputController.h |
143 |
|
|