Fix merge of last 2 commits

Author: vmcj

lib/.gitignore

@@ -1,4 +1,3 @@
 /judge
 /submit
-/vendor
 /dj_utils.py

lib/Makefile

@@ -2,8 +2,6 @@ ifndef TOPDIR
 TOPDIR=..
 endif
 
-REC_TARGETS = domserver
-
 include $(TOPDIR)/Makefile.global
 
 OBJECTS = $(addsuffix $(OBJEXT),lib.error lib.misc)
@@ -22,5 +20,3 @@ install-domserver:
 install-judgehost:
 	$(INSTALL_DATA) -t $(DESTDIR)$(judgehost_libdir)    *.php *.sh
 	$(INSTALL_PROG) -t $(DESTDIR)$(judgehost_libdir)    alert
-
-domserver:         SUBDIRS=vendor

webapp/.gitignore

@@ -8,6 +8,7 @@
 /var/log/*
 !var/log/.gitkeep
 /vendor/
+!vendor/Makefile
 
 ###> phpunit/phpunit ###
 /phpunit.xml

webapp/Makefile

@@ -7,7 +7,7 @@ REC_TARGETS = domserver
 include $(TOPDIR)/Makefile.global
 
 # Subdirectories to recurse into for REC_TARGETS
-SUBDIRS = config
+SUBDIRS = config vendor
 
 maintainer-conf: .env.local
 
@@ -18,12 +18,6 @@ maintainer-conf: .env.local
 	@echo "# the DOMjudge Symfony application in developer mode. Adjust as needed." >> $@
 	@echo "APP_ENV=dev" >> $@
 
-# Dump autoload dependencies (including plugins)
-# This is needed since symfony/runtime is a Composer plugin that runs while dumping
-# the autoload file
-composer-dump-autoload:
-	composer $(subst 1,-q,$(QUIET)) dump-autoload -o -a
-
 composer-dump-autoload-dev:
 	composer $(subst 1,-q,$(QUIET)) dump-autoload
 
@@ -37,7 +31,7 @@ copy-bundle-assets:
 clean-l:
 	-rm -rf public/bundles/nelmioapidoc
 
-install-domserver: composer-dump-autoload
+install-domserver:
 # This must be done first to install with the rest.
 	$(MAKE) copy-bundle-assets
 	$(INSTALL_DIR) $(DESTDIR)$(domserver_webappdir);
@@ -58,7 +52,7 @@ install-domserver: composer-dump-autoload
 	done
 	$(INSTALL_DATA) -t $(DESTDIR)$(domserver_webappdir) phpunit.xml.dist .env
 
-inplace-install: composer-autoclean composer-dump-autoload
+inplace-install: composer-autoclean
 maintainer-install: composer-dump-autoload-dev
 
 # Install PHP dependencies

lib/vendor/Makefile renamed to webapp/vendor/Makefile

@@ -7,6 +7,6 @@ clean-l:
 	rm -f autoload_runtime.php
 
 autoload_runtime.php:
-	composer $(subst 1,-q,$(QUIET)) dump-autoload -o -a -d $(TOPDIR)
+	composer $(subst 1,-q,$(QUIET)) dump-autoload -o -a -d ..
 
 domserver: autoload_runtime.php