bug 915566 - rm makefiles in dom/ r=gps

2024-11-24 21:31:04 +00:00 · 2013-09-13 12:25:21 -04:00 · 2013-09-13 12:25:21 -04:00 · 516ec6f51b
commit 516ec6f51b
parent 4aff5f1b09
25 changed files with 36 additions and 105 deletions
--- a/dom/activities/src/Makefile.in
+++ b/dom/activities/src/Makefile.in
@ -1,5 +0,0 @@
-# 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 $(topsrcdir)/dom/dom-config.mk
--- a/dom/activities/src/moz.build
+++ b/dom/activities/src/moz.build
@ -34,3 +34,6 @@ LIBXUL_LIBRARY = True

 LIBRARY_NAME = 'dom_activities_s'

+LOCAL_INCLUDES += [
+    '/dom/base',
+]
--- a/dom/cellbroadcast/interfaces/Makefile.in
+++ b/dom/cellbroadcast/interfaces/Makefile.in
@ -1,5 +0,0 @@
-# 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 $(topsrcdir)/dom/dom-config.mk
--- a/dom/cellbroadcast/src/Makefile.in
+++ b/dom/cellbroadcast/src/Makefile.in
@ -1,5 +0,0 @@
-# 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 $(topsrcdir)/dom/dom-config.mk
--- a/dom/file/Makefile.in
+++ b/dom/file/Makefile.in
@ -1,5 +0,0 @@
-# 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 $(topsrcdir)/dom/dom-config.mk
--- a/dom/file/moz.build
+++ b/dom/file/moz.build
@ -61,3 +61,6 @@ LIBXUL_LIBRARY = True

 LIBRARY_NAME = 'domfile_s'

+LOCAL_INCLUDES += [
+    '../base',
+]
--- a/dom/icc/interfaces/Makefile.in
+++ b/dom/icc/interfaces/Makefile.in
@ -1,5 +0,0 @@
-# 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 $(topsrcdir)/dom/dom-config.mk
--- a/dom/interfaces/devicestorage/Makefile.in
+++ b/dom/interfaces/devicestorage/Makefile.in
@ -1,5 +0,0 @@
-# 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 $(topsrcdir)/dom/dom-config.mk
--- a/dom/messages/interfaces/Makefile.in
+++ b/dom/messages/interfaces/Makefile.in
@ -1,5 +0,0 @@
-# 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 $(topsrcdir)/dom/dom-config.mk
--- a/dom/mobilemessage/interfaces/Makefile.in
+++ b/dom/mobilemessage/interfaces/Makefile.in
@ -1,5 +0,0 @@
-# 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 $(topsrcdir)/dom/dom-config.mk
--- a/dom/network/interfaces/Makefile.in
+++ b/dom/network/interfaces/Makefile.in
@ -1,5 +0,0 @@
-# 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 $(topsrcdir)/dom/dom-config.mk
--- a/dom/promise/Makefile.in
+++ b/dom/promise/Makefile.in
@ -1,8 +0,0 @@
-# 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/.
-
-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/dom/workers \
-  -I$(topsrcdir)/dom/base \
-  $(NULL)
--- a/dom/promise/moz.build
+++ b/dom/promise/moz.build
@ -25,3 +25,7 @@ LIBXUL_LIBRARY = True

 LIBRARY_NAME = 'dompromise_s'

+LOCAL_INCLUDES += [
+    '../base',
+    '../workers',
+]
--- a/dom/src/events/Makefile.in
+++ b/dom/src/events/Makefile.in
@ -1,9 +0,0 @@
-#
-# 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 $(topsrcdir)/config/rules.mk
-
-INCLUDES	+= -I$(topsrcdir)/dom/base
-INCLUDES	+= -I$(topsrcdir)/content/base/src
--- a/dom/src/events/moz.build
+++ b/dom/src/events/moz.build
@ -18,3 +18,7 @@ LIBXUL_LIBRARY = True

 MSVC_ENABLE_PGO = True

+LOCAL_INCLUDES += [
+    "/content/base/src",
+    "/dom/base",
+]
--- a/dom/src/json/Makefile.in
+++ b/dom/src/json/Makefile.in
@ -1,8 +0,0 @@
-#
-# 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/.
-
-LOCAL_INCLUDES = \
-		-I$(srcdir)/../base \
-		-I$(topsrcdir)/content/events/src
--- a/dom/src/json/moz.build
+++ b/dom/src/json/moz.build
@ -22,3 +22,6 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+LOCAL_INCLUDES += [
+    '/content/base/src',
+]
--- a/dom/src/jsurl/Makefile.in
+++ b/dom/src/jsurl/Makefile.in
@ -1,10 +0,0 @@
-#
-# 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/.
-
-LOCAL_INCLUDES += \
-		-I$(srcdir) \
-		-I$(topsrcdir)/dom/base \
-		-I$(topsrcdir)/netwerk/base/src \
-		$(NULL)
--- a/dom/src/jsurl/moz.build
+++ b/dom/src/jsurl/moz.build
@ -22,3 +22,7 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+LOCAL_INCLUDES += [
+    "/dom/base",
+    "/netwerk/base/src",
+]
--- a/dom/src/offline/Makefile.in
+++ b/dom/src/offline/Makefile.in
@ -1,9 +0,0 @@
-#
-# 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/.
-
-LOCAL_INCLUDES = \
-		-I$(topsrcdir)/dom/base \
-		-I$(topsrcdir)/content/base/src \
-		-I$(topsrcdir)/content/events/src
--- a/dom/src/offline/moz.build
+++ b/dom/src/offline/moz.build
@ -19,3 +19,8 @@ FAIL_ON_WARNINGS = True

 LIBXUL_LIBRARY = True

+LOCAL_INCLUDES += [
+    "/content/base/src",
+    "/content/events/src",
+    "/dom/base",
+]
--- a/dom/voicemail/Makefile.in
+++ b/dom/voicemail/Makefile.in
@ -1,5 +0,0 @@
-# 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 $(topsrcdir)/dom/dom-config.mk
--- a/dom/voicemail/moz.build
+++ b/dom/voicemail/moz.build
@ -28,3 +28,6 @@ LIBXUL_LIBRARY = True

 LIBRARY_NAME = 'domvoicemail_s'

+LOCAL_INCLUDES += [
+    '../base',
+]
--- a/dom/workers/Makefile.in
+++ b/dom/workers/Makefile.in
@ -1,11 +0,0 @@
-# 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/.
-
-LOCAL_INCLUDES = \
-  -I$(topsrcdir)/content/base/src \
-  -I$(topsrcdir)/content/events/src \
-  -I$(topsrcdir)/dom/base \
-  -I$(topsrcdir)/dom/system \
-  -I$(topsrcdir)/xpcom/build \
-  $(NULL)
--- a/dom/workers/moz.build
+++ b/dom/workers/moz.build
@ -58,3 +58,10 @@ LIBXUL_LIBRARY = True

 MSVC_ENABLE_PGO = True

+LOCAL_INCLUDES += [
+    '../base',
+    '../system',
+    '/content/base/src',
+    '/content/events/src',
+    '/xpcom/build',
+]