Bug 1112608 - use GENERATED_INCLUDES in security/manager/{boot,pki}/src/; r=mshal
authorNathan Froyd <froydnj@mozilla.com>
Wed, 17 Dec 2014 11:02:19 -0500
changeset 220217 6f29a19dc2e84322d3a3c335e3f2e86900c3082a
parent 220216 e1b41262018fcbec1839c33005fd1ea55cae9759
child 220218 7c2973cb4fa1a0b0c1044a16c10d046b2538e0ea
push id10457
push userryanvm@gmail.com
push dateThu, 18 Dec 2014 01:54:25 +0000
treeherderfx-team@0e441ff66c5e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1112608
milestone37.0a1
Bug 1112608 - use GENERATED_INCLUDES in security/manager/{boot,pki}/src/; r=mshal The sole use of Makefile.in in the security/manager/{boot,pki}/src/ directories is so we can add $(DIST)/public/nss to INCLUDES. GENERATED_INCLUDES can be used to handle this case instead, at the cost of hardcoding the path to $(DIST). This seems reasonable enough, since a number of moz.build files already know about dist/ and its location within the objdir.
security/manager/boot/src/Makefile.in
security/manager/boot/src/moz.build
security/manager/pki/src/Makefile.in
security/manager/pki/src/moz.build
deleted file mode 100644
--- a/security/manager/boot/src/Makefile.in
+++ /dev/null
@@ -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/.
-
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES	+= \
-		-I$(DIST)/public/nss \
-		$(NULL)
-
--- a/security/manager/boot/src/moz.build
+++ b/security/manager/boot/src/moz.build
@@ -19,13 +19,17 @@ UNIFIED_SOURCES += [
     'PublicKeyPinningService.cpp',
     'RootCertificateTelemetryUtils.cpp',
 ]
 
 LOCAL_INCLUDES += [
     '../../../pkix/include',
 ]
 
+GENERATED_INCLUDES += [
+    '/dist/public/nss',
+]
+
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'
deleted file mode 100644
--- a/security/manager/pki/src/Makefile.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#! gmake
-# 
-# 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/.
-
-INCLUDES	+= \
-		-I$(DIST)/public/nss \
-		$(NULL)
--- a/security/manager/pki/src/moz.build
+++ b/security/manager/pki/src/moz.build
@@ -7,11 +7,15 @@
 UNIFIED_SOURCES += [
     'nsASN1Tree.cpp',
     'nsNSSDialogHelper.cpp',
     'nsNSSDialogs.cpp',
     'nsPKIModule.cpp',
     'nsPKIParamBlock.cpp',
 ]
 
+GENERATED_INCLUDES += [
+    '/dist/public/nss',
+]
+
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'