aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/webkit/webkit-gtk/GNUmakefile.am
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-05-09 11:55:33 +0200
committerKoen Kooi <koen@openembedded.org>2009-05-09 11:55:33 +0200
commit585a4edbc95bbb094225de5581c6f9d5e4db2e4f (patch)
treeacd096986137cb00cec7b23715af7b2d83edd099 /recipes/webkit/webkit-gtk/GNUmakefile.am
parente9e1a54b27861ff3ea42700a260dc75f0c3916cb (diff)
downloadopenembedded-585a4edbc95bbb094225de5581c6f9d5e4db2e4f.tar.gz
webkit-gtk: bump SRCREV, fix gtk-doc, fix packaging
* runtime tested on beagleboard with midori and epiphany
Diffstat (limited to 'recipes/webkit/webkit-gtk/GNUmakefile.am')
-rw-r--r--recipes/webkit/webkit-gtk/GNUmakefile.am56
1 files changed, 45 insertions, 11 deletions
diff --git a/recipes/webkit/webkit-gtk/GNUmakefile.am b/recipes/webkit/webkit-gtk/GNUmakefile.am
index 13cf5eefa1..957078fb12 100644
--- a/recipes/webkit/webkit-gtk/GNUmakefile.am
+++ b/recipes/webkit/webkit-gtk/GNUmakefile.am
@@ -49,6 +49,11 @@ IDL_BINDINGS :=
TEST_PROGS :=
+# Gettext stuff
+POFILES :=
+
+MOFILES :=
+
# Global flags to CPP
global_cppflags :=
@@ -183,6 +188,7 @@ libWebCore_la_CFLAGS = \
$(LIBXSLT_CFLAGS) \
$(COVERAGE_CFLAGS) \
$(HILDON_CFLAGS) \
+ $(ENCHANT_CFLAGS) \
$(GEOCLUE_CFLAGS)
libWebCore_la_CPPFLAGS = \
@@ -252,6 +258,7 @@ libwebkit_1_0_la_LDFLAGS = \
libwebkit_1_0_la_LIBADD = \
libWebCore.la \
+ $(ENCHANT_LIBS) \
$(GNOMEKEYRING_LIBS)
#
@@ -259,7 +266,8 @@ libwebkit_1_0_la_LIBADD = \
global_cppflags += \
-DBUILDING_CAIRO__=1 \
-DBUILDING_GTK__=1 \
- -DWTF_CHANGES
+ -DWTF_CHANGES \
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
if !ENABLE_FAST_MALLOC
global_cppflags += \
@@ -307,6 +315,7 @@ webkitgtk_h_api += \
WebKit/gtk/webkit/webkit.h \
WebKit/gtk/webkit/webkitdefines.h \
WebKit/gtk/webkit/webkitdownload.h \
+ WebKit/gtk/webkit/webkiterror.h \
WebKit/gtk/webkit/webkitnetworkrequest.h \
WebKit/gtk/webkit/webkitsoupauthdialog.h \
WebKit/gtk/webkit/webkitversion.h \
@@ -341,6 +350,8 @@ webkitgtk_sources += \
WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \
WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp \
WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h \
+ WebKit/gtk/webkit/webkitdownload.cpp \
+ WebKit/gtk/webkit/webkiterror.cpp \
WebKit/gtk/webkit/webkitnetworkrequest.cpp \
WebKit/gtk/webkit/webkitprivate.cpp \
WebKit/gtk/webkit/webkitprivate.h \
@@ -353,7 +364,6 @@ webkitgtk_sources += \
WebKit/gtk/webkit/webkitwebnavigationaction.cpp \
WebKit/gtk/webkit/webkitwebpolicydecision.cpp \
WebKit/gtk/webkit/webkitwebsettings.cpp \
- WebKit/gtk/webkit/webkitdownload.cpp \
WebKit/gtk/webkit/webkitwebview.cpp \
WebKit/gtk/webkit/webkitwebwindowfeatures.cpp
@@ -443,27 +453,41 @@ DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile
&& cp xgen-gtc $@ \
&& rm -f xgen-gtc
-# END WEBKIT GTK+
-#
# 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/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 = \
+ $(shell ls $(srcdir)/WebKit/gtk/resources/*.html)
+
+# 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)
+MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool WebKit/gtk/docs/version.xml WebKit/gtk/docs/GNUmakefile
+DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool WebKit/gtk/docs/version.xml WebKit/gtk/docs/GNUmakefile
+CLEANFILES := $(stamp_files) $(BUILT_SOURCES) WebKit/gtk/docs/GNUmakefile
# Include module makefiles
include JavaScriptCore/GNUmakefile.am
include WebCore/GNUmakefile.am
include WebKitTools/GNUmakefile.am
+include WebKit/gtk/po/GNUmakefile.am
# Build unit tests
noinst_PROGRAMS += $(TEST_PROGS)
@@ -487,7 +511,8 @@ webkit_tests_ldadd = \
TEST_PROGS += Programs/unittests/testwebframe \
Programs/unittests/testwebbackforwardlist \
- Programs/unittests/testwebhistoryitem
+ Programs/unittests/testwebhistoryitem \
+ Programs/unittests/testdownload
# Add additional tests here
Programs_unittests_testwebframe_SOURCES = WebKit/gtk/tests/testwebframe.c
@@ -502,6 +527,9 @@ Programs_unittests_testwebhistoryitem_SOURCES = WebKit/gtk/tests/testwebhistoryi
Programs_unittests_testwebhistoryitem_CFLAGS = $(webkit_tests_cflags)
Programs_unittests_testwebhistoryitem_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testdownload_SOURCES = WebKit/gtk/tests/testdownload.c
+Programs_unittests_testdownload_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testdownload_LDADD = $(webkit_tests_ldadd)
# Autogenerated sources
BUILT_SOURCES := \
@@ -531,8 +559,8 @@ MAINTAINERCLEANFILES += \
# Older automake versions (1.7) place Plo files in a different place so we need
# to create the output directory manually.
-all-local:
- mkdir -p $(top_builddir)/$(DEPDIR)/DerivedSources
+all-local: stamp-po
+ $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
# remove built sources and program directories
clean-local:
@@ -542,3 +570,9 @@ maintainer-clean-local: distclean-local
distclean-local:
-rm -rf $(GENSOURCES) $(GENPROGRAMS)
+
+install-data-local: po-install-data-local
+
+installdirs-data-local: po-installdirs-data-local
+
+uninstall-local: po-uninstall-local