Bug 452061 Clobbering TraceMonkey shouldn't be needed

This commit is contained in:
Neil Rashbrook 2008-08-25 23:51:30 +01:00
parent 8c122f03b9
commit 0cf05ab4dc

View File

@ -40,7 +40,6 @@
DEPTH = ../.. DEPTH = ../..
topsrcdir = @top_srcdir@ topsrcdir = @top_srcdir@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
@ -104,6 +103,8 @@ ifeq ($(OS_ARCH),WINNT)
DEFINES += -DAVMPLUS_WIN32 DEFINES += -DAVMPLUS_WIN32
endif endif
VPATH = $(srcdir)
CPPSRCS = \ CPPSRCS = \
jsapi.cpp \ jsapi.cpp \
jsarena.cpp \ jsarena.cpp \
@ -199,33 +200,35 @@ EXPORTS = \
$(NULL) $(NULL)
ifdef ENABLE_JIT ifdef ENABLE_JIT
VPATH += $(srcdir)/nanojit
EXPORTS += \ EXPORTS += \
nanojit/Assembler.h \ Assembler.h \
nanojit/LIR.h \ LIR.h \
nanojit/avmplus.h \ avmplus.h \
nanojit/vm_fops.h \ vm_fops.h \
nanojit/Fragmento.h \ Fragmento.h \
nanojit/Native.h \ Native.h \
nanojit/Native$(NANOJIT_ARCH).h \ Native$(NANOJIT_ARCH).h \
nanojit/RegAlloc.h \ RegAlloc.h \
nanojit/nanojit.h \ nanojit.h \
builtins.tbl \ builtins.tbl \
$(NULL) $(NULL)
CPPSRCS += \ CPPSRCS += \
jstracer.cpp \ jstracer.cpp \
nanojit/Assembler.cpp \ Assembler.cpp \
nanojit/Fragmento.cpp \ Fragmento.cpp \
nanojit/LIR.cpp \ LIR.cpp \
nanojit/RegAlloc.cpp \ RegAlloc.cpp \
nanojit/avmplus.cpp \ avmplus.cpp \
nanojit/Native$(NANOJIT_ARCH).cpp \ Native$(NANOJIT_ARCH).cpp \
jsbuiltins.cpp \ jsbuiltins.cpp \
$(NULL) $(NULL)
ifdef DEBUG ifdef DEBUG
EXPORTS += nanojit/TraceTreeDrawer.h EXPORTS += TraceTreeDrawer.h
CPPSRCS += nanojit/TraceTreeDrawer.cpp CPPSRCS += TraceTreeDrawer.cpp
endif endif
DEFINES += -DFEATURE_NANOJIT -DJS_TRACER DEFINES += -DFEATURE_NANOJIT -DJS_TRACER