git.openpandora.org / openembedded.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
WebKit: Back to old version - new version didn't build
[openembedded.git] / recipes / webkit / webkit-gtk / GNUmakefile.am
diff --git a/recipes/webkit/webkit-gtk/GNUmakefile.am b/recipes/webkit/webkit-gtk/GNUmakefile.am
index 89260ad..399f7a4 100644 (file)
--- a/recipes/webkit/webkit-gtk/GNUmakefile.am
+++ b/recipes/webkit/webkit-gtk/GNUmakefile.am
@@ -29,6 +29,10 @@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
+DISTCHECK_CONFIGURE_FLAGS = \
+       --enable-introspection  \
+       --enable-gtk-doc
+
 # Directory for autogenerated sources
 GENSOURCES := $(top_builddir)/DerivedSources
 GENPROGRAMS := $(top_builddir)/Programs
@@ -44,6 +48,7 @@ GTESTER_REPORT = gtester-report
 bin_PROGRAMS :=
 noinst_PROGRAMS :=
 noinst_HEADERS :=
+noinst_LTLIBRARIES :=
 lib_LIBRARIES :=
 IDL_BINDINGS :=
 TEST_PROGS :=
@@ -74,6 +79,11 @@ global_cflags :=
 global_cxxflags :=
 corekit_cflags :=
 corekit_cppflags :=
+JSCORE_GIRSOURCES :=
+WEBKIT_GIRSOURCES :=
+typelibsdir :=
+typelibs_DATA :=
+EXTRA_DIST :=
 BUILT_SOURCES :=
 CLEANFILES :=
 DISTCLEANFILES :=
@@ -132,6 +142,7 @@ global_cxxflags += \
 # It breaks the build on other platforms, so we use it conditionally
 if OS_WIN32
 no_undefined = -no-undefined
+version_script = -export-symbols-regex "^(webkit_|JS).*"
 endif
 
 if OS_GNU
@@ -143,15 +154,16 @@ lib_LTLIBRARIES = \
        libwebkit-1.0.la
 
 # Convenience libraries
-noinst_LTLIBRARIES = \
-       libJavaScriptCore.la \
-       libWebCore.la
+noinst_LTLIBRARIES += \
+       libJavaScriptCore.la
 
 # JavaScriptCore
 javascriptcore_cppflags += \
        -I$(srcdir)/JavaScriptCore/ForwardingHeaders \
        -I$(srcdir)/JavaScriptCore/parser \
        -I$(srcdir)/JavaScriptCore/wtf \
+       -I$(srcdir)/JavaScriptCore/wtf/gtk \
+       -I$(srcdir)/JavaScriptCore/wtf/gobject \
        -I$(top_builddir)/DerivedSources
 
 nodist_EXTRA_libJavaScriptCore_la_SOURCES = \
@@ -186,30 +198,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
@@ -218,6 +212,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 = \
@@ -241,7 +237,6 @@ libwebkit_1_0_la_LDFLAGS = \
 libwebkit_1_0_la_LIBADD = \
        -lpthread \
        libJavaScriptCore.la \
-       libWebCore.la \
        libWebCoreJS.la \
        $(webcore_ldflags) \
        $(CAIRO_LIBS) \
@@ -277,16 +272,8 @@ global_cppflags += \
 endif
 
 if USE_GLIB_UNICODE
-# https://bugs.webkit.org/show_bug.cgi?id=15914
-# In patch 1/4 we are compiling a hybrid version of GLib WTF Unicode
-# functionality mixed with ICU-based text codecs and TextBreakIterator.
-# For the transition, introducing an interim HYBRID macro.
-# This macro is required for compiling WTF with GLib Unicode backend,
-# but at the same time keeping ICU dependency for codecs and break iterator.
-# It will be removed with patch 3/4 of the above bug.
 global_cppflags += \
-       -DWTF_USE_GLIB_UNICODE=1 \
-       -DWTF_USE_GLIB_ICU_UNICODE_HYBRID=1
+       -DWTF_USE_GLIB_UNICODE=1
 endif
 
 if !ENABLE_FAST_MALLOC
@@ -333,6 +320,7 @@ webkitgtk_h_api += \
        $(srcdir)/WebKit/gtk/webkit/webkitwebinspector.h \
        $(srcdir)/WebKit/gtk/webkit/webkitwebnavigationaction.h \
        $(srcdir)/WebKit/gtk/webkit/webkitwebpolicydecision.h \
+       $(srcdir)/WebKit/gtk/webkit/webkitgeolocationpolicydecision.h \
        $(srcdir)/WebKit/gtk/webkit/webkitwebresource.h \
        $(srcdir)/WebKit/gtk/webkit/webkitwebsettings.h \
        $(srcdir)/WebKit/gtk/webkit/webkitwebwindowfeatures.h \
@@ -381,6 +369,7 @@ webkitgtk_sources += \
        WebKit/gtk/webkit/webkitwebinspector.cpp \
        WebKit/gtk/webkit/webkitwebnavigationaction.cpp \
        WebKit/gtk/webkit/webkitwebpolicydecision.cpp \
+       WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp \
        WebKit/gtk/webkit/webkitwebresource.cpp \
        WebKit/gtk/webkit/webkitwebdatabase.cpp \
        WebKit/gtk/webkit/webkitsecurityorigin.cpp \
@@ -413,29 +402,16 @@ webkitgtk_cleanfiles += \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
 
-# Files that will be distributed
-EXTRA_DIST = \
-       $(srcdir)/gtk-doc.make \
-       WebKit/LICENSE \
-       $(javascriptcore_dist) \
-       $(webcore_dist) \
-       $(srcdir)/autotools/symbols.filter \
-       $(srcdir)/WebKit/gtk/ChangeLog \
-       $(srcdir)/WebKit/gtk/NEWS \
-       $(srcdir)/WebKit/gtk/webkitmarshal.list \
-       $(srcdir)/WebKit/gtk/docs/GNUmakefile.* \
-       $(srcdir)/WebKit/gtk/docs/webkitenvironment.xml \
-       $(srcdir)/WebKit/gtk/docs/webkitgtk-docs.sgml \
-       $(srcdir)/WebKit/gtk/docs/webkitgtk-sections.txt \
-       $(srcdir)/WebKit/gtk/docs/version.xml.in \
-       $(srcdir)/WebKit/gtk/po/* \
-       $(srcdir)/WebKit/gtk/resources/*
-
 if ENABLE_INTROSPECTION
-JSCORE_GIRSOURCES = $(srcdir)/WebKit/gtk/JSCore-1.0.gir # JSCore-1.0.gir is handwritten
-WEBKIT_GIRSOURCES = WebKit-1.0.gir
+JSCORE_GIRSOURCES += JSCore-1.0.gir
+WEBKIT_GIRSOURCES += WebKit-1.0.gir
+
+# JSCore-1.0.gir is handwritten - this is a hack to make the typelib
+# generation work during make dist
+JSCore-1.0.gir: $(srcdir)/WebKit/gtk/JSCore-1.0.gir
+       cp $(srcdir)/WebKit/gtk/JSCore-1.0.gir $(builddir)/
 
-$(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER)
+$(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER) libwebkit-1.0.la
        $(AM_V_GEN)$(G_IR_SCANNER) -v --namespace WebKit --nsversion=1.0 \
             --include=GObject-2.0 \
             --include=Gtk-2.0 \
@@ -445,7 +421,9 @@ $(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER)
             --libtool="$(LIBTOOL)" \
             --pkg gobject-2.0 \
             --pkg gtk+-2.0 \
+            --pkg libsoup-2.4 \
             --output $@ \
+            --add-include-path $(top_srcdir)/WebKit/gtk \
             -I$(top_srcdir)/WebKit/gtk \
             -I$(top_builddir)/WebKit/gtk \
             -I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \
@@ -455,17 +433,18 @@ $(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER)
 girdir = $(GIRDIR)
 gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES)
 
-typelibsdir = $(GIRTYPELIBDIR)
-typelibs_DATA = $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)
+typelibsdir += $(GIRTYPELIBDIR)
+typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(G_IR_COMPILER)
-       $(AM_V_GEN)$(G_IR_COMPILER) $< -o $@
+       $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(top_srcdir)/WebKit/gtk $< -o $@
 
-EXTRA_DIST += $(JSCORE_GIRSOURCES)
-CLEANFILES += $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
+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
 
@@ -528,6 +507,26 @@ DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile
        && cp xgen-gtc $@ \
        && rm -f xgen-gtc
 
+# Files that will be distributed
+EXTRA_DIST += \
+       $(srcdir)/gtk-doc.make \
+       WebKit/LICENSE \
+       $(javascriptcore_dist) \
+       $(webcore_dist) \
+       $(srcdir)/autotools/symbols.filter \
+       $(srcdir)/WebKit/gtk/ChangeLog \
+       $(srcdir)/WebKit/gtk/NEWS \
+       $(srcdir)/WebKit/gtk/webkitmarshal.list \
+       $(srcdir)/WebKit/gtk/docs/GNUmakefile.* \
+       $(srcdir)/WebKit/gtk/docs/webkitenvironment.xml \
+       $(srcdir)/WebKit/gtk/docs/webkitgtk-docs.sgml \
+       $(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/tests/resources/* \
+       $(srcdir)/WebKit/gtk/tests/test_utils.h
+
 # extra resource files
 resourcesdir = ${datadir}/webkit-1.0/resources
 dist_resources_DATA = \
@@ -566,6 +565,7 @@ webkit_tests_ldflags = \
 
 TEST_PROGS += Programs/unittests/testhttpbackend \
        Programs/unittests/testloading \
+       Programs/unittests/testmimehandling \
        Programs/unittests/testnetworkrequest \
        Programs/unittests/testnetworkresponse \
        Programs/unittests/testwebframe \
@@ -578,6 +578,7 @@ TEST_PROGS += Programs/unittests/testhttpbackend \
        Programs/unittests/testwebsettings \
        Programs/unittests/testwebresource \
        Programs/unittests/testwebdatasource \
+       Programs/unittests/testwebview \
        Programs/unittests/testkeyevents
 
 # Add additional tests here
@@ -591,6 +592,11 @@ Programs_unittests_testloading_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testloading_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testloading_LDFLAGS = $(webkit_tests_ldflags)
 
+Programs_unittests_testmimehandling_SOURCES = WebKit/gtk/tests/testmimehandling.c WebKit/gtk/tests/test_utils.c
+Programs_unittests_testmimehandling_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testmimehandling_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testmimehandling_LDFLAGS = $(webkit_tests_ldflags)
+
 Programs_unittests_testnetworkrequest_SOURCES = WebKit/gtk/tests/testnetworkrequest.c
 Programs_unittests_testnetworkrequest_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testnetworkrequest_LDADD = $(webkit_tests_ldadd)
@@ -644,6 +650,11 @@ Programs_unittests_testwebdatasource_SOURCES = WebKit/gtk/tests/testwebdatasourc
 Programs_unittests_testwebdatasource_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testwebdatasource_LDADD = $(webkit_tests_ldadd)
 
+Programs_unittests_testwebview_SOURCES = WebKit/gtk/tests/testwebview.c WebKit/gtk/tests/test_utils.c
+Programs_unittests_testwebview_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testwebview_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testwebview_LDFLAGS = $(webkit_tests_ldflags)
+
 Programs_unittests_testhittestresult_SOURCES = WebKit/gtk/tests/testhittestresult.c
 Programs_unittests_testhittestresult_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testhittestresult_LDADD = $(webkit_tests_ldadd)
Clone of mainline OpenEmbedded repository