diff options
Diffstat (limited to 'recipes/webkit/webkit-gtk/GNUmakefile.am')
| -rw-r--r-- | recipes/webkit/webkit-gtk/GNUmakefile.am | 78 |
1 files changed, 53 insertions, 25 deletions
diff --git a/recipes/webkit/webkit-gtk/GNUmakefile.am b/recipes/webkit/webkit-gtk/GNUmakefile.am index 89260ad3a9..3a0e398aa4 100644 --- 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 @@ -74,6 +78,11 @@ global_cflags := global_cxxflags := corekit_cflags := corekit_cppflags := +JSCORE_GIRSOURCES := +WEBKIT_GIRSOURCES := +typelibsdir := +typelibs_DATA := +EXTRA_DIST := BUILT_SOURCES := CLEANFILES := DISTCLEANFILES := @@ -152,6 +161,7 @@ javascriptcore_cppflags += \ -I$(srcdir)/JavaScriptCore/ForwardingHeaders \ -I$(srcdir)/JavaScriptCore/parser \ -I$(srcdir)/JavaScriptCore/wtf \ + -I$(srcdir)/JavaScriptCore/wtf/gtk \ -I$(top_builddir)/DerivedSources nodist_EXTRA_libJavaScriptCore_la_SOURCES = \ @@ -413,29 +423,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 \ @@ -446,6 +443,7 @@ $(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER) --pkg gobject-2.0 \ --pkg gtk+-2.0 \ --output $@ \ + --add-include-path $(top_srcdir)/WebKit/gtk \ -I$(top_srcdir)/WebKit/gtk \ -I$(top_builddir)/WebKit/gtk \ -I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \ @@ -455,14 +453,14 @@ $(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 @@ -528,6 +526,24 @@ 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/* + # extra resource files resourcesdir = ${datadir}/webkit-1.0/resources dist_resources_DATA = \ @@ -566,6 +582,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 +595,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 +609,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 +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 +667,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 +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) |