diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-05 13:19:52 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-05 13:19:52 +0000 |
commit | 5ab50f9ba2597a6f252a01ff3aeb3eaf3d9c9810 (patch) | |
tree | c6542c17cc0652a7ab7c2dea91103a6aa07ca36e /meta/packages/webkit/files/GNUmakefile.am | |
parent | a31ec3d0f61846fe89284443c93adfb6a7b5bcf2 (diff) | |
download | poky-5ab50f9ba2597a6f252a01ff3aeb3eaf3d9c9810.tar.gz |
webkit: update to 30762 from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3919 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/webkit/files/GNUmakefile.am')
-rw-r--r-- | meta/packages/webkit/files/GNUmakefile.am | 224 |
1 files changed, 144 insertions, 80 deletions
diff --git a/meta/packages/webkit/files/GNUmakefile.am b/meta/packages/webkit/files/GNUmakefile.am index f3ec252ee8..977770a1ed 100644 --- a/meta/packages/webkit/files/GNUmakefile.am +++ b/meta/packages/webkit/files/GNUmakefile.am | |||
@@ -21,8 +21,10 @@ | |||
21 | # | 21 | # |
22 | # global_cppflags = CPPFLAGS that apply to JSC, WebCore, and to any | 22 | # global_cppflags = CPPFLAGS that apply to JSC, WebCore, and to any |
23 | # specific port | 23 | # specific port |
24 | # global_cflags = CFLAGS and CXXFLAGS that apply to JSC, WebCore, and to | 24 | # global_cflags = CFLAGS that apply to JSC, WebCore, and to |
25 | # any specific port | 25 | # any specific port |
26 | # global_cxxflags = CXXFLAGS that apply to JSC, WebCore, and to any | ||
27 | # specific port | ||
26 | 28 | ||
27 | srcdir = @srcdir@ | 29 | srcdir = @srcdir@ |
28 | VPATH = @srcdir@ | 30 | VPATH = @srcdir@ |
@@ -34,8 +36,6 @@ GENSOURCES := $(top_builddir)/DerivedSources | |||
34 | CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/kjs/create_hash_table | 36 | CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/kjs/create_hash_table |
35 | 37 | ||
36 | # Libraries and support components | 38 | # Libraries and support components |
37 | noinst_LTLIBRARIES := | ||
38 | |||
39 | noinst_HEADERS := | 39 | noinst_HEADERS := |
40 | 40 | ||
41 | noinst_PROGRAMS := | 41 | noinst_PROGRAMS := |
@@ -49,140 +49,203 @@ EXTRA_DIST := | |||
49 | 49 | ||
50 | # | 50 | # |
51 | # Global flags to CPP | 51 | # Global flags to CPP |
52 | global_cppflags := | 52 | global_cppflags := |
53 | 53 | ||
54 | global_cppflags += \ | 54 | global_cppflags += \ |
55 | -I $(srcdir)/JavaScriptCore \ | 55 | -I$(srcdir)/JavaScriptCore \ |
56 | -I $(srcdir)/JavaScriptCore/ForwardingHeaders \ | 56 | -I$(srcdir)/JavaScriptCore/ForwardingHeaders \ |
57 | -I $(srcdir)/JavaScriptCore/wtf \ | 57 | -I$(srcdir)/JavaScriptCore/wtf \ |
58 | -I $(srcdir)/JavaScriptCore/kjs \ | 58 | -I$(srcdir)/JavaScriptCore/kjs \ |
59 | -I $(top_builddir)/DerivedSources | 59 | -I$(top_builddir)/DerivedSources |
60 | 60 | ||
61 | # Default compiler flags | 61 | # Default compiler flags |
62 | global_cflags := \ | 62 | global_cflags := \ |
63 | -Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \ | 63 | -Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \ |
64 | -Wformat -Wformat-security -Wno-format-y2k -Wundef \ | 64 | -Wformat -Wformat-security -Wno-format-y2k -Wundef \ |
65 | -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \ | 65 | -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \ |
66 | -Wno-unused-parameter -fno-exceptions -fno-strict-aliasing | 66 | -Wno-unused-parameter |
67 | 67 | ||
68 | # Libraries | 68 | global_cxxflags := \ |
69 | lib_LTLIBRARIES = libJavaScriptCore.la libWebKitGtk.la | 69 | $(SYMBOL_VISIBILITY_INLINES) |
70 | |||
71 | if !ENABLE_DEBUG | ||
72 | global_cflags += \ | ||
73 | -fno-exceptions \ | ||
74 | $(SYMBOL_VISIBILITY) | ||
75 | |||
76 | global_cxxflags += \ | ||
77 | -fno-rtti | ||
78 | endif | ||
79 | |||
80 | # Shared libraries | ||
81 | lib_LTLIBRARIES = \ | ||
82 | libwebkit-1.0.la | ||
83 | |||
84 | # Convenience libraries | ||
85 | noinst_LTLIBRARIES = \ | ||
86 | libJavaScriptCore.la \ | ||
87 | libWebCore.la | ||
70 | 88 | ||
71 | # | 89 | # |
72 | # JavaScriptCore | 90 | # JavaScriptCore |
73 | javascriptcore_h_api := | 91 | javascriptcore_h_api := |
74 | javascriptcore_cppflags:= | 92 | javascriptcore_cppflags:= |
75 | javascriptcore_sources := | 93 | javascriptcore_sources := |
76 | javascriptcore_built_sources := | 94 | javascriptcore_built_sources := |
77 | javascriptcore_built_nosources := | 95 | javascriptcore_built_nosources := |
78 | 96 | ||
79 | # The variables above are already included below so no need to touch | 97 | # The variables above are already included below so no need to touch |
80 | # these variables unless you really have to | 98 | # these variables unless you really have to |
81 | libJavaScriptCore_ladir = $(prefix)/include/WebKit/JavaScriptCore | 99 | libJavaScriptCore_ladir = $(prefix)/include/webkit-1.0/JavaScriptCore |
82 | libJavaScriptCore_la_HEADERS := $(javascriptcore_h_api) | 100 | libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api) |
83 | 101 | ||
84 | libJavaScriptCore_la_SOURCES := \ | 102 | libJavaScriptCore_la_SOURCES = \ |
85 | $(javascriptcore_built_sources) \ | 103 | $(javascriptcore_built_sources) \ |
86 | $(javascriptcore_sources) | 104 | $(javascriptcore_sources) |
87 | 105 | ||
88 | libJavaScriptCore_la_LDFLAGS := -lpthread | 106 | libJavaScriptCore_la_LIBADD = \ |
107 | $(ICU_LIBS) \ | ||
108 | $(GLOBALDEPS_LIBS) \ | ||
109 | -lpthread | ||
89 | 110 | ||
90 | libJavaScriptCore_la_CXXFLAGS := $(global_cflags) | 111 | libJavaScriptCore_la_CXXFLAGS = \ |
112 | $(global_cxxflags) \ | ||
113 | $(global_cflags) \ | ||
114 | $(GLOBALDEPS_CFLAGS) \ | ||
115 | -fstrict-aliasing | ||
91 | 116 | ||
92 | libJavaScriptCore_la_CFLAGS := $(global_cflags) | 117 | libJavaScriptCore_la_CFLAGS = \ |
118 | $(global_cflags) \ | ||
119 | $(GLOBALDEPS_CFLAGS) \ | ||
120 | -fstrict-aliasing | ||
93 | 121 | ||
94 | libJavaScriptCore_la_CPPFLAGS := $(global_cppflags) $(javascriptcore_cppflags) | 122 | libJavaScriptCore_la_CPPFLAGS = \ |
123 | $(global_cppflags) \ | ||
124 | $(javascriptcore_cppflags) \ | ||
125 | $(ICU_CPPFLAGS) | ||
95 | 126 | ||
96 | # | 127 | # |
97 | # WebCore | 128 | # WebCore |
98 | webcore_cppflags := | 129 | webcore_cppflags := |
99 | webcore_sources := | 130 | webcore_sources := |
100 | webcore_headers := | 131 | webcore_headers := |
132 | webcore_libadd := | ||
101 | webcore_built_sources := | 133 | webcore_built_sources := |
102 | webcore_built_nosources := | 134 | webcore_built_nosources := |
103 | 135 | ||
104 | # WebKitGtk | 136 | webcore_cppflags += $(HILDON_CPPFLAGS) |
137 | |||
138 | # WebKit | ||
105 | webkitgtk_h_api := | 139 | webkitgtk_h_api := |
106 | webkitgtk_headers := | 140 | webkitgtk_headers := |
107 | webkitgtk_sources := | 141 | webkitgtk_sources := |
108 | webkitgtk_cppflags := | 142 | webkitgtk_cppflags := |
109 | webkitgtk_ldflags := | ||
110 | webkitgtk_built_sources := | 143 | webkitgtk_built_sources := |
111 | webkitgtk_built_nosources := | 144 | webkitgtk_built_nosources := |
112 | webkitgtk_cleanfiles := | 145 | webkitgtk_cleanfiles := |
113 | 146 | ||
114 | # No need to touch the following variables unless you have to. If you need to change the values | 147 | libWebCore_la_SOURCES = \ |
115 | # for the following variables, use the "webkitgtk_" variables above | ||
116 | libWebKitGtk_ladir := $(prefix)/include/WebKit | ||
117 | |||
118 | libWebKitGtk_la_HEADERS := $(webkitgtk_h_api) | ||
119 | |||
120 | libWebKitGtk_la_SOURCES := \ | ||
121 | $(webcore_built_sources) \ | 148 | $(webcore_built_sources) \ |
122 | $(webcore_headers) \ | 149 | $(webcore_headers) \ |
123 | $(webcore_sources) \ | 150 | $(webcore_sources) |
124 | $(webkitgtk_built_sources) \ | ||
125 | $(webkitgtk_headers) \ | ||
126 | $(webkitgtk_sources) | ||
127 | 151 | ||
128 | libWebKitGtk_la_CXXFLAGS := \ | 152 | libWebCore_la_CXXFLAGS = \ |
129 | -fno-rtti \ | 153 | -fno-strict-aliasing \ |
154 | $(global_cxxflags) \ | ||
130 | $(global_cflags) \ | 155 | $(global_cflags) \ |
131 | $(DEPENDENCIES_CFLAGS) \ | 156 | $(GLOBALDEPS_CFLAGS) \ |
157 | $(WEBKITDEPS_CFLAGS) \ | ||
158 | $(LIBCURL_CFLAGS) \ | ||
132 | $(SQLITE3_CFLAGS) \ | 159 | $(SQLITE3_CFLAGS) \ |
133 | $(GSTREAMER_CFLAGS) \ | 160 | $(GSTREAMER_CFLAGS) \ |
134 | $(LIBXSLT_CFLAGS) \ | 161 | $(LIBXSLT_CFLAGS) \ |
135 | $(COVERAGE_CFLAGS) | 162 | $(COVERAGE_CFLAGS) \ |
163 | $(HILDON_CFLAGS) | ||
136 | 164 | ||
137 | libWebKitGtk_la_CFLAGS := \ | 165 | libWebCore_la_CFLAGS = \ |
166 | -fno-strict-aliasing \ | ||
138 | $(global_cflags) \ | 167 | $(global_cflags) \ |
139 | $(DEPENDENCIES_CFLAGS) \ | 168 | $(GLOBALDEPS_CFLAGS) \ |
169 | $(WEBKITDEPS_CFLAGS) \ | ||
170 | $(LIBCURL_CFLAGS) \ | ||
140 | $(SQLITE3_CFLAGS) \ | 171 | $(SQLITE3_CFLAGS) \ |
141 | $(GSTREAMER_CFLAGS) \ | 172 | $(GSTREAMER_CFLAGS) \ |
142 | $(LIBXSLT_CFLAGS) \ | 173 | $(LIBXSLT_CFLAGS) \ |
143 | $(COVERAGE_CFLAGS) | 174 | $(COVERAGE_CFLAGS) \ |
175 | $(HILDON_CFLAGS) | ||
144 | 176 | ||
145 | libWebKitGtk_la_CPPFLAGS := \ | 177 | libWebCore_la_CPPFLAGS = \ |
178 | $(ICU_CPPFLAGS) \ | ||
146 | $(global_cppflags) \ | 179 | $(global_cppflags) \ |
147 | $(webcore_cppflags) \ | 180 | $(webcore_cppflags) \ |
148 | $(webkitgtk_cppflags) | 181 | $(webkitgtk_cppflags) |
149 | 182 | ||
150 | libWebKitGtk_la_LIBADD := @LTLIBOBJS@ libJavaScriptCore.la | 183 | libWebCore_la_LIBADD = \ |
151 | 184 | libJavaScriptCore.la \ | |
152 | libWebKitGtk_la_LDFLAGS := \ | 185 | $(webcore_libadd) \ |
153 | $(webkitgtk_ldflags) \ | 186 | $(GLOBALDEPS_LIBS) \ |
154 | $(DEPENDENCIES_LIBS) \ | 187 | $(WEBKITDEPS_LIBS) \ |
188 | $(LIBCURL_LIBS) \ | ||
155 | $(ICU_LIBS) \ | 189 | $(ICU_LIBS) \ |
156 | $(SQLITE3_LIBS) \ | 190 | $(SQLITE3_LIBS) \ |
157 | $(GSTREAMER_LIBS) \ | 191 | $(GSTREAMER_LIBS) \ |
158 | $(LIBXSLT_LIBS) \ | 192 | $(LIBXSLT_LIBS) \ |
159 | $(COVERAGE_LDFLAGS) \ | 193 | $(HILDON_LIBS) \ |
160 | -lpthread \ | 194 | -lpthread \ |
161 | -ljpeg \ | 195 | -ljpeg |
196 | |||
197 | libwebkit_1_0_ladir = $(prefix)/include/webkit-1.0/webkit | ||
198 | libwebkit_1_0_la_HEADERS = $(webkitgtk_h_api) | ||
199 | |||
200 | libwebkit_1_0_la_SOURCES = \ | ||
201 | $(webkitgtk_built_sources) \ | ||
202 | $(webkitgtk_headers) \ | ||
203 | $(webkitgtk_sources) | ||
204 | |||
205 | libwebkit_1_0_la_CXXFLAGS = \ | ||
206 | $(libWebCore_la_CXXFLAGS) | ||
207 | |||
208 | libwebkit_1_0_la_CFLAGS = \ | ||
209 | $(libWebCore_la_CFLAGS) | ||
210 | |||
211 | libwebkit_1_0_la_CPPFLAGS = \ | ||
212 | $(libWebCore_la_CPPFLAGS) | ||
213 | |||
214 | libwebkit_1_0_la_LDFLAGS = \ | ||
215 | $(COVERAGE_LDFLAGS) \ | ||
162 | -version-info @LIBWEBKITGTK_VERSION@ | 216 | -version-info @LIBWEBKITGTK_VERSION@ |
163 | 217 | ||
218 | libwebkit_1_0_la_LIBADD = \ | ||
219 | libWebCore.la | ||
220 | |||
164 | # | 221 | # |
165 | # Extra checks and flags | 222 | # Extra checks and flags |
166 | global_cppflags += \ | 223 | global_cppflags += \ |
167 | -DBUILDING_GTK__=1 \ | 224 | -DBUILDING_GTK__=1 \ |
168 | -DUSE_SYSTEM_MALLOC \ | ||
169 | -DWTF_CHANGES | 225 | -DWTF_CHANGES |
170 | 226 | ||
227 | if !ENABLE_FAST_MALLOC | ||
228 | global_cppflags += \ | ||
229 | -DUSE_SYSTEM_MALLOC | ||
230 | endif | ||
231 | |||
171 | if TARGET_X11 | 232 | if TARGET_X11 |
172 | global_cppflags += -DXP_UNIX | 233 | global_cppflags += -DXP_UNIX |
173 | endif | 234 | endif |
174 | 235 | ||
175 | if !ENABLE_DEBUG | 236 | if !ENABLE_DEBUG |
176 | global_cppflags += -DNDEBUG | 237 | global_cppflags += -DNDEBUG |
177 | else | 238 | else |
178 | webkitgtk_cppflags += \ | 239 | webkitgtk_cppflags += \ |
179 | -DG_DISABLE_DEPRECATED \ | 240 | -DG_DISABLE_DEPRECATED \ |
180 | -DGDK_PIXBUF_DISABLE_DEPRECATED \ | 241 | -DGDK_PIXBUF_DISABLE_DEPRECATED \ |
181 | -DGDK_DISABLE_DEPRECATED \ | 242 | -DGDK_DISABLE_DEPRECATED \ |
182 | -DGTK_DISABLE_DEPRECATED \ | 243 | -DGTK_DISABLE_DEPRECATED \ |
183 | -DPANGO_DISABLE_DEPRECATED \ | 244 | -DPANGO_DISABLE_DEPRECATED |
184 | -DGDK_MULTIHEAD_SAFE \ | 245 | |
185 | -DGTK_MULTIHEAD_SAFE | 246 | # Might be useful in the future |
247 | # -DGDK_MULTIHEAD_SAFE \ | ||
248 | # -DGTK_MULTIHEAD_SAFE | ||
186 | endif | 249 | endif |
187 | 250 | ||
188 | if !ENABLE_DATABASE | 251 | if !ENABLE_DATABASE |
@@ -200,30 +263,30 @@ global_cppflags += \ | |||
200 | endif | 263 | endif |
201 | 264 | ||
202 | if ENABLE_VIDEO | 265 | if ENABLE_VIDEO |
203 | webkitgtk_ldflags += -lgstinterfaces-0.10 -lgstvideo-0.10 | 266 | webcore_libadd += -lgstinterfaces-0.10 -lgstvideo-0.10 |
204 | endif | 267 | endif |
205 | 268 | ||
206 | # | ||
207 | # WEBKIT GTK+ | ||
208 | webkitgtk_cppflags += \ | 269 | webkitgtk_cppflags += \ |
209 | -I $(top_builddir)/WebKit/gtk/WebView \ | 270 | -I$(top_builddir)/WebKit/gtk/webkit \ |
210 | -DBUILDING_CAIRO__=1 \ | 271 | -DBUILDING_CAIRO__=1 \ |
211 | -DBUILD_WEBKIT | 272 | -DBUILD_WEBKIT |
212 | 273 | ||
213 | webkitgtk_h_api += \ | 274 | webkitgtk_h_api += \ |
214 | WebKit/gtk/WebView/webkit.h \ | 275 | WebKit/gtk/webkit/webkit.h \ |
215 | WebKit/gtk/WebView/webkitdefines.h \ | 276 | WebKit/gtk/webkit/webkitdefines.h \ |
216 | WebKit/gtk/WebView/webkitnetworkrequest.h \ | 277 | WebKit/gtk/webkit/webkitnetworkrequest.h \ |
217 | WebKit/gtk/WebView/webkitwebframe.h \ | 278 | WebKit/gtk/webkit/webkitwebbackforwardlist.h \ |
218 | WebKit/gtk/WebView/webkitwebview.h | 279 | WebKit/gtk/webkit/webkitwebframe.h \ |
280 | WebKit/gtk/webkit/webkitwebhistoryitem.h \ | ||
281 | WebKit/gtk/webkit/webkitwebsettings.h \ | ||
282 | WebKit/gtk/webkit/webkitwebview.h | ||
219 | 283 | ||
220 | webkitgtk_built_sources += \ | 284 | webkitgtk_built_sources += \ |
221 | WebKit/gtk/WebView/webkit-marshal.h \ | 285 | WebKit/gtk/webkit/webkit-marshal.h \ |
222 | WebKit/gtk/WebView/webkit-marshal.cpp | 286 | WebKit/gtk/webkit/webkit-marshal.cpp |
223 | 287 | ||
224 | webkitgtk_headers += \ | 288 | webkitgtk_headers += \ |
225 | WebKit/gtk/WebView/webkitprivate.h \ | 289 | WebKit/gtk/webkit/webkitprivate.h \ |
226 | WebKit/gtk/WebView/webkitsettings.h \ | ||
227 | WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \ | 290 | WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \ |
228 | WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \ | 291 | WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \ |
229 | WebKit/gtk/WebCoreSupport/DragClientGtk.h \ | 292 | WebKit/gtk/WebCoreSupport/DragClientGtk.h \ |
@@ -233,37 +296,39 @@ webkitgtk_headers += \ | |||
233 | WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h | 296 | WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h |
234 | 297 | ||
235 | webkitgtk_sources += \ | 298 | webkitgtk_sources += \ |
236 | WebKit/gtk/WebView/webkitnetworkrequest.cpp \ | 299 | WebKit/gtk/webkit/webkitnetworkrequest.cpp \ |
237 | WebKit/gtk/WebView/webkitprivate.cpp \ | 300 | WebKit/gtk/webkit/webkitprivate.cpp \ |
238 | WebKit/gtk/WebView/webkitsettings.cpp \ | 301 | WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \ |
239 | WebKit/gtk/WebView/webkitwebframe.cpp \ | 302 | WebKit/gtk/webkit/webkitwebframe.cpp \ |
240 | WebKit/gtk/WebView/webkitwebview.cpp \ | 303 | WebKit/gtk/webkit/webkitwebhistoryitem.cpp \ |
304 | WebKit/gtk/webkit/webkitwebsettings.cpp \ | ||
305 | WebKit/gtk/webkit/webkitwebview.cpp \ | ||
241 | WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ | 306 | WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ |
242 | WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \ | 307 | WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \ |
243 | WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \ | 308 | WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \ |
244 | WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \ | 309 | WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \ |
245 | WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \ | 310 | WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \ |
246 | WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \ | 311 | WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \ |
247 | WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp | 312 | WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp |
248 | 313 | ||
249 | webkitgtk_cleanfiles += \ | 314 | webkitgtk_cleanfiles += \ |
250 | $(top_builddir)/Programs/GtkLauncher \ | 315 | $(top_builddir)/Programs/GtkLauncher \ |
251 | $(top_builddir)/WebKit/gtk/WebKitGtk.pc | 316 | $(top_builddir)/WebKit/gtk/webkit-1.0.pc |
252 | 317 | ||
253 | pkgconfigdir = $(libdir)/pkgconfig | 318 | pkgconfigdir = $(libdir)/pkgconfig |
254 | pkgconfig_DATA = WebKit/gtk/WebKitGtk.pc | 319 | pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc |
255 | 320 | ||
256 | WEBKIT_MARSHAL = $(CURDIR)/WebKit/gtk/WebView/webkit-marshal | 321 | WEBKIT_MARSHAL = $(CURDIR)/WebKit/gtk/webkit/webkit-marshal |
257 | WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/WebView/webkit-marshal.list | 322 | WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/webkit/webkit-marshal.list |
258 | 323 | ||
259 | stamp_files := \ | 324 | stamp_files := \ |
260 | stamp-webkit-marshal.cpp \ | 325 | stamp-webkit-marshal.cpp \ |
261 | stamp-webkit-marshal.h | 326 | stamp-webkit-marshal.h |
262 | 327 | ||
263 | WebKit/gtk/WebView/webkit-marshal.cpp: stamp-webkit-marshal.cpp | 328 | WebKit/gtk/webkit/webkit-marshal.cpp: stamp-webkit-marshal.cpp |
264 | @true | 329 | @true |
265 | 330 | ||
266 | WebKit/gtk/WebView/webkit-marshal.h: stamp-webkit-marshal.h | 331 | WebKit/gtk/webkit/webkit-marshal.h: stamp-webkit-marshal.h |
267 | @true | 332 | @true |
268 | 333 | ||
269 | stamp-webkit-marshal.cpp: $(WEBKIT_MARSHAL_LIST) | 334 | stamp-webkit-marshal.cpp: $(WEBKIT_MARSHAL_LIST) |
@@ -289,7 +354,7 @@ include WebKitTools/GNUmakefile.am | |||
289 | 354 | ||
290 | 355 | ||
291 | # Autogenerated sources | 356 | # Autogenerated sources |
292 | BUILT_SOURCES := \ | 357 | BUILT_SOURCES = \ |
293 | $(javascriptcore_built_sources) \ | 358 | $(javascriptcore_built_sources) \ |
294 | $(javascriptcore_built_nosources) \ | 359 | $(javascriptcore_built_nosources) \ |
295 | $(webcore_built_sources) \ | 360 | $(webcore_built_sources) \ |
@@ -302,7 +367,6 @@ CLEANFILES += \ | |||
302 | $(webkitgtk_cleanfiles) \ | 367 | $(webkitgtk_cleanfiles) \ |
303 | $(top_builddir)/Programs/DumpRenderTree \ | 368 | $(top_builddir)/Programs/DumpRenderTree \ |
304 | $(top_builddir)/Programs/testkjs \ | 369 | $(top_builddir)/Programs/testkjs \ |
305 | $(top_builddir)/Programs/dftables \ | ||
306 | $(GENSOURCES) | 370 | $(GENSOURCES) |
307 | 371 | ||
308 | MAINTAINERCLEANFILES += \ | 372 | MAINTAINERCLEANFILES += \ |