gbuild: little more cleaning

solenv/doc/gbuild/solenv/gbuild/gbuild.mk

@@ -13,7 +13,6 @@ static Path WORKDIR;
 
 // Expected from configure/environment
 static const Integer OSL_DEBUG_LEVEL;
-static const List<Path> JDKINCS;
 static const List<Path> SOLARINC;
 static const List<Path> SOLARLIB;
 static const Path GBUILDDIR;

solenv/gbuild/BuildDirs.mk

@@ -26,15 +26,6 @@
 #
 #*************************************************************************
 
-# extend for JDK include (seems only needed in setsolar env?)
-SOLARINC += $(JDKINCS)
-
-OUTDIR := $(SOLARVERSION)/$(INPATH)
-OUTDIR_FOR_BUILD := $(SOLARVERSION)/$(INPATH_FOR_BUILD)
-ifeq ($(strip $(SOLARENV)),)
-$(error SOLARENV variable is empty, no environment set, aborting)
-endif
-
 # The entire gbuild operates in unix paths, and then when calling the
 # native tools, converts them back to the Windows native paths.
 #

solenv/gbuild/gbuild.mk

@@ -33,7 +33,6 @@ GBUILDDIR:=$(SRCDIR)/solenv/gbuild
 # DEBUG
 # INPATH
 # JAVA_HOME
-# JDKINCS
 # LIBXML_CFLAGS
 # OS
 # PRODUCT
@@ -71,7 +70,7 @@ endif
 
 include $(GBUILDDIR)/Output.mk
 
-# BuildDirs uses the Output functions already
+# BuildDirs overrides *DIR variables for Windows
 include $(GBUILDDIR)/BuildDirs.mk
 
 

solenv/gbuild/gbuild_simple.mk

@@ -34,7 +34,7 @@ COMMA :=,
 
 include $(GBUILDDIR)/Output.mk
 
-# BuildDirs uses the Output functions already
+# BuildDirs overrides *DIR variables for Windows
 include $(GBUILDDIR)/BuildDirs.mk
 
 # Presumably the common parts in gbuild.mk and gbuild_simple.mk should