1.1 --- a/make/windows/makefiles/trace.make Wed Oct 16 15:26:12 2013 -0400 1.2 +++ b/make/windows/makefiles/trace.make Thu Oct 17 16:11:26 2013 +0200 1.3 @@ -40,8 +40,7 @@ 1.4 traceEventIds.hpp \ 1.5 traceTypes.hpp 1.6 1.7 - 1.8 -!if "$(OPENJDK)" != "true" 1.9 +!if EXISTS($(TraceAltSrcDir)) 1.10 TraceGeneratedNames = $(TraceGeneratedNames) \ 1.11 traceRequestables.hpp \ 1.12 traceEventControl.hpp \ 1.13 @@ -56,7 +55,7 @@ 1.14 $(TraceOutDir)/traceEventIds.hpp \ 1.15 $(TraceOutDir)/traceTypes.hpp 1.16 1.17 -!if "$(OPENJDK)" != "true" 1.18 +!if EXISTS($(TraceAltSrcDir)) 1.19 TraceGeneratedFiles = $(TraceGeneratedFiles) \ 1.20 $(TraceOutDir)/traceRequestables.hpp \ 1.21 $(TraceOutDir)/traceEventControl.hpp \ 1.22 @@ -68,7 +67,7 @@ 1.23 XML_DEPS = $(TraceSrcDir)/trace.xml $(TraceSrcDir)/tracetypes.xml \ 1.24 $(TraceSrcDir)/trace.dtd $(TraceSrcDir)/xinclude.mod 1.25 1.26 -!if "$(OPENJDK)" != "true" 1.27 +!if EXISTS($(TraceAltSrcDir)) 1.28 XML_DEPS = $(XML_DEPS) $(TraceAltSrcDir)/traceevents.xml 1.29 !endif 1.30 1.31 @@ -87,7 +86,7 @@ 1.32 @echo Generating $@ 1.33 @$(XSLT) -IN $(TraceSrcDir)/trace.xml -XSL $(TraceSrcDir)/traceTypes.xsl -OUT $(TraceOutDir)/traceTypes.hpp 1.34 1.35 -!if "$(OPENJDK)" == "true" 1.36 +!if !EXISTS($(TraceAltSrcDir)) 1.37 1.38 $(TraceOutDir)/traceEventClasses.hpp: $(TraceSrcDir)/trace.xml $(TraceSrcDir)/traceEventClasses.xsl $(XML_DEPS) 1.39 @echo Generating OpenJDK $@