diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-02-24 16:41:01 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-02-24 17:06:52 +0100 |
| commit | b715e378aafc1015edcec797d938f72add993f25 (patch) | |
| tree | ae9474f1c7110d30ccd9827c3c510669172cc863 | |
| parent | ea37d89410d8b1c3d23e7ed76ff2cecd9f44ee56 (diff) | |
gbuild: little more cleaning
| -rw-r--r-- | solenv/doc/gbuild/solenv/gbuild/gbuild.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/BuildDirs.mk | 9 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild_simple.mk | 2 |
4 files changed, 2 insertions, 13 deletions
diff --git a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk index 2b65f3fce66e..6bb3a58d956b 100644 --- a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk +++ b/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; diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk index 40057308571d..4aa7176d3fdc 100644 --- a/solenv/gbuild/BuildDirs.mk +++ b/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. # diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 059b416339bf..3eeff9143f87 100644 --- a/solenv/gbuild/gbuild.mk +++ b/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 diff --git a/solenv/gbuild/gbuild_simple.mk b/solenv/gbuild/gbuild_simple.mk index 8919d7e8a549..3f7ba29bfb15 100644 --- a/solenv/gbuild/gbuild_simple.mk +++ b/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 |