equal
deleted
inserted
replaced
23 TRACE_PATH:=$(strip $(foreach DIR,$(USERINCLUDE),$(filter %/traces_$(TARGET)_$(TARGETTYPE),$(DIR)))) |
23 TRACE_PATH:=$(strip $(foreach DIR,$(USERINCLUDE),$(filter %/traces_$(TARGET)_$(TARGETTYPE),$(DIR)))) |
24 # Use target name instead of mmp file name |
24 # Use target name instead of mmp file name |
25 TRACE_PRJNAME:=$(TARGET)_$(TARGETTYPE) |
25 TRACE_PRJNAME:=$(TARGET)_$(TARGETTYPE) |
26 endif |
26 endif |
27 |
27 |
28 TRACE_DICTIONARY:=$(EPOCROOT)/epoc32/ost_dictionaries/$(TRACE_PRJNAME)_0x$(UID_TC)_Dictionary.xml |
28 # initialise (so what output will be correct if we don't actually run the TC) |
29 AUTOGEN_HEADER:=$(EPOCROOT)/epoc32/include/internal/SymbianTraces/autogen/$(TRACE_PRJNAME)_0x$(UID_TC)_TraceDefinitions.h |
29 TRACE_DICTIONARY:= |
|
30 AUTOGEN_HEADER:= |
30 |
31 |
31 $(if $(FLMDEBUG),$(info <debug>TRACE_PATH = $(TRACE_PATH)</debug>)) |
32 $(if $(FLMDEBUG),$(info <debug>TRACE_PATH = $(TRACE_PATH)</debug>)) |
32 |
33 |
33 # Run trace compiler only if TRACE_PATH exists |
34 # Run trace compiler only if TRACE_PATH exists |
34 ifneq ($(TRACE_PATH),) |
35 ifneq ($(TRACE_PATH),) |
49 |
50 |
50 $(TRACE_HEADERS): $(TRACE_MARKER) |
51 $(TRACE_HEADERS): $(TRACE_MARKER) |
51 |
52 |
52 ifeq ($(GUARD_$(call sanitise,$(TRACE_MARKER))),) |
53 ifeq ($(GUARD_$(call sanitise,$(TRACE_MARKER))),) |
53 GUARD_$(call sanitise,$(TRACE_MARKER)):=1 |
54 GUARD_$(call sanitise,$(TRACE_MARKER)):=1 |
|
55 |
|
56 TRACE_DICTIONARY:=$(EPOCROOT)/epoc32/ost_dictionaries/$(TRACE_PRJNAME)_0x$(UID_TC)_Dictionary.xml |
|
57 AUTOGEN_HEADER:=$(EPOCROOT)/epoc32/include/internal/SymbianTraces/autogen/$(TRACE_PRJNAME)_0x$(UID_TC)_TraceDefinitions.h |
54 |
58 |
55 JAVA_COMMAND:=$(SBS_JAVATC) |
59 JAVA_COMMAND:=$(SBS_JAVATC) |
56 TRACE_COMPILER_PATH:=$(EPOCROOT)/epoc32/tools |
60 TRACE_COMPILER_PATH:=$(EPOCROOT)/epoc32/tools |
57 TRACE_COMPILER_START:=-classpath $(TRACE_COMPILER_PATH)/tracecompiler com.nokia.tracecompiler.TraceCompiler |
61 TRACE_COMPILER_START:=-classpath $(TRACE_COMPILER_PATH)/tracecompiler com.nokia.tracecompiler.TraceCompiler |
58 |
62 |