1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
From: Mike Hommey <mh@glandium.org>
Date: Thu, 28 Jan 2010 18:08:38 +0100
Subject: Install missing nanojit and .tbl headers from js/src
https://bugzilla.mozilla.org/show_bug.cgi?id=542789
---
js/src/Makefile.in | 44 +++++++++++++++++++++++++++-----------------
1 file changed, 27 insertions(+), 17 deletions(-)
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 1200ae6..0f83fd6 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -230,6 +230,7 @@ INSTALLED_HEADERS = \
jsxdrapi.h \
jsval.h \
prmjtime.h \
+ jskeyword.tbl \
$(NULL)
######################################################
@@ -296,21 +297,21 @@ VPATH += \
INSTALLED_HEADERS += \
jsbuiltins.h \
- Assembler.h \
- Allocator.h \
- CodeAlloc.h \
- Containers.h \
- LIR.h \
- LIRopcode.tbl \
- avmplus.h \
- Fragmento.h \
- Native.h \
- NativeCommon.h \
- Native$(NANOJIT_ARCH).h \
- njconfig.h \
- njcpudetect.h \
- RegAlloc.h \
- nanojit.h \
+ nanojit/Assembler.h \
+ nanojit/Allocator.h \
+ nanojit/CodeAlloc.h \
+ nanojit/Containers.h \
+ nanojit/LIR.h \
+ nanojit/LIRopcode.tbl \
+ nanojit/avmplus.h \
+ nanojit/Fragmento.h \
+ nanojit/Native.h \
+ nanojit/NativeCommon.h \
+ nanojit/Native$(NANOJIT_ARCH).h \
+ nanojit/njconfig.h \
+ nanojit/njcpudetect.h \
+ nanojit/RegAlloc.h \
+ nanojit/nanojit.h \
VMPI.h \
Writer.h \
$(NULL)
@@ -545,7 +546,11 @@ else
CPPSRCS += pm_stub.cpp
endif
-EXPORTS = $(INSTALLED_HEADERS)
+EXPORTS = $(filter-out nanojit/%,$(INSTALLED_HEADERS))
+ifdef ENABLE_TRACEJIT
+EXPORTS_NAMESPACES += nanojit
+EXPORTS_nanojit = $(filter nanojit/%,$(INSTALLED_HEADERS))
+endif # ENABLE_TRACEJIT
DASH_R = -r
@@ -911,7 +916,12 @@ js-config: js-config.in Makefile $(DEPTH)/config/autoconf.mk $(topsrcdir)/config
SCRIPTS = js-config
SDK_BINARY = js-config
-install:: $(INSTALLED_HEADERS)
+ifdef ENABLE_TRACEJIT
+install:: $(filter nanojit/%,$(INSTALLED_HEADERS))
+ $(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(MODULE)/nanojit
+endif
+
+install:: $(filter-out nanojit/%,$(INSTALLED_HEADERS))
$(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(MODULE)
install:: $(SCRIPTS)
|
