diff options
| author | Koen Kooi <koen@openembedded.org> | 2010-01-23 10:37:18 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2010-01-24 10:11:29 +0100 |
| commit | 6167a6d60b27474cb6ed3a649390f901879cb940 (patch) | |
| tree | a35737c4b26ca6da12a72ae455ecfa2542d30b48 /recipes/webkit/webkit-gtk/GNUmakefile.am | |
| parent | 38c5accb336c53a27cb3fba1d8dd48ec56be4869 (diff) | |
webkit: bump SRCREV to get a fix for servers that always send gzip compressed data
Diffstat (limited to 'recipes/webkit/webkit-gtk/GNUmakefile.am')
| -rw-r--r-- | recipes/webkit/webkit-gtk/GNUmakefile.am | 39 |
1 files changed, 12 insertions, 27 deletions
diff --git a/recipes/webkit/webkit-gtk/GNUmakefile.am b/recipes/webkit/webkit-gtk/GNUmakefile.am index 3a0e398aa4..f9ad21c334 100644 --- a/recipes/webkit/webkit-gtk/GNUmakefile.am +++ b/recipes/webkit/webkit-gtk/GNUmakefile.am @@ -48,6 +48,7 @@ GTESTER_REPORT = gtester-report bin_PROGRAMS := noinst_PROGRAMS := noinst_HEADERS := +noinst_LTLIBRARIES := lib_LIBRARIES := IDL_BINDINGS := TEST_PROGS := @@ -152,9 +153,8 @@ lib_LTLIBRARIES = \ libwebkit-1.0.la # Convenience libraries -noinst_LTLIBRARIES = \ - libJavaScriptCore.la \ - libWebCore.la +noinst_LTLIBRARIES += \ + libJavaScriptCore.la # JavaScriptCore javascriptcore_cppflags += \ @@ -196,30 +196,12 @@ libJavaScriptCore_la_CPPFLAGS = \ $(global_cppflags) \ $(javascriptcore_cppflags) -# WebCore -nodist_EXTRA_libWebCore_la_SOURCES = \ +# WebKit +nodist_EXTRA_libwebkit_1_0_la_SOURCES = \ $(webcore_built_nosources) -nodist_libWebCore_la_SOURCES = \ - $(webcore_built_sources) - -libWebCore_la_SOURCES = \ - $(webcore_sources) \ - $(webcoregtk_sources) - -libWebCore_la_CXXFLAGS = \ - $(global_cxxflags) \ - $(corekit_cflags) - -libWebCore_la_CFLAGS = \ - $(global_cflags) \ - $(corekit_cflags) - -libWebCore_la_CPPFLAGS = \ - $(corekit_cppflags) - -# WebKit nodist_libwebkit_1_0_la_SOURCES = \ + $(webcore_built_sources) \ $(webkitgtk_built_sources) libwebkit_1_0_ladir = $(prefix)/include/webkit-1.0/webkit @@ -228,6 +210,8 @@ libwebkit_1_0_la_HEADERS = \ WebKit/gtk/webkit/webkitenumtypes.h libwebkit_1_0_la_SOURCES = \ + $(webcore_sources) \ + $(webcoregtk_sources) \ $(webkitgtk_sources) libwebkit_1_0_la_CXXFLAGS = \ @@ -251,7 +235,6 @@ libwebkit_1_0_la_LDFLAGS = \ libwebkit_1_0_la_LIBADD = \ -lpthread \ libJavaScriptCore.la \ - libWebCore.la \ libWebCoreJS.la \ $(webcore_ldflags) \ $(CAIRO_LIBS) \ @@ -459,11 +442,12 @@ typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.ty %.typelib: %.gir $(G_IR_COMPILER) $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(top_srcdir)/WebKit/gtk $< -o $@ -EXTRA_DIST += $(JSCORE_GIRSOURCES) CLEANFILES += $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) $(typelibs_DATA) endif +EXTRA_DIST += WebKit/gtk/JSCore-1.0.gir + WEBKIT_MARSHAL = $(GENSOURCES)/webkitmarshal WEBKIT_MARSHAL_LIST = $(top_srcdir)/WebKit/gtk/webkitmarshal.list @@ -542,7 +526,8 @@ EXTRA_DIST += \ $(srcdir)/WebKit/gtk/docs/webkitgtk-sections.txt \ $(srcdir)/WebKit/gtk/docs/version.xml.in \ $(srcdir)/WebKit/gtk/po/* \ - $(srcdir)/WebKit/gtk/resources/* + $(srcdir)/WebKit/gtk/resources/* \ + $(srcdir)/WebKit/gtk/tests/resources/* # extra resource files resourcesdir = ${datadir}/webkit-1.0/resources |