Bug 1233282 - Move mozilla-config.h's export to moz.build. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 17 Dec 2015 14:06:32 +0900
changeset 314430 20a481bc8b5a9a71e296b01da89b601b316749a3
parent 314429 94176e035ef9ac3a677d18f0da011b1f34dcec4e
child 314431 5f330d996ca4e3bd5a8c2c12e5867a406e27af66
push id1079
push userjlund@mozilla.com
push dateFri, 15 Apr 2016 21:02:33 +0000
treeherdermozilla-release@575fbf6786d5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1233282
milestone46.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1233282 - Move mozilla-config.h's export to moz.build. r=gps
config/Makefile.in
moz.build
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -25,25 +25,16 @@ nsinstall$(HOST_BIN_SUFFIX): $(HOST_PROG
 
 NSINSTALL_EXECUTABLES := nsinstall$(HOST_BIN_SUFFIX)
 NSINSTALL_DEST := $(DIST)/bin
 NSINSTALL_TARGET := host
 INSTALL_TARGETS += NSINSTALL
 endif
 endif
 
-ifndef JS_STANDALONE
-HEADERS_FILES = \
-	$(DEPTH)/mozilla-config.h \
-	$(NULL)
-HEADERS_DEST := $(DIST)/include
-HEADERS_TARGET := export
-INSTALL_TARGETS += HEADERS
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 ifndef JS_STANDALONE
 ifndef MOZ_PROFILE_USE
 # Generate a new buildid every time we "export" in config... that's only
 # supposed to be once per-build!
 export:: buildid
 
--- a/moz.build
+++ b/moz.build
@@ -23,16 +23,19 @@ DIRS += [
 
 if not CONFIG['JS_STANDALONE']:
     CONFIGURE_SUBST_FILES += [
         'tools/update-packaging/Makefile',
     ]
     CONFIGURE_DEFINE_FILES += [
         'mozilla-config.h',
     ]
+    EXPORTS += [
+        '!mozilla-config.h',
+    ]
 
     DIRS += [
         'build',
         'probes',
     ]
 
 DIRS += [
     'config/external/zlib',