diff options
Diffstat (limited to 'recipes/webkit/webkit-gtk/GNUmakefile.am')
| -rw-r--r-- | recipes/webkit/webkit-gtk/GNUmakefile.am | 58 |
1 files changed, 33 insertions, 25 deletions
diff --git a/recipes/webkit/webkit-gtk/GNUmakefile.am b/recipes/webkit/webkit-gtk/GNUmakefile.am index c74e1fa428..9e97e67387 100644 --- a/recipes/webkit/webkit-gtk/GNUmakefile.am +++ b/recipes/webkit/webkit-gtk/GNUmakefile.am @@ -174,7 +174,6 @@ libWebCore_la_CFLAGS = \ $(PANGO_CFLAGS) \ $(GTK_CFLAGS) \ $(XT_CFLAGS) \ - $(LIBCURL_CFLAGS) \ $(LIBSOUP_CFLAGS) \ $(FREETYPE_CFLAGS) \ $(SQLITE3_CFLAGS) \ @@ -201,7 +200,6 @@ libWebCore_la_LIBADD = \ $(PANGO_LIBS) \ $(GTK_LIBS) \ $(XT_LIBS) \ - $(LIBCURL_LIBS) \ $(LIBSOUP_LIBS) \ $(FREETYPE_LIBS) \ $(UNICODE_LIBS) \ @@ -237,7 +235,8 @@ libwebkit_1_0_la_CXXFLAGS = \ $(libWebCore_la_CXXFLAGS) libwebkit_1_0_la_CFLAGS = \ - $(libWebCore_la_CFLAGS) + $(libWebCore_la_CFLAGS) \ + $(GNOMEKEYRING_CFLAGS) libwebkit_1_0_la_CPPFLAGS = \ $(libWebCore_la_CPPFLAGS) \ @@ -250,7 +249,8 @@ libwebkit_1_0_la_LDFLAGS = \ $(no_undefined) libwebkit_1_0_la_LIBADD = \ - libWebCore.la + libWebCore.la \ + $(GNOMEKEYRING_LIBS) # # Extra checks and flags @@ -304,7 +304,9 @@ endif webkitgtk_h_api += \ WebKit/gtk/webkit/webkit.h \ WebKit/gtk/webkit/webkitdefines.h \ + WebKit/gtk/webkit/webkitdownload.h \ WebKit/gtk/webkit/webkitnetworkrequest.h \ + WebKit/gtk/webkit/webkitsoupauthdialog.h \ WebKit/gtk/webkit/webkitversion.h \ WebKit/gtk/webkit/webkitwebbackforwardlist.h \ WebKit/gtk/webkit/webkitwebframe.h \ @@ -340,6 +342,7 @@ webkitgtk_sources += \ WebKit/gtk/webkit/webkitnetworkrequest.cpp \ WebKit/gtk/webkit/webkitprivate.cpp \ WebKit/gtk/webkit/webkitprivate.h \ + WebKit/gtk/webkit/webkitsoupauthdialog.c \ WebKit/gtk/webkit/webkitversion.cpp \ WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \ WebKit/gtk/webkit/webkitwebframe.cpp \ @@ -348,6 +351,7 @@ 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 @@ -373,18 +377,7 @@ stamp_files := \ stamp-webkitenumtypes.h WEBKIT_MARSHAL = $(GENSOURCES)/webkitmarshal -WEBKIT_MARSHAL_LIST = $(WEBKIT_MARSHAL).list - -$(WEBKIT_MARSHAL_LIST): $(webkitgtk_sources) GNUmakefile.am - ( cd $(top_srcdir) && \ - sed -n -e 's/.*webkit_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \ - $(webkitgtk_sources) ) \ - | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp - if cmp -s $@.tmp $@; then \ - rm $@.tmp; \ - else \ - mv $@.tmp $@; \ - fi +WEBKIT_MARSHAL_LIST = $(top_srcdir)/WebKit/gtk/webkitmarshal.list $(WEBKIT_MARSHAL).cpp: stamp-webkitmarshal.cpp @true @@ -455,10 +448,13 @@ EXTRA_DIST = \ WebKit/LICENSE \ $(javascriptcore_dist) \ $(webcore_dist) \ - symbols.filter + $(srcdir)/autotools/symbols.filter \ + $(srcdir)/WebKit/gtk/ChangeLog \ + $(srcdir)/WebKit/gtk/NEWS \ + $(srcdir)/WebKit/gtk/webkitmarshal.list # Files that will be cleaned -MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) +MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool CLEANFILES := $(stamp_files) $(BUILT_SOURCES) @@ -483,11 +479,13 @@ Programs_UnitTests_CFLAGS = \ -O2 \ $(global_cflags) \ $(GLIB_CFLAGS) \ - $(GTK_CFLAGS) + $(GTK_CFLAGS) \ + $(LIBSOUP_CFLAGS) Programs_UnitTests_LDADD = \ libwebkit-1.0.la \ - $(GTK_LIBS) + $(GTK_LIBS) \ + $(GLIB_LIBS) # Autogenerated sources BUILT_SOURCES := \ @@ -504,11 +502,16 @@ CLEANFILES += \ MAINTAINERCLEANFILES += \ $(srcdir)/aconfig.h.in \ - configure \ - config.* \ - GNUmakefile.in \ - INSTALL \ - README + $(srcdir)/autotools/config.* \ + $(srcdir)/autotools/compile \ + $(srcdir)/autotools/depcomp \ + $(srcdir)/autotools/install-sh \ + $(srcdir)/autotools/missing \ + $(srcdir)/configure \ + $(srcdir)/GNUmakefile.in \ + $(srcdir)/INSTALL \ + $(srcdir)/README \ + $(top_builddir)/config.* # Older automake versions (1.7) place Plo files in a different place so we need # to create the output directory manually. @@ -517,4 +520,9 @@ all-local: # remove built sources and program directories clean-local: + -rm -rf $(GENPROGRAMS) + +maintainer-clean-local: distclean-local + +distclean-local: -rm -rf $(GENSOURCES) $(GENPROGRAMS) |