From 1b65890b0ed4d05c8240987e3cebecb69c9bd1cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <carlos.martin.sanchez@gmail.com>
Date: Thu, 27 Dec 2018 12:15:13 +0000
Subject: [PATCH] Remove web build from main makefile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Carlos Martín <carlos.martin.sanchez@gmail.com>
---
 .travis.yml  |  6 ++++++
 Makefile     | 11 -----------
 Makefile.web | 12 ++++++++++++
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ffc24985..a1a0c125 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,6 +62,12 @@ jobs:
       os: osx
       osx_image: xcode9.4
       before_install: skip
+    - name: 'Web Tests'
+      stage: tests
+      script:
+        - make dependencies
+        - make -f Makefile.web build
+        - make -f Makefile.web test
     - name: 'Generated code'
       script:
         - make dependencies
diff --git a/Makefile b/Makefile
index 86917406..a649f197 100644
--- a/Makefile
+++ b/Makefile
@@ -130,14 +130,3 @@ endif
 .PHONY: ci-integration-dependencies
 ci-integration-dependencies: prepare-services ci-start-bblfsh
 
-# Redefine targets from main Makefile to support web
-
--include Makefile.web
-
-# Makefile.main::test -> this::test
-test: web-test
-
-# this::build -> Makefile.main::build -> Makefile.main::$(COMMANDS)
-# The @echo forces this prerequisites to be run before `Makefile.main::build` ones.
-build: web-build web-bindata
-	@echo
diff --git a/Makefile.web b/Makefile.web
index a56c6d2b..7df01e55 100644
--- a/Makefile.web
+++ b/Makefile.web
@@ -1,3 +1,15 @@
+# Redefine targets from main Makefile
+
+-include Makefile
+
+# Makefile.main::test -> this::test
+test: web-test
+
+# this::build -> Makefile.main::build -> Makefile.main::$(COMMANDS)
+# The @echo forces this prerequisites to be run before `Makefile.main::build` ones.
+build: web-build web-bindata
+	@echo
+
 FRONTEND_PATH := ./frontend
 FRONTEND_BUILD_PATH := $(FRONTEND_PATH)/build