Bug 939044 - Remove the last uses of the MODULE variable in makefiles. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 19 Nov 2013 11:47:30 +0900
changeset 170773 5190dda148374cffb8e2052efb4c0e8f600b877a
parent 170772 e50ec18609305f1c38c2bf8a647a00857a1d67ec
child 170774 05e66d941de21f4edbb22801c740878474d23b72
push id3224
push userlsblakk@mozilla.com
push dateTue, 04 Feb 2014 01:06:49 +0000
treeherdermozilla-beta@60c04d0987f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs939044
milestone28.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 939044 - Remove the last uses of the MODULE variable in makefiles. r=gps
config/rules.mk
config/version.mk
js/src/config/rules.mk
js/src/config/version.mk
js/xpconnect/tests/idl/Makefile.in
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -505,17 +505,17 @@ endif
 ifeq ($(OS_ARCH),FreeBSD)
 ifdef IS_COMPONENT
 EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
 endif
 endif
 
 ifeq ($(OS_ARCH),NetBSD)
 ifneq (,$(filter arc cobalt hpcmips mipsco newsmips pmax sgimips,$(OS_TEST)))
-ifeq ($(MODULE),layout)
+ifneq (,$(filter layout/%,$(relativesrcdir)))
 OS_CFLAGS += -Wa,-xgot
 OS_CXXFLAGS += -Wa,-xgot
 endif
 endif
 endif
 
 #
 # HP-UXBeOS specific section: for COMPONENTS only, add -Bsymbolic flag
--- a/config/version.mk
+++ b/config/version.mk
@@ -17,19 +17,16 @@ RCFILE=./module.rc
 RESFILE=./module.res
 _RC_STRING = -QUIET 1 -DEPTH $(DEPTH) -TOPSRCDIR $(topsrcdir) -OBJDIR . -SRCDIR $(srcdir) -DISPNAME $(MOZ_APP_DISPLAYNAME) -APPVERSION $(MOZ_APP_VERSION)
 ifdef MOZILLA_OFFICIAL
 _RC_STRING += -OFFICIAL 1
 endif
 ifdef MOZ_DEBUG
 _RC_STRING += -DEBUG 1
 endif
-ifdef MODULE
-_RC_STRING += -MODNAME $(MODULE)
-endif
 ifdef PROGRAM
 _RC_STRING += -BINARY $(PROGRAM)
 else
 ifdef _PROGRAM
 _RC_STRING += -BINARY $(_PROGRAM)
 else
 ifdef SHARED_LIBRARY
 _RC_STRING += -BINARY $(SHARED_LIBRARY)
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -505,17 +505,17 @@ endif
 ifeq ($(OS_ARCH),FreeBSD)
 ifdef IS_COMPONENT
 EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
 endif
 endif
 
 ifeq ($(OS_ARCH),NetBSD)
 ifneq (,$(filter arc cobalt hpcmips mipsco newsmips pmax sgimips,$(OS_TEST)))
-ifeq ($(MODULE),layout)
+ifneq (,$(filter layout/%,$(relativesrcdir)))
 OS_CFLAGS += -Wa,-xgot
 OS_CXXFLAGS += -Wa,-xgot
 endif
 endif
 endif
 
 #
 # HP-UXBeOS specific section: for COMPONENTS only, add -Bsymbolic flag
--- a/js/src/config/version.mk
+++ b/js/src/config/version.mk
@@ -17,19 +17,16 @@ RCFILE=./module.rc
 RESFILE=./module.res
 _RC_STRING = -QUIET 1 -DEPTH $(DEPTH) -TOPSRCDIR $(topsrcdir) -OBJDIR . -SRCDIR $(srcdir) -DISPNAME $(MOZ_APP_DISPLAYNAME) -APPVERSION $(MOZ_APP_VERSION)
 ifdef MOZILLA_OFFICIAL
 _RC_STRING += -OFFICIAL 1
 endif
 ifdef MOZ_DEBUG
 _RC_STRING += -DEBUG 1
 endif
-ifdef MODULE
-_RC_STRING += -MODNAME $(MODULE)
-endif
 ifdef PROGRAM
 _RC_STRING += -BINARY $(PROGRAM)
 else
 ifdef _PROGRAM
 _RC_STRING += -BINARY $(_PROGRAM)
 else
 ifdef SHARED_LIBRARY
 _RC_STRING += -BINARY $(SHARED_LIBRARY)
--- a/js/xpconnect/tests/idl/Makefile.in
+++ b/js/xpconnect/tests/idl/Makefile.in
@@ -1,11 +1,11 @@
 #
 # 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
 
 componentdir = js/xpconnect/tests/components
-libs:: $(DEPTH)/config/makefiles/xpidl/xpt/$(MODULE).xpt
+libs:: $(DEPTH)/config/makefiles/xpidl/xpt/$(XPT_NAME)
 	$(INSTALL) $^ $(testxpcobjdir)/$(componentdir)/native
 	$(INSTALL) $^ $(testxpcobjdir)/$(componentdir)/js