Bug 896177 - Remove more config.mk includes; r=gps

2024-11-28 23:31:56 +00:00 · 2013-07-17 16:07:14 -04:00 · 2013-07-17 16:07:14 -04:00 · 263f163332
commit 263f163332
parent 61565e4086
28 changed files with 58 additions and 59 deletions
--- a/config/config.mk
+++ b/config/config.mk
@ -62,10 +62,9 @@ check-variable = $(if $(filter-out 0 1,$(words $($(x))z)),$(error Spaces are not

 $(foreach x,$(CHECK_VARS),$(check-variable))

-core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))
-core_realpath = $(if $(realpath $(1)),$(realpath $(1)),$(call core_abspath,$(1)))
-
-core_winabspath = $(firstword $(subst /, ,$(call core_abspath,$(1)))):$(subst $(space),,$(patsubst %,\\%,$(wordlist 2,$(words $(subst /, ,$(call core_abspath,$(1)))), $(strip $(subst /, ,$(call core_abspath,$(1)))))))
+ifndef INCLUDED_FUNCTIONS_MK
+include $(topsrcdir)/config/makefiles/functions.mk
+endif

 RM = rm -f

--- a/config/makefiles/functions.mk
+++ b/config/makefiles/functions.mk
@ -0,0 +1,22 @@
+#
+# 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/.
+
+#
+# functions.mk
+#
+# Defines functions that are needed by various Makefiles throughout the build
+# system, which are needed before config.mk can be included.
+#
+
+# Define an include-at-most-once flag
+ifdef INCLUDED_FUNCTIONS_MK
+$(error Do not include functions.mk twice!)
+endif
+INCLUDED_FUNCTIONS_MK = 1
+
+core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))
+core_realpath = $(if $(realpath $(1)),$(realpath $(1)),$(call core_abspath,$(1)))
+
+core_winabspath = $(firstword $(subst /, ,$(call core_abspath,$(1)))):$(subst $(space),,$(patsubst %,\\%,$(wordlist 2,$(words $(subst /, ,$(call core_abspath,$(1)))), $(strip $(subst /, ,$(call core_abspath,$(1)))))))
--- a/content/smil/Makefile.in
+++ b/content/smil/Makefile.in
@ -14,9 +14,7 @@ LIBRARY_NAME	= gkconsmil_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1

-include $(topsrcdir)/config/config.mk
-
-INCLUDES += 	\
+LOCAL_INCLUDES += 	\
 		-I$(srcdir)/../base/src \
 		-I$(srcdir)/../../layout/style \
 		-I$(srcdir)/../events/src \
--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@ -7,14 +7,14 @@ topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@

+include $(DEPTH)/config/autoconf.mk
+
 LIBRARY_NAME     = dombindings_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY   = 1
 FAIL_ON_WARNINGS := 1

-include $(topsrcdir)/config/config.mk
-
 # Need this to find all our DOM source files.
 include $(topsrcdir)/dom/dom-config.mk

--- a/dom/plugins/base/android/Makefile.in
+++ b/dom/plugins/base/android/Makefile.in
@ -15,8 +15,6 @@ LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1

-include $(topsrcdir)/config/config.mk
-
 LOCAL_INCLUDES += \
  -I$(topsrcdir)/widget/android \
  -I$(topsrcdir)/widget/xpwidgets \
--- a/dom/system/Makefile.in
+++ b/dom/system/Makefile.in
@ -23,8 +23,7 @@ LOCAL_INCLUDES += \
  -I$(topsrcdir)/js/xpconnect/loader \
  $(NULL)

-include $(topsrcdir)/config/config.mk
-
 EXPORT_LIBRARY = 1
+
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/system/android/Makefile.in
+++ b/dom/system/android/Makefile.in
@ -15,8 +15,6 @@ LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1

-include $(topsrcdir)/config/config.mk
-
 LOCAL_INCLUDES  += -I$(topsrcdir)/dom/src/geolocation \
                     -I$(topsrcdir)/content/events/src
                     $(NULL)
--- a/dom/system/mac/Makefile.in
+++ b/dom/system/mac/Makefile.in
@ -15,8 +15,6 @@ LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1

-include $(topsrcdir)/config/config.mk
-
 LOCAL_INCLUDES  += -I$(topsrcdir)/dom/src/geolocation \
                   $(NULL)

--- a/dom/system/unix/Makefile.in
+++ b/dom/system/unix/Makefile.in
@ -15,8 +15,6 @@ LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1

-include $(topsrcdir)/config/config.mk
-
 ifdef MOZ_MAEMO_LIBLOCATION
        LOCAL_INCLUDES  += $(MOZ_PLATFORM_MAEMO_CFLAGS) \
                           -I$(topsrcdir)/dom/src/geolocation \
--- a/extensions/pref/autoconfig/src/Makefile.in
+++ b/extensions/pref/autoconfig/src/Makefile.in
@ -13,9 +13,6 @@ LIBRARY_NAME     = autoconfig
 EXPORT_LIBRARY   = 1
 LIBXUL_LIBRARY   = 1

-
-include $(topsrcdir)/config/config.mk
-
 AUTOCFG_JS_EXPORTS = \
 		$(srcdir)/prefcalls.js \
 		$(NULL)
--- a/ipc/chromium/Makefile.in
+++ b/ipc/chromium/Makefile.in
@ -37,8 +37,6 @@ vpath %.mm \
  $(srcdir)/src/chrome/common \
  $(NULL)

-include $(topsrcdir)/config/config.mk
-
 ifneq ($(OS_ARCH),WINNT) # (if OS_POSIX) {
 ifeq ($(OS_TARGET),Android)
 DEFINES += -DANDROID -D_POSIX_MONOTONIC_CLOCK=0
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@ -149,8 +149,6 @@ else
 SDK_LIBRARY = $(SHARED_LIBRARY)
 endif

-include $(topsrcdir)/config/config.mk
-
 ifeq (,$(MOZ_GLUE_PROGRAM_LDFLAGS))
 # When building standalone, we need to include mfbt sources, and to declare
 # "exported" mfbt symbols on its behalf when we use its headers.
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@ -62,10 +62,9 @@ check-variable = $(if $(filter-out 0 1,$(words $($(x))z)),$(error Spaces are not

 $(foreach x,$(CHECK_VARS),$(check-variable))

-core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))
-core_realpath = $(if $(realpath $(1)),$(realpath $(1)),$(call core_abspath,$(1)))
-
-core_winabspath = $(firstword $(subst /, ,$(call core_abspath,$(1)))):$(subst $(space),,$(patsubst %,\\%,$(wordlist 2,$(words $(subst /, ,$(call core_abspath,$(1)))), $(strip $(subst /, ,$(call core_abspath,$(1)))))))
+ifndef INCLUDED_FUNCTIONS_MK
+include $(topsrcdir)/config/makefiles/functions.mk
+endif

 RM = rm -f

--- a/js/src/config/makefiles/functions.mk
+++ b/js/src/config/makefiles/functions.mk
@ -0,0 +1,22 @@
+#
+# 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/.
+
+#
+# functions.mk
+#
+# Defines functions that are needed by various Makefiles throughout the build
+# system, which are needed before config.mk can be included.
+#
+
+# Define an include-at-most-once flag
+ifdef INCLUDED_FUNCTIONS_MK
+$(error Do not include functions.mk twice!)
+endif
+INCLUDED_FUNCTIONS_MK = 1
+
+core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))
+core_realpath = $(if $(realpath $(1)),$(realpath $(1)),$(call core_abspath,$(1)))
+
+core_winabspath = $(firstword $(subst /, ,$(call core_abspath,$(1)))):$(subst $(space),,$(patsubst %,\\%,$(wordlist 2,$(words $(subst /, ,$(call core_abspath,$(1)))), $(strip $(subst /, ,$(call core_abspath,$(1)))))))
--- a/js/xpconnect/src/Makefile.in
+++ b/js/xpconnect/src/Makefile.in
@ -15,8 +15,6 @@ MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1

-include $(topsrcdir)/config/config.mk
-
 LOCAL_INCLUDES = \
 		-I$(srcdir)/../wrappers \
 		-I$(srcdir)/../loader \
--- a/js/xpconnect/tests/components/js/Makefile.in
+++ b/js/xpconnect/tests/components/js/Makefile.in
@ -21,8 +21,6 @@ JS_FILES = \
  xpctest_params.js \
  $(NULL)

-include $(topsrcdir)/config/config.mk
-
 MANIFEST_FILE = xpctest.manifest

 include $(topsrcdir)/config/rules.mk
--- a/js/xpconnect/tests/components/native/Makefile.in
+++ b/js/xpconnect/tests/components/native/Makefile.in
@ -15,8 +15,6 @@ IS_COMPONENT = 1
 MODULE_NAME = xpconnect_test
 FORCE_SHARED_LIB = 1

-include $(topsrcdir)/config/config.mk
-
 MANIFEST_FILE = xpctest.manifest

 EXTRA_DSO_LDOPTS += \
--- a/security/build/Makefile.in
+++ b/security/build/Makefile.in
@ -20,7 +20,7 @@ endif

 default::

-include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/config/makefiles/functions.mk

 NSS_LIBS = \
  nss3 \
@ -394,8 +394,6 @@ nss3.def: $(NSS_STATIC_LIBS_DEFS) $(DEPTH)/db/sqlite3/src/sqlite-processed.def
 	mv $@.tmp $@
 endif

-# Force the linker to include everything from the static libraries.
-EXPAND_LIBS_EXEC += --extract
 else
 $(NSS_DIST_DLL_FILES) $(NSS_SDK_LIB_FILES): libs-nss/lib
 endif # MOZ_FOLD_LIBS
@ -403,6 +401,9 @@ endif # MOZ_FOLD_LIBS
 include $(topsrcdir)/config/rules.mk

 ifdef MOZ_FOLD_LIBS
+# Force the linker to include everything from the static libraries.
+EXPAND_LIBS_EXEC += --extract
+
 $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS)

 EXTRA_DSO_LDOPTS += $(REALTIME_LIBS)
--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@ -14,8 +14,6 @@ LIBRARY_NAME = toolkitcomps
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1

-include $(topsrcdir)/config/config.mk
-
 LOCAL_INCLUDES = \
  -I$(srcdir)/../alerts \
  -I$(srcdir)/../downloads \
--- a/widget/windows/winrt/Makefile.in
+++ b/widget/windows/winrt/Makefile.in
@ -35,8 +35,6 @@ LOCAL_INCLUDES	= \
 		-I$(topsrcdir)/xpcom/base \
 		$(NULL)

-include $(topsrcdir)/config/config.mk
-
 MIDL_GENERATED_FILES = \
 	UIABridge_i.c \
 	UIABridge_p.c \
--- a/xpcom/reflect/xptcall/src/md/os2/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/os2/Makefile.in
@ -21,8 +21,6 @@ LOCAL_INCLUDES = \
 DEFINES		+= -DMOZ_NEED_LEADING_UNDERSCORE


-include $(topsrcdir)/config/config.mk
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1

--- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
@ -26,8 +26,6 @@ NO_PROFILE_GUIDED_OPTIMIZE = 1
 endif
 endif

-include $(topsrcdir)/config/config.mk
-
 ######################################################################
 # i386 and beyond
 ######################################################################
--- a/xpcom/reflect/xptcall/src/md/win32/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
@ -17,8 +17,6 @@ MOZILLA_INTERNAL_API = 1
 LOCAL_INCLUDES += -I$(srcdir)/../../../../xptinfo/src


-include $(topsrcdir)/config/config.mk
-
 ifneq ($(TARGET_CPU),x86_64)
 ifndef GNU_CXX
 # FIXME: bug 413019
--- a/xpcom/sample/Makefile.in
+++ b/xpcom/sample/Makefile.in
@ -25,7 +25,6 @@ IS_COMPONENT	= 1
 # name specified in NS_IMPL_NSGETMODULE
 MODULE_NAME	= nsSampleModule

-include $(topsrcdir)/config/config.mk

 # EXTRA_DSO_LDOPTS specifies linker flags when building a shared library
 # from this Makefile. We link against the "dependent glue" and against the
--- a/xpcom/tests/bug656331_component/Makefile.in
+++ b/xpcom/tests/bug656331_component/Makefile.in
@ -16,8 +16,6 @@ LIBRARY_NAME	= test656331
 IS_COMPONENT	= 1
 FORCE_SHARED_LIB = 1

-include $(topsrcdir)/config/config.mk
-
 MANIFEST_FILE = bug656331.manifest

 EXTRA_DSO_LDOPTS = \
--- a/xpcom/tests/component/Makefile.in
+++ b/xpcom/tests/component/Makefile.in
@ -14,8 +14,6 @@ LIBRARY_NAME	= testcomponent
 IS_COMPONENT	= 1
 FORCE_SHARED_LIB = 1

-include $(topsrcdir)/config/config.mk
-
 MANIFEST_FILE = testcomponent.manifest

 EXTRA_DSO_LDOPTS = \
--- a/xpcom/tests/component_no_aslr/Makefile.in
+++ b/xpcom/tests/component_no_aslr/Makefile.in
@ -14,8 +14,6 @@ LIBRARY_NAME	= testcompnoaslr
 IS_COMPONENT	= 1
 FORCE_SHARED_LIB = 1

-include $(topsrcdir)/config/config.mk
-
 MANIFEST_FILE = testcompnoaslr.manifest

 EXTRA_DSO_LDOPTS = \
--- a/xpfe/components/build/Makefile.in
+++ b/xpfe/components/build/Makefile.in
@ -14,9 +14,6 @@ LIBRARY_NAME	= appcomps
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY	= 1

-
-include $(topsrcdir)/config/config.mk
-
 # General includes
 SHARED_LIBRARY_LIBS += ../directory/$(LIB_PREFIX)directory_s.$(LIB_SUFFIX)
 LOCAL_INCLUDES += -I$(srcdir)/../directory