Bug 784841 - Part 18κ: Convert /uriloader; f=Ms2ger rs=ted

iaxat · Feb 25, 2013 · 13d7329 · 13d7329
1 parent a487270
commit 13d7329
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 15 deletions.
diff --git a/uriloader/Makefile.in b/uriloader/Makefile.in
@@ -16,10 +16,4 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-PARALLEL_DIRS = \
-  base \
-  exthandler \
-  prefetch \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/uriloader/base/moz.build b/uriloader/base/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+
diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
@@ -9,11 +9,6 @@ srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = \
-       $(NULL)
-
-TEST_DIRS += tests
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 OSDIR		= os2
 else

diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
@@ -0,0 +1,6 @@
+# vim: set filetype=python:
+# 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/.
+
+TEST_DIRS += ['tests']
diff --git a/uriloader/exthandler/tests/Makefile.in b/uriloader/exthandler/tests/Makefile.in
@@ -1,4 +1,3 @@
-#
 # 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/.
@@ -9,9 +8,6 @@ srcdir          = @srcdir@
 VPATH           = @srcdir@
 relativesrcdir = @relativesrcdir@
 
-DIRS += mochitest \
-        $(NULL)
-
 include $(DEPTH)/config/autoconf.mk
 
 MODULE          = test_uriloader_exthandler

diff --git a/uriloader/exthandler/tests/mochitest/moz.build b/uriloader/exthandler/tests/mochitest/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+
diff --git a/uriloader/exthandler/tests/moz.build b/uriloader/exthandler/tests/moz.build
@@ -0,0 +1,7 @@
+# vim: set filetype=python:
+# 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/.
+
+DIRS += ['mochitest']
+
diff --git a/uriloader/moz.build b/uriloader/moz.build
@@ -0,0 +1,10 @@
+# vim: set filetype=python:
+# 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/.
+
+PARALLEL_DIRS += [
+    'base',
+    'exthandler',
+    'prefetch',
+]
diff --git a/uriloader/prefetch/moz.build b/uriloader/prefetch/moz.build
@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# 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/.
+