srcdir = @srcdir@
VPATH = @srcdir@
+DISTCHECK_CONFIGURE_FLAGS = \
+ --enable-introspection \
+ --enable-gtk-doc
+
# Directory for autogenerated sources
GENSOURCES := $(top_builddir)/DerivedSources
GENPROGRAMS := $(top_builddir)/Programs
bin_PROGRAMS :=
noinst_PROGRAMS :=
noinst_HEADERS :=
+noinst_LTLIBRARIES :=
lib_LIBRARIES :=
IDL_BINDINGS :=
TEST_PROGS :=
global_cxxflags :=
corekit_cflags :=
corekit_cppflags :=
+JSCORE_GIRSOURCES :=
+WEBKIT_GIRSOURCES :=
+typelibsdir :=
+typelibs_DATA :=
+EXTRA_DIST :=
+BUILT_SOURCES :=
+CLEANFILES :=
+DISTCLEANFILES :=
+MAINTAINERCLEANFILES :=
# CFLAGS/CXXFLAGS used by WebCore and WebKit
#
# 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
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 = \
$(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
WebKit/gtk/webkit/webkitenumtypes.h
libwebkit_1_0_la_SOURCES = \
+ $(webcore_sources) \
+ $(webcoregtk_sources) \
$(webkitgtk_sources)
libwebkit_1_0_la_CXXFLAGS = \
libwebkit_1_0_la_LIBADD = \
-lpthread \
libJavaScriptCore.la \
- libWebCore.la \
libWebCoreJS.la \
$(webcore_ldflags) \
$(CAIRO_LIBS) \
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
$(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 \
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 \
-I$(top_builddir)/WebKit/gtk/webkit
webkitgtk_cleanfiles += \
+ $(top_builddir)/stamp-webkitmarshal.cpp \
+ $(top_builddir)/stamp-webkitmarshal.h \
+ $(top_builddir)/stamp-webkitenumtypes.cpp \
+ $(top_builddir)/stamp-webkitenumtypes.h \
+ $(top_builddir)/Programs/GtkLauncher \
$(top_builddir)/WebKit/gtk/docs/version.xml \
$(top_builddir)/WebKit/gtk/docs/GNUmakefile \
- $(top_builddir)/Programs/GtkLauncher \
$(top_builddir)/WebKit/gtk/webkit-1.0.pc \
$(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h \
$(top_builddir)/WebKit/gtk/webkit/webkitversion.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
-stamp_files := \
- stamp-webkitmarshal.cpp \
- stamp-webkitmarshal.h \
- stamp-webkitenumtypes.cpp \
- stamp-webkitenumtypes.h
+if ENABLE_INTROSPECTION
+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) libwebkit-1.0.la
+ $(AM_V_GEN)$(G_IR_SCANNER) -v --namespace WebKit --nsversion=1.0 \
+ --include=GObject-2.0 \
+ --include=Gtk-2.0 \
+ --include=JSCore-1.0 \
+ --include=Soup-2.4 \
+ --library=webkit-1.0 \
+ --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 \
+ -I$(top_srcdir) \
+ $(webkitgtk_h_api)
+
+girdir = $(GIRDIR)
+gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES)
+
+typelibsdir += $(GIRTYPELIBDIR)
+typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)
+
+%.typelib: %.gir $(G_IR_COMPILER)
+ $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(top_srcdir)/WebKit/gtk $< -o $@
+
+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
&& rm -f xgen-gtc
# Files that will be distributed
-EXTRA_DIST = \
+EXTRA_DIST += \
$(srcdir)/gtk-doc.make \
WebKit/LICENSE \
$(javascriptcore_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/* \
+ $(srcdir)/WebKit/gtk/tests/test_utils.h
# extra resource files
resourcesdir = ${datadir}/webkit-1.0/resources
# END WEBKIT GTK+
-# Files that will be cleaned
-MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool
-DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool
-CLEANFILES := $(stamp_files) $(BUILT_SOURCES)
-
# Include module makefiles
include JavaScriptCore/GNUmakefile.am
include WebCore/GNUmakefile.am
TEST_PROGS += Programs/unittests/testhttpbackend \
Programs/unittests/testloading \
+ Programs/unittests/testmimehandling \
Programs/unittests/testnetworkrequest \
Programs/unittests/testnetworkresponse \
Programs/unittests/testwebframe \
Programs/unittests/testhittestresult \
Programs/unittests/testwebsettings \
Programs/unittests/testwebresource \
- Programs/unittests/testwebdatasource
+ Programs/unittests/testwebdatasource \
+ Programs/unittests/testwebview \
+ Programs/unittests/testkeyevents
# Add additional tests here
Programs_unittests_testhttpbackend_SOURCES = WebKit/gtk/tests/testhttpbackend.c
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)
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)
+Programs_unittests_testkeyevents_SOURCES = WebKit/gtk/tests/testkeyevents.c
+Programs_unittests_testkeyevents_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testkeyevents_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testkeyevents_LDFLAGS = $(webkit_tests_ldflags)
+
# Autogenerated sources
-BUILT_SOURCES := \
+BUILT_SOURCES += \
$(javascriptcore_built_sources) \
$(javascriptcore_built_nosources) \
$(webcore_built_sources) \
$(webkitgtk_built_nosources)
# Project-wide clean rules
+# Files that will be cleaned
CLEANFILES += \
+ $(BUILT_SOURCES) \
$(webkitgtk_cleanfiles)
+DISTCLEANFILES += \
+ $(CLEANFILES) \
+ $(builddir)/doltcompile \
+ $(builddir)/doltlibtool
+
MAINTAINERCLEANFILES += \
+ $(CLEANFILES) \
+ $(builddir)/doltcompile \
+ $(builddir)/doltlibtool \
$(srcdir)/aconfig.h.in \
$(srcdir)/autotools/config.* \
$(srcdir)/autotools/compile \