summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/src/irregexp/moz.build23
-rw-r--r--js/src/moz.build9
2 files changed, 8 insertions, 24 deletions
diff --git a/js/src/irregexp/moz.build b/js/src/irregexp/moz.build
deleted file mode 100644
index fc4fe62188..0000000000
--- a/js/src/irregexp/moz.build
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include('../js-config.mozbuild')
-include('../js-cxxflags.mozbuild')
-
-FINAL_LIBRARY = "js"
-
-# Includes should be relative to parent path
-LOCAL_INCLUDES += ["!..", ".."]
-
-SOURCES += [
- 'NativeRegExpMacroAssembler.cpp',
- 'RegExpAST.cpp',
- 'RegExpCharacters.cpp',
- 'RegExpEngine.cpp',
- 'RegExpInterpreter.cpp',
- 'RegExpMacroAssembler.cpp',
- 'RegExpParser.cpp',
- 'RegExpStack.cpp',
-] \ No newline at end of file
diff --git a/js/src/moz.build b/js/src/moz.build
index 68fbaabb15..f83f141964 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -108,7 +108,6 @@ DIRS += [
'ds',
'frontend',
'gc',
- 'irregexp',
]
if CONFIG['JS_BUNDLED_EDITLINE']:
@@ -121,6 +120,14 @@ if not CONFIG['JS_DISABLE_SHELL']:
DIRS += ['shell']
SOURCES += [
+ 'irregexp/NativeRegExpMacroAssembler.cpp',
+ 'irregexp/RegExpAST.cpp',
+ 'irregexp/RegExpCharacters.cpp',
+ 'irregexp/RegExpEngine.cpp',
+ 'irregexp/RegExpInterpreter.cpp',
+ 'irregexp/RegExpMacroAssembler.cpp',
+ 'irregexp/RegExpParser.cpp',
+ 'irregexp/RegExpStack.cpp',
'jit/AliasAnalysis.cpp',
'jit/AliasAnalysisShared.cpp',
'jit/AlignmentMaskAnalysis.cpp',