Bug 1233282 - Move mozilla-config.h's export to moz.build. r=gps
☠☠ backed out by e3b277208e73 ☠ ☠
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 17 Dec 2015 14:06:32 +0900
changeset 276906 e61d18180febc8560140f2eafbd9e3c19f4488a0
parent 276905 53a9d03e4223083de8016ef26bcc7649603f2506
child 276907 f07752f611f6ff596b28b635142873e7befca80b
push id29810
push usercbook@mozilla.com
push dateFri, 18 Dec 2015 14:24:54 +0000
treeherdermozilla-central@c5cb194cc9cb [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',