Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

10 files changed, 0 insertions, 1447 deletions

diff --git a/packages/webkit/webkit-gtk/GNUmakefile.am b/packages/webkit/webkit-gtk/GNUmakefile.am
deleted file mode 100644
index c74e1fa428..0000000000
--- a/packages/webkit/webkit-gtk/GNUmakefile.am
+++ /dev/null
@@ -1,520 +0,0 @@
-# Top-level Makefile rule for automake
-#
-# Variable conventions:
-#
-# _h_api            = API headers that will be installed and included in the distribution
-# _cppflags         = flags that will be passed to the C/CXX Preprocessor
-# _sources          = sources that will be compiled and included in the distribution
-# _built_sources    = files that will be autogenerated by the build system and
-#                     will be part of the _SOURCES primary
-# _built_nosources  = files that are autogenerated but are not part of the
-#                     _SOURCES primary
-# _cleanfiles       = files that will be removed by the clean target
-#
-# Sources, headers, flags, etc... should be added to the respective variables
-# with the above suffix, e.g, webcore-specific sources should go to
-# webcore_sources, gtk port API and WebCoreSupport parts to webkitgtk_sources,
-# etc... The only exceptions are the global variables. See Global Variables
-# below.
-#
-# Global Variables
-#
-# global_cppflags   = CPPFLAGS that apply to JSC, WebCore, and to any
-#                     specific port
-# global_cflags     = CFLAGS that apply to JSC, WebCore, and to
-#                     any specific port
-# global_cxxflags   = CXXFLAGS that apply to JSC, WebCore, and to any
-#                     specific port
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-# Directory for autogenerated sources
-GENSOURCES := $(top_builddir)/DerivedSources
-GENPROGRAMS := $(top_builddir)/Programs
-
-# Script for creating hash tables
-CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/create_hash_table
-
-# Libraries and support components
-bin_PROGRAMS :=
-
-noinst_PROGRAMS :=
-
-noinst_HEADERS :=
-
-lib_LIBRARIES :=
-
-IDL_BINDINGS :=
-
-# Global flags to CPP
-global_cppflags :=
-
-global_cppflags += \
-	-DWTF_USE_ICU_UNICODE=1
-
-# Default compiler flags
-global_cflags := \
-	-Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \
-	-Wformat -Wformat-security -Wno-format-y2k -Wundef \
-	-Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \
-	-Wno-unused-parameter -Wno-parentheses \
-	-fno-exceptions
-
-global_cxxflags := \
-	$(SYMBOL_VISIBILITY_INLINES) \
-	-fno-rtti
-
-if !ENABLE_DEBUG
-global_cflags += \
-	$(SYMBOL_VISIBILITY)
-endif
-
-# -no-undefined required for building DLLs on Windows
-# It breaks the build on other platforms, so we use it conditionally
-if OS_WIN32
-no_undefined = -no-undefined
-endif
-
-if OS_GNU
-version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter
-endif
-
-# Shared libraries
-lib_LTLIBRARIES = \
-	libwebkit-1.0.la
-
-# Convenience libraries
-noinst_LTLIBRARIES = \
-	libJavaScriptCore.la \
-	libWebCore.la
-
-#
-# JavaScriptCore
-javascriptcore_h_api :=
-javascriptcore_cppflags:=
-javascriptcore_sources :=
-javascriptcore_built_sources :=
-javascriptcore_built_nosources :=
-javascriptcore_dist :=
-
-javascriptcore_cppflags += \
-	-I$(srcdir)/JavaScriptCore \
-	-I$(srcdir)/JavaScriptCore/ForwardingHeaders \
-	-I$(srcdir)/JavaScriptCore/parser \
-	-I$(srcdir)/JavaScriptCore/wtf \
-	-I$(top_builddir)/DerivedSources
-
-# The variables above are already included below so no need to touch
-# these variables unless you really have to
-nodist_EXTRA_libJavaScriptCore_la_SOURCES = \
-	$(javascriptcore_built_nosources)
-
-nodist_libJavaScriptCore_la_SOURCES = \
-	$(javascriptcore_built_sources)
-
-libJavaScriptCore_ladir = $(prefix)/include/webkit-1.0/JavaScriptCore
-libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api)
-
-libJavaScriptCore_la_SOURCES = \
-	$(javascriptcore_sources)
-
-libJavaScriptCore_la_LIBADD = \
-	$(UNICODE_LIBS) \
-	$(GLIB_LIBS) \
-	-lpthread
-
-libJavaScriptCore_la_CXXFLAGS = \
-	$(global_cxxflags) \
-	$(libJavaScriptCore_la_CFLAGS)
-
-libJavaScriptCore_la_CFLAGS = \
-	-fstrict-aliasing \
-	-O3 \
-	$(global_cflags) \
-	$(GLIB_CFLAGS) \
-	$(UNICODE_CFLAGS)
-
-libJavaScriptCore_la_CPPFLAGS = \
-	$(global_cppflags) \
-	$(javascriptcore_cppflags)
-
-#
-# WebCore
-webcore_cppflags :=
-webcore_sources :=
-webcore_libadd :=
-webcore_built_sources :=
-webcore_built_nosources :=
-webcore_dist :=
-webcoregtk_cppflags :=
-webcoregtk_sources :=
-
-nodist_EXTRA_libWebCore_la_SOURCES = \
-	$(webcore_built_nosources)
-
-nodist_libWebCore_la_SOURCES = \
-	$(webcore_built_sources)
-
-libWebCore_la_SOURCES = \
-	$(webcore_sources) \
-	$(webcoregtk_sources)
-
-libWebCore_la_CXXFLAGS = \
-	$(global_cxxflags) \
-	$(libWebCore_la_CFLAGS)
-
-libWebCore_la_CFLAGS = \
-	-fno-strict-aliasing \
-	$(global_cflags) \
-	$(GLIB_CFLAGS) \
-	$(UNICODE_CFLAGS) \
-	$(LIBXML_CFLAGS) \
-	$(CAIRO_CFLAGS) \
-	$(PANGO_CFLAGS) \
-	$(GTK_CFLAGS) \
-	$(XT_CFLAGS) \
-	$(LIBCURL_CFLAGS) \
-	$(LIBSOUP_CFLAGS) \
-	$(FREETYPE_CFLAGS) \
-	$(SQLITE3_CFLAGS) \
-	$(GSTREAMER_CFLAGS) \
-	$(LIBXSLT_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	$(HILDON_CFLAGS) \
-	$(GEOCLUE_CFLAGS)
-
-libWebCore_la_CPPFLAGS = \
-	$(global_cppflags) \
-	$(webcore_cppflags) \
-	$(javascriptcore_cppflags) \
-	$(webcoregtk_cppflags) \
-	$(HILDON_CPPFLAGS)
-
-libWebCore_la_LIBADD = \
-	libJavaScriptCore.la \
-	libWebCoreJS.la \
-	$(webcore_libadd) \
-	$(GLIB_LIBS) \
-	$(LIBXML_LIBS) \
-	$(CAIRO_LIBS) \
-	$(PANGO_LIBS) \
-	$(GTK_LIBS) \
-	$(XT_LIBS) \
-	$(LIBCURL_LIBS) \
-	$(LIBSOUP_LIBS) \
-	$(FREETYPE_LIBS) \
-	$(UNICODE_LIBS) \
-	$(SQLITE3_LIBS) \
-	$(GSTREAMER_LIBS) \
-	$(LIBXSLT_LIBS) \
-	$(HILDON_LIBS) \
-	$(JPEG_LIBS) \
-	$(PNG_LIBS) \
-	$(GEOCLUE_LIBS) \
-	-lpthread
-
-# WebKit
-webkitgtk_h_api :=
-webkitgtk_sources :=
-webkitgtk_cppflags :=
-webkitgtk_built_sources :=
-webkitgtk_built_nosources :=
-webkitgtk_cleanfiles :=
-
-nodist_libwebkit_1_0_la_SOURCES = \
-	$(webkitgtk_built_sources)
-
-libwebkit_1_0_ladir = $(prefix)/include/webkit-1.0/webkit
-libwebkit_1_0_la_HEADERS = \
-	$(webkitgtk_h_api) \
-	WebKit/gtk/webkit/webkitenumtypes.h
-
-libwebkit_1_0_la_SOURCES = \
-	$(webkitgtk_sources)
-
-libwebkit_1_0_la_CXXFLAGS = \
-	$(libWebCore_la_CXXFLAGS)
-
-libwebkit_1_0_la_CFLAGS = \
-	$(libWebCore_la_CFLAGS)
-
-libwebkit_1_0_la_CPPFLAGS = \
-	$(libWebCore_la_CPPFLAGS) \
-	$(webkitgtk_cppflags)
-
-libwebkit_1_0_la_LDFLAGS = \
-	$(COVERAGE_LDFLAGS) \
-	-version-info @LIBWEBKITGTK_VERSION@ \
-	$(version_script) \
-	$(no_undefined)
-
-libwebkit_1_0_la_LIBADD = \
-	libWebCore.la
-
-#
-# Extra checks and flags
-global_cppflags += \
-	-DBUILDING_CAIRO__=1 \
-	-DBUILDING_GTK__=1 \
-	-DWTF_CHANGES
-
-if !ENABLE_FAST_MALLOC
-global_cppflags += \
-	-DUSE_SYSTEM_MALLOC
-endif
-
-if TARGET_X11
-global_cppflags += -DXP_UNIX
-endif
-
-if !ENABLE_DEBUG
-global_cppflags += -DNDEBUG
-else
-webcoregtk_cppflags += \
-	-DG_DISABLE_DEPRECATED \
-	-DGDK_PIXBUF_DISABLE_DEPRECATED \
-	-DGDK_DISABLE_DEPRECATED \
-	-DGTK_DISABLE_DEPRECATED \
-	-DPANGO_DISABLE_DEPRECATED
-
-# Might be useful in the future
-#	-DGDK_MULTIHEAD_SAFE \
-#	-DGTK_MULTIHEAD_SAFE
-endif
-
-if !ENABLE_DATABASE
-global_cppflags += -DENABLE_DATABASE=0
-endif
-
-if !ENABLE_ICONDATABASE
-global_cppflags += -DENABLE_ICONDATABASE=0
-endif
-
-if ENABLE_COVERAGE
-global_cppflags += \
-	-DGCC_GENERATE_TEST_COVERAGE_FILES \
-	-DGCC_INSTRUMENT_PROGRAM_FLOW_ARCS
-endif
-
-if ENABLE_VIDEO
-webcore_libadd += -lgstinterfaces-0.10 -lgstvideo-0.10
-endif
-
-webkitgtk_h_api += \
-	WebKit/gtk/webkit/webkit.h \
-	WebKit/gtk/webkit/webkitdefines.h \
-	WebKit/gtk/webkit/webkitnetworkrequest.h \
-	WebKit/gtk/webkit/webkitversion.h \
-	WebKit/gtk/webkit/webkitwebbackforwardlist.h \
-	WebKit/gtk/webkit/webkitwebframe.h \
-	WebKit/gtk/webkit/webkitwebhistoryitem.h \
-	WebKit/gtk/webkit/webkitwebinspector.h \
-	WebKit/gtk/webkit/webkitwebnavigationaction.h \
-	WebKit/gtk/webkit/webkitwebpolicydecision.h \
-	WebKit/gtk/webkit/webkitwebsettings.h \
-	WebKit/gtk/webkit/webkitwebwindowfeatures.h \
-	WebKit/gtk/webkit/webkitwebview.h
-
-webkitgtk_built_sources += \
-	DerivedSources/webkitenumtypes.cpp \
-	DerivedSources/webkitmarshal.cpp \
-	DerivedSources/webkitmarshal.h \
-	WebKit/gtk/webkit/webkitenumtypes.h
-
-webkitgtk_sources += \
-	WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
-	WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
-	WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
-	WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \
-	WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \
-	WebKit/gtk/WebCoreSupport/DragClientGtk.h \
-	WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \
-	WebKit/gtk/WebCoreSupport/EditorClientGtk.h \
-	WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \
-	WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \
-	WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \
-	WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \
-	WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp \
-	WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h \
-	WebKit/gtk/webkit/webkitnetworkrequest.cpp \
-	WebKit/gtk/webkit/webkitprivate.cpp \
-	WebKit/gtk/webkit/webkitprivate.h \
-	WebKit/gtk/webkit/webkitversion.cpp \
-	WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
-	WebKit/gtk/webkit/webkitwebframe.cpp \
-	WebKit/gtk/webkit/webkitwebhistoryitem.cpp \
-	WebKit/gtk/webkit/webkitwebinspector.cpp \
-	WebKit/gtk/webkit/webkitwebnavigationaction.cpp \
-	WebKit/gtk/webkit/webkitwebpolicydecision.cpp \
-	WebKit/gtk/webkit/webkitwebsettings.cpp \
-	WebKit/gtk/webkit/webkitwebview.cpp \
-	WebKit/gtk/webkit/webkitwebwindowfeatures.cpp
-
-webkitgtk_cppflags += \
-	-DBUILDING_WEBKIT \
-	-I$(srcdir)/WebKit/gtk \
-	-I$(srcdir)/WebKit/gtk/WebCoreSupport \
-	-I$(srcdir)/WebKit/gtk/webkit \
-	-I$(top_builddir)/WebKit/gtk/webkit
-
-webkitgtk_cleanfiles += \
-	$(top_builddir)/Programs/GtkLauncher \
-	$(top_builddir)/WebKit/gtk/webkit-1.0.pc \
-	$(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.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
-
-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).cpp: stamp-webkitmarshal.cpp
-	@true
-
-$(WEBKIT_MARSHAL).h: stamp-webkitmarshal.h
-	@true
-
-stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST)
-	echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \
-	$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \
-	echo timestamp > $(@F)
-
-stamp-webkitmarshal.h: $(WEBKIT_MARSHAL_LIST)
-	$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(WEBKIT_MARSHAL).h && \
-	echo timestamp > $(@F)
-
-WebKit/gtk/webkit/webkitenumtypes.h: stamp-webkitenumtypes.h
-	@true
-stamp-webkitenumtypes.h: $(webkitgtk_h_api) GNUmakefile
-	(cd $(srcdir) \
-	&& glib-mkenums \
-			--fhead "#ifndef WEBKIT_ENUM_TYPES_H\n" \
-			--fhead "#define WEBKIT_ENUM_TYPES_H\n\n" \
-			--fhead "#include <glib-object.h>\n\n" \
-			--fhead "#include <webkit/webkitdefines.h>\n\n" \
-			--fhead "G_BEGIN_DECLS\n\n" \
-			--ftail "G_END_DECLS\n\n" \
-			--ftail "#endif\n" \
-			--fprod "#include <@filename@>\n\n" \
-			--eprod "#define WEBKIT_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \
-			--eprod "WEBKIT_API GType\n@enum_name@_get_type(void);\n\n" \
-		$(webkitgtk_h_api) | \
-		sed 's,WebKit/gtk/,,' | \
-		sed 's,web_kit,webkit,' | \
-		sed 's,WEBKIT_TYPE_KIT,WEBKIT_TYPE,' \
-		) > xgen-gth \
-	&& (cmp -s xgen-gth WebKit/gtk/webkit/webkitenumtypes.h || cp xgen-gth WebKit/gtk/webkit/webkitenumtypes.h) \
-	&& rm -f xgen-gth \
-	&& echo timestamp > $(@F)
-
-DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile
-	(cd $(srcdir) \
-	&& glib-mkenums \
-			--fhead "#include <config.h>\n" \
-			--fhead "#include <glib-object.h>\n" \
-			--fhead "#include \"$(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h\"\n\n" \
-			--fhead "extern \"C\" {\n\n" \
-			--fprod "\n/* enumerations from \"@filename@\" */" \
-			--vhead "static const G@Type@Value _@enum_name@_values[] = {" \
-			--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
-			--vtail "    { 0, NULL, NULL }\n};\n\n" \
-			--vtail "GType @enum_name@_get_type(void)\n{\n" \
-			--vtail "    static GType type = 0;\n\n" \
-			--vtail "    if (!type)\n" \
-			--vtail "        type = g_@type@_register_static(\"@EnumName@\", _@enum_name@_values);\n\n" \
-			--vtail "    return type;\n}\n\n" \
-			--ftail "}\n" \
-		$(webkitgtk_h_api) | \
-		sed 's,web_kit,webkit,' \
-		) > xgen-gtc \
-	&& cp xgen-gtc $@ \
-	&& rm -f xgen-gtc
-
-# END WEBKIT GTK+
-#
-# Files that will be distributed
-EXTRA_DIST = \
-	WebKit/LICENSE \
-	$(javascriptcore_dist) \
-	$(webcore_dist) \
-	symbols.filter
-
-# Files that will be cleaned
-MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES)
-DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool
-CLEANFILES := $(stamp_files) $(BUILT_SOURCES)
-
-# Include module makefiles
-include JavaScriptCore/GNUmakefile.am
-include WebCore/GNUmakefile.am
-include WebKitTools/GNUmakefile.am
-
-# Build unit test
-noinst_PROGRAMS += Programs/UnitTests
-Programs_UnitTests_CPPFLAGS = \
-	-I$(srcdir)/WebKit/gtk \
-	-I$(top_builddir)/WebKit/gtk \
-	$(global_cppflags) \
-	$(javascriptcore_cppflags)
-
-Programs_UnitTests_SOURCES = \
-	WebKit/gtk/tests/main.c
-
-Programs_UnitTests_CFLAGS = \
-	-fno-strict-aliasing \
-	-O2 \
-	$(global_cflags) \
-	$(GLIB_CFLAGS) \
-	$(GTK_CFLAGS)
-
-Programs_UnitTests_LDADD = \
-	libwebkit-1.0.la \
-	$(GTK_LIBS)
-
-# Autogenerated sources
-BUILT_SOURCES := \
-	$(javascriptcore_built_sources) \
-	$(javascriptcore_built_nosources) \
-	$(webcore_built_sources) \
-	$(webcore_built_nosources) \
-	$(webkitgtk_built_sources) \
-	$(webkitgtk_built_nosources)
-
-# Project-wide clean rules
-CLEANFILES += \
-	$(webkitgtk_cleanfiles)
-
-MAINTAINERCLEANFILES += \
-	$(srcdir)/aconfig.h.in \
-	configure \
-	config.* \
-	GNUmakefile.in \
-	INSTALL \
-	README
-
-# 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
-
-# remove built sources and program directories
-clean-local:
-	-rm -rf $(GENSOURCES) $(GENPROGRAMS)
diff --git a/packages/webkit/webkit-gtk/Makefile b/packages/webkit/webkit-gtk/Makefile
deleted file mode 100644
index 217a035483..0000000000
--- a/packages/webkit/webkit-gtk/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
-
-all:
-	@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-	if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
-debug d development dev develop:
-	@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-	if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
-release r deployment dep deploy:
-	@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-	if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
-universal u:
-	@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-	if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
-x86_64:
-	@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-	if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
-64:
-	@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-	if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
-64u:
-	@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-	if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
-clean:
-	@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-	if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
diff --git a/packages/webkit/webkit-gtk/Makefile.shared b/packages/webkit/webkit-gtk/Makefile.shared
deleted file mode 100644
index dfad6fb54c..0000000000
--- a/packages/webkit/webkit-gtk/Makefile.shared
+++ /dev/null
@@ -1,30 +0,0 @@
-SCRIPTS_PATH ?= ../WebKitTools/Scripts
-XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
-
-all:
-	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-debug d development dev develop: force
-	$(SCRIPTS_PATH)/set-webkit-configuration --debug
-	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-release r deployment dep deploy: force
-	$(SCRIPTS_PATH)/set-webkit-configuration --release
-	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-universal u: force
-	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-x86_64: force
-	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-64: force
-	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-64u: force
-	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc ppc64 i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-clean:
-	( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-force: ;
diff --git a/packages/webkit/webkit-gtk/WebKit.pri b/packages/webkit/webkit-gtk/WebKit.pri
deleted file mode 100644
index a869906288..0000000000
--- a/packages/webkit/webkit-gtk/WebKit.pri
+++ /dev/null
@@ -1,89 +0,0 @@
-# Include file to make it easy to include WebKit into Qt projects
-
-
-isEmpty(OUTPUT_DIR) {
-    CONFIG(release):OUTPUT_DIR=$$PWD/WebKitBuild/Release
-    CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug
-}
-
-DEFINES += BUILDING_QT__=1
-building-libs {
-    win32-msvc*: INCLUDEPATH += $$PWD/JavaScriptCore/os-win32
-} else {
-    QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
-    LIBS += -lQtWebKit
-    DEPENDPATH += $$PWD/WebKit/qt/Api
-}
-
-DEFINES += USE_SYSTEM_MALLOC
-CONFIG(release) {
-    DEFINES += NDEBUG
-}
-
-BASE_DIR = $$PWD
-INCLUDEPATH += $$PWD/WebKit/qt/Api
-
-#
-# For builds inside Qt we interpret the output rule and the input of each extra compiler manually
-# and add the resulting sources to the SOURCES variable, because the build inside Qt contains already
-# all the generated files. We do not need to generate any extra compiler rules in that case.
-#
-# In addition this function adds a new target called 'generated_files' that allows manually calling
-# all the extra compilers to generate all the necessary files for the build using 'make generated_files'
-#
-defineTest(addExtraCompiler) {
-    CONFIG(QTDIR_build) {
-        outputRule = $$eval($${1}.output)
-
-        input = $$eval($${1}.input)
-        input = $$eval($$input)
-
-        for(file,input) {
-            base = $$basename(file)
-            base ~= s/\..+//
-            newfile=$$replace(outputRule,\\$\\{QMAKE_FILE_BASE\\},$$base)
-            SOURCES += $$newfile
-        }
-
-        export(SOURCES)
-    } else {
-        QMAKE_EXTRA_COMPILERS += $$1
-        generated_files.depends += compiler_$${1}_make_all
-        export(QMAKE_EXTRA_COMPILERS)
-        export(generated_files.depends)
-    }
-    return(true)
-}
-
-defineTest(addExtraCompilerWithHeader) {
-    addExtraCompiler($$1)
-
-    eval(headerFile = $${2})
-    isEmpty(headerFile) {
-        eval($${1}_header.output = $$eval($${1}.output))
-        eval($${1}_header.output ~= s/\.cpp/.h/)
-        eval($${1}_header.output ~= s/\.c/.h/)
-    } else {
-        eval($${1}_header.output = $$headerFile)
-    }
-
-    eval($${1}_header.input = $$eval($${1}.input))
-    eval($${1}_header.commands = @echo -n '')
-    eval($${1}_header.depends = compiler_$${1}_make_all)
-    eval($${1}_header.variable_out = GENERATED_FILES)
-
-    export($${1}_header.output)
-    export($${1}_header.input)
-    export($${1}_header.commands)
-    export($${1}_header.depends)
-    export($${1}_header.variable_out)
-
-    !CONFIG(QTDIR_build): QMAKE_EXTRA_COMPILERS += $${1}_header
-
-    export(QMAKE_EXTRA_COMPILERS)
-    export(generated_files.depends)
-    export(SOURCES)
-
-    return(true)
-}
-
diff --git a/packages/webkit/webkit-gtk/WebKit.pro b/packages/webkit/webkit-gtk/WebKit.pro
deleted file mode 100644
index 035f73aa3f..0000000000
--- a/packages/webkit/webkit-gtk/WebKit.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE = subdirs
-CONFIG += ordered
-
-SUBDIRS += \
-        JavaScriptCore \
-        WebCore \
-        JavaScriptCore/kjs/jsc.pro \
-        WebKit/qt/QtLauncher \
-        WebKit/qt/tests
-
-!win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
-
diff --git a/packages/webkit/webkit-gtk/acinclude.m4 b/packages/webkit/webkit-gtk/acinclude.m4
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/webkit/webkit-gtk/acinclude.m4
+++ /dev/null
diff --git a/packages/webkit/webkit-gtk/autogen.sh b/packages/webkit/webkit-gtk/autogen.sh
deleted file mode 100644
index f87238cf92..0000000000
--- a/packages/webkit/webkit-gtk/autogen.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-
-# Allow invocation from a separate build directory; in that case, we change
-# to the source directory to run the auto*, then change back before running configure
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-LIBTOOLIZE_FLAGS="--force --automake"
-ACLOCAL_FLAGS="-I autotools"
-AUTOMAKE_FLAGS="--foreign --add-missing"
-
-DIE=0
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "You must have autoconf installed to compile $PROJECT."
-    echo "Install the appropriate package for your distribution,"
-    echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
-    DIE=1
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "You must have automake installed to compile $PROJECT."
-    echo "Install the appropriate package for your distribution,"
-    echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
-    DIE=1
-}
-
-LIBTOOLIZE=libtoolize
-($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
-    LIBTOOLIZE=glibtoolize
-    ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
-        echo
-        echo "You must have libtool installed to compile $PROJECT."
-        echo "Install the appropriate package for your distribution,"
-        echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
-        DIE=1
-    }
-}
-
-if test "$DIE" -eq 1; then
-    exit 1
-fi
-
-rm -rf $top_srcdir/autom4te.cache
-
-touch README INSTALL
-
-aclocal $ACLOCAL_FLAGS || exit $?
-$LIBTOOLIZE $LIBTOOLIZE_FLAGS || exit $?
-autoheader || exit $?
-automake $AUTOMAKE_FLAGS || exit $?
-autoconf || exit $?
-
-cd $ORIGDIR || exit 1
-
-$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
diff --git a/packages/webkit/webkit-gtk/configure.ac b/packages/webkit/webkit-gtk/configure.ac
deleted file mode 100644
index c7ed988329..0000000000
--- a/packages/webkit/webkit-gtk/configure.ac
+++ /dev/null
@@ -1,689 +0,0 @@
-AC_PREREQ(2.59)
-
-m4_define([webkit_major_version], [1])
-m4_define([webkit_minor_version], [1])
-m4_define([webkit_micro_version], [0])
-
-AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
-
-AC_CONFIG_MACRO_DIR([autotools])
-AC_CONFIG_AUX_DIR([autotools])
-AC_SUBST(ACLOCAL_AMFLAGS, "-I autotools")
-
-AC_CONFIG_HEADERS([autotoolsconfig.h])
-AC_CANONICAL_SYSTEM
-
-WEBKIT_MAJOR_VERSION=webkit_major_version
-WEBKIT_MINOR_VERSION=webkit_minor_version
-WEBKIT_MICRO_VERSION=webkit_micro_version
-AC_SUBST(WEBKIT_MAJOR_VERSION)
-AC_SUBST(WEBKIT_MINOR_VERSION)
-AC_SUBST(WEBKIT_MICRO_VERSION)
-
-AC_CONFIG_SRCDIR([WebCore/config.h])
-
-dnl # Libtool library version, not to confuse with API version
-dnl # see http://www.gnu.org/software/libtool/manual.html#Versioning
-LIBWEBKITGTK_VERSION=1:0:0
-AC_SUBST([LIBWEBKITGTK_VERSION])
-
-# Recent libtool+automake don't assume you want C++, explicitly enable it
-AC_PROG_CXX
-
-AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
-
-# host checking - inspired by the GTK+ configure.in
-# TODO: move these to webkit.m4?
-AC_MSG_CHECKING([for native Win32])
-case "$host" in
-     *-*-mingw*)
-       os_win32=yes
-       ;;
-     *)
-       os_win32=no
-       ;;
-esac
-AC_MSG_RESULT([$os_win32])
-
-case "$host" in
-     *-*-linux*)
-       os_linux=yes
-       ;;
-     *-*-freebsd*)
-       os_freebsd=yes
-       ;;
-     *-*-darwin*)
-       os_darwin=yes
-       ;;
-esac
-
-case "$host_os" in
-     gnu* | linux* | k*bsd*-gnu)
-       os_gnu=yes
-       ;;
-     *)
-       os_gnu=no
-       ;;
-esac
-
-# initialize webkit options
-WEBKIT_INIT
-AC_DISABLE_STATIC
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-# use dolt to speedup the build
-DOLT
-
-AC_PATH_PROG(FLEX, flex)
-if test -z "$FLEX"; then
-   AC_MSG_ERROR([You need the 'flex' lexer generator to compile WebKit])
-else
-   FLEX_VERSION=`$FLEX --version | sed 's,.*\ \([0-9]*\.[0-9]*\.[0-9]*\)$,\1,'`
-   AX_COMPARE_VERSION([2.5.33],[gt],[$FLEX_VERSION],
-      AC_MSG_WARN([You need at least version 2.5.33 of the 'flex' lexer generator to compile WebKit correctly]))
-fi
-
-AC_PATH_PROG(GPERF, gperf)
-if test -z "$GPERF"; then
-   AC_MSG_ERROR([You need the 'gperf' hash function generator to compile WebKit])
-fi
-
-# pthread (not needed on Windows)
-if test "$os_win32" = "no"; then
-AC_CHECK_HEADERS([pthread.h],
-                 AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exists]),
-                 AC_MSG_ERROR([pthread support is required to build WebKit]))
-fi
-
-# check for libjpeg the way Gtk does it.
-AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
-                   jpeg_ok=yes, jpeg_ok=no
-                   AC_MSG_ERROR([JPEG library (libjpeg) not found]))
-if test "$jpeg_ok" = yes; then
-   AC_MSG_CHECKING([for jpeglib])
-   AC_TRY_CPP(
-[#include <stdio.h>
-#undef PACKAGE
-#undef VERSION
-#undef HAVE_STDLIB_H
-#include <jpeglib.h>],
-         jpeg_ok=yes,
-         jpeg_ok=no)
-   AC_MSG_RESULT($jpeg_ok)
-   if test "$jpeg_ok" = yes; then
-      JPEG_LIBS="-ljpeg"
-      # should we check for progressive JPEG like GTK+ as well?
-   else
-      AC_MSG_ERROR([JPEG library (libjpeg) not found])
-   fi
-fi
-AC_SUBST([JPEG_LIBS])
-
-# Check for libpng the way Gtk+ does it
-AC_MSG_CHECKING(for libpng12)
-if $PKG_CONFIG --exists libpng12 ; then
-    AC_MSG_RESULT(yes)
-    PNG_LIBS=`$PKG_CONFIG --libs libpng12`
-else
-  AC_MSG_RESULT(no)
-  AC_CHECK_LIB(png, png_read_info,
-    [AC_CHECK_HEADER(png.h,
-      png_ok=yes,
-      png_ok=no)],
-    AC_MSG_ERROR([PNG library (libpng) not found]), -lz -lm)
-  if test "$png_ok" = yes; then
-    AC_MSG_CHECKING([for png_structp in png.h])
-    AC_TRY_COMPILE([#include <png.h>],
-      [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;],
-      png_ok=yes,
-      png_ok=no)
-    AC_MSG_RESULT($png_ok)
-    if test "$png_ok" = yes; then
-      PNG_LIBS='-lpng -lz'
-    else
-      AC_MSG_ERROR([PNG library (libpng) not found])
-    fi
-  else
-   AC_MSG_ERROR([PNG library (libpng) not found])
-  fi
-fi
-AC_SUBST([PNG_LIBS])
-
-# determine the GDK/GTK+ target
-AC_MSG_CHECKING([the target windowing system])
-AC_ARG_WITH(target,
-            AC_HELP_STRING([--with-target=@<:@x11/win32/quartz/directfb@:>@],
-                           [Select webkit target [default=x11]]),
-            [],[with_target="x11"])
-
-case "$with_target" in
-     x11|win32|quartz|directfb) ;;
-     *) AC_MSG_ERROR([Invalid target: must be x11, quartz, win32, or directfb.]) ;;
-esac
-
-AC_MSG_RESULT([$with_target])
-
-AC_MSG_CHECKING([for Hildon UI extensions])
-AC_ARG_WITH(hildon,
-            AC_HELP_STRING([--with-hildon],
-                           [Use Hildon UI extensions [default=no]]),
-            [],[with_hildon="no"])
-AC_MSG_RESULT([$with_hildon])
-
-if test "$with_hildon" = "yes"; then
-    HILDON_CPPFLAGS="-DMAEMO_CHANGES"
-    PKG_CHECK_MODULES([HILDON], [hildon-1])
-    AC_SUBST([HILDON_CPPFLAGS])
-    AC_SUBST([HILDON_CFLAGS])
-    AC_SUBST([HILDON_LIBS])
-fi
-
-# determine the http backend
-AC_MSG_CHECKING([the HTTP backend to use])
-AC_ARG_WITH(http_backend,
-            AC_HELP_STRING([--with-http-backend=@<:@curl/soup@:>@],
-                           [Select HTTP backend [default=curl]]),
-            [],[with_http_backend="curl"])
-
-case "$with_http_backend" in
-     curl|soup) ;;
-     *) AC_MSG_ERROR([Invalid HTTP backend: must be curl, soup.]) ;;
-esac
-
-AC_MSG_RESULT([$with_http_backend])
-
-# minimum base dependencies
-CAIRO_REQUIRED_VERSION=1.2
-FONTCONFIG_REQUIRED_VERSION=2.4
-FREETYPE2_REQUIRED_VERSION=9.0
-LIBXML_REQUIRED_VERSION=2.6
-
-# minimum GTK+ base dependencies
-PANGO_REQUIRED_VERSION=1.0
-GTK_REQUIRED_VERSION=2.8
-
-# optional modules
-LIBCURL_REQUIRED_VERSION=7.15
-LIBSOUP_REQUIRED_VERSION=2.23
-LIBXSLT_REQUIRED_VERSION=1.1.7
-SQLITE_REQUIRED_VERSION=3.0
-GSTREAMER_REQUIRED_VERSION=0.10
-
-# Available modules
-#
-# glib - glib and includes gthread
-# unicode - check and identify which unicode backend to use
-#
-# todo: webcore gtk
-WEBKIT_CHECK_DEPENDENCIES([glib unicode])
-                          
-PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED_VERSION)
-AC_SUBST(LIBXML_CFLAGS)
-AC_SUBST(LIBXML_LIBS)
-
-PKG_CHECK_MODULES(PANGO, pango >= $PANGO_REQUIRED_VERSION)
-AC_SUBST(PANGO_CFLAGS)
-AC_SUBST(PANGO_LIBS)
-
-# check for target-specific dependencies
-if test "$with_target" = "directfb"; then
-   PKG_CHECK_MODULES(CAIRO, cairo-directfb >= $CAIRO_REQUIRED_VERSION)
-   PKG_CHECK_MODULES(GTK, gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION)
-   AC_DEFINE([WTF_PLATFORM_DIRECTFB],[1],[Define if target is DirectFB])
-else
-   PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_REQUIRED_VERSION)
-   PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION)
-
-   if test "$with_target" = "x11" && test "$os_win32" = "no"; then
-      # check for XT
-      PKG_CHECK_MODULES([XT],
-                        [xt],
-                        [xt_has_pkg_config=yes],
-                        [xt_has_pkg_config=no])
-      # some old versions of Xt do not provide xt.pc, so try to link against Xt
-      # and if it's installed fall back to just adding -lXt
-      if test "$xt_has_pkg_config" = "no"; then
-         # using AC_CHECK_LIB instead of AC_SEARCH_LIB is fine in this case as
-         # we don't care about the XtOpenDisplay symbol but only about the
-         # existence of libXt
-         AC_CHECK_