From 67582310b542a64583c590c43532e53a5b710d6e Mon Sep 17 00:00:00 2001
From: Mario Sanchez Prada <mario@endlessm.com>
Date: Wed, 20 Apr 2016 19:03:28 +0100
Subject: Remove parallel version of WebHelper compatible with WebKit2-3.0

We are no longer shipping the Webkit2-3.0 API on Endless and Virtual School
has already been migrated to the newer WebKit2-4.0 API after having fixed
all the regressions there and so it makes no sense to keep this any longer.

Besides, after the WebKitGTK+ upgrade from 2.4.9 to 2.4.11 debian does no
longer ship the WebKit2GTK+-3.0 packages (and there's no point on us bringing
them back) so, actually, we can not keep this anyway, so let's remove it.

This commit basically reverts 8c837e660853abd03c97a98815f73146eb57c010, but
considering all the changes integrated ever since (not a "clean" revert).

https://phabricator.endlessm.com/T11388
---
 Makefile.am | 35 -----------------------------------
 1 file changed, 35 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 8638a1f..52f610d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -91,7 +91,6 @@ DISTCLEANFILES += @EOS_SDK_API_NAME@.pc
 webhelper_sources = \
 	webhelper/webhelper.js \
 	webhelper/webhelper2.js \
-	webhelper/webhelper2_old.js \
 	$(NULL)
 
 gjsmodulesdir = $(datadir)/gjs-1.0
@@ -101,7 +100,6 @@ dist_webhelper_DATA = \
 	$(webhelper_sources) \
 	$(NULL)
 dist_webhelper_private_DATA = \
-	webhelper/webhelper_private/common.js \
 	webhelper/webhelper_private/config.js \
 	$(NULL)
 
@@ -130,28 +128,6 @@ wh2extension_la_CPPFLAGS = @WEBHELPER2_EXTENSION_CFLAGS@
 wh2extension_la_LIBADD = @WEBHELPER2_EXTENSION_LIBS@
 wh2extension_la_LDFLAGS = -module -avoid-version -no-undefined
 
-# WebKit2-3.0 version
-
-lib_LTLIBRARIES += libwebhelper2oldprivate.la
-libwebhelper2oldprivate_la_SOURCES = \
-	webhelper/lib/wh2private.c \
-	webhelper/lib/wh2private.h \
-	$(NULL)
-libwebhelper2oldprivate_la_CPPFLAGS = @WEBHELPER2_OLD_PRIVATE_CFLAGS@
-libwebhelper2oldprivate_la_LIBADD = @WEBHELPER2_OLD_PRIVATE_LIBS@
-libwebhelper2oldprivate_la_LDFLAGS = -avoid-version
-
-webhelper2oldextensionsdir = $(libexecdir)/webhelper2old
-webhelper2oldextensions_LTLIBRARIES = wh2oldextension.la
-wh2oldextension_la_SOURCES = \
-	webhelper/webextensions/wh2extension.c \
-	webhelper/webextensions/wh2jscutil.c \
-	webhelper/webextensions/wh2jscutil.h \
-	$(NULL)
-wh2oldextension_la_CPPFLAGS = @WEBHELPER2_OLD_EXTENSION_CFLAGS@
-wh2oldextension_la_LIBADD = @WEBHELPER2_OLD_EXTENSION_LIBS@
-wh2oldextension_la_LDFLAGS = -module -avoid-version -no-undefined
-
 # # # INTROSPECTION FILES # # #
 
 -include $(INTROSPECTION_MAKEFILE)
@@ -187,16 +163,6 @@ WebHelper2Private_1_0_gir_LIBS = libwebhelper2private.la
 WebHelper2Private_1_0_gir_FILES = $(libwebhelper2private_la_SOURCES)
 INTROSPECTION_GIRS += WebHelper2Private-1.0.gir
 
-WebHelper2OldPrivate-1.0.gir: libwebhelper2oldprivate.la
-WebHelper2OldPrivate_1_0_gir_INCLUDES = GObject-2.0 GLib-2.0 WebKit2-3.0
-WebHelper2OldPrivate_1_0_gir_SCANNERFLAGS = \
-	--identifier-prefix=Wh2 \
-	--symbol-prefix=wh2 \
-	$(NULL)
-WebHelper2OldPrivate_1_0_gir_LIBS = libwebhelper2oldprivate.la
-WebHelper2OldPrivate_1_0_gir_FILES = $(libwebhelper2oldprivate_la_SOURCES)
-INTROSPECTION_GIRS += WebHelper2OldPrivate-1.0.gir
-
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
 
@@ -412,7 +378,6 @@ AM_JS_LOG_FLAGS += @EOS_JS_COVERAGE_LOG_FLAGS@
 AM_CFLAGS += @EOS_C_COVERAGE_CFLAGS@
 AM_LDFLAGS = @EOS_C_COVERAGE_LDFLAGS@
 libwebhelper2private_la_LDFLAGS += @EOS_C_COVERAGE_LDFLAGS@
-libwebhelper2oldprivate_la_LDFLAGS += @EOS_C_COVERAGE_LDFLAGS@
 wh2extension_la_LDFLAGS += @EOS_C_COVERAGE_LDFLAGS@
 
 clean-local:: clean-coverage
-- 
cgit v1.2.3