Merge pull request #437 from carlosms/rm-makefile-web

Remove web build from main makefile

Author: carlosms

.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

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

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