Changes to incorporate GLSL into site build

Makefile

@@ -18,17 +18,18 @@
 #   This Makefile itself does no branch selection.
 # 'build-ui' - builds the Antora UI package.
 # 'prep-sources' - prepare each repository's files for Antora.
-# This has four subtargets for the separate repos:
+# This has subtargets for the separate repos:
 #   'prep-docs' - Vulkan-Docs (specification and feature description
 #	components
+#   'prep-glsl' - OpenGL Shading Language specification
 #   'prep-guide' - Vulkan Guide
 #   'prep-samples' - Vulkan Samples
 #   'prep-tutorials' - Vulkan Tutorials
 # 'build-site' - builds the Antora site after prep-sources.
 # 'clean' - cleans the Antora site
 
 # UI and component repositories which must exist as subdirectories to build
-REPONAMES = antora-ui-khronos Vulkan-Guide Vulkan-Samples Vulkan-Tutorial Vulkan-Docs
+REPONAMES = antora-ui-khronos GLSL Vulkan-Guide Vulkan-Samples Vulkan-Tutorial Vulkan-Docs
 
 # Directories (mostly repos) with their own npm infrastructure
 DIRSWITHNODE = antora-ui-khronos docs-site Vulkan-Docs
@@ -52,9 +53,11 @@ subrepos:
 	    if test -d $$repo ; then \
 		echo "Not cloning repo $$repo, already exists" ; \
 	    else \
-	    git clone [email protected]:KhronosGroup/$$repo.git ; \
+		git clone [email protected]:KhronosGroup/$$repo.git ; \
 	    fi ; \
 	done
+	# Temporarily use development main branch
+	cd GLSL && git switch antora
 
 # Build UI bundle
 build-ui:
@@ -77,6 +80,9 @@ prep-docs:
 	   $(GENPATH)/xrefMap.cjs \
 	   docs-site/js/
 
+prep-glsl:
+	make -C GLSL clean setup_antora
+
 prep-guide:
 	make -C Vulkan-Guide -f antora/Makefile clean setup
 

docs-site/antora-playbook.yml

@@ -15,6 +15,9 @@ content:
     - url: ../Vulkan-Guide
       branches: HEAD
       start_path: antora
+    - url: ../GLSL
+      branches: HEAD
+      start_path: antora/glsl
     - url: ../Vulkan-Docs
       branches: HEAD
       start_paths: antora/spec, antora/features