Bug 677159 - Don't allow to include config/config.mk twice. r=khuey
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 09 Aug 2011 09:07:48 +0200
changeset 74085 d39783167bb97a9d0b61ed728ce103fcfa9cfadf
parent 74084 1b052a519dd9cb0dfb7f8916f6d6cb871667d98a
child 74086 89842a2a40c66e1cdd92399950a3274b0c41a0b8
push id2
push userbsmedberg@mozilla.com
push dateFri, 19 Aug 2011 14:38:13 +0000
reviewerskhuey
bugs677159
milestone8.0a1
Bug 677159 - Don't allow to include config/config.mk twice. r=khuey
config/config.mk
js/src/config/config.mk
toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in
--- a/config/config.mk
+++ b/config/config.mk
@@ -40,19 +40,19 @@
 # config.mk
 #
 # Determines the platform and builds the macros needed to load the
 # appropriate platform-specific .mk file, then defines all (most?)
 # of the generic macros.
 #
 
 # Define an include-at-most-once flag
-#ifdef INCLUDED_CONFIG_MK
-#$(error Don't include config.mk twice!)
-#endif
+ifdef INCLUDED_CONFIG_MK
+$(error Don't include config.mk twice!)
+endif
 INCLUDED_CONFIG_MK = 1
 
 EXIT_ON_ERROR = set -e; # Shell loops continue past errors without this.
 
 ifndef topsrcdir
 topsrcdir	= $(DEPTH)
 endif
 
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -40,19 +40,19 @@
 # config.mk
 #
 # Determines the platform and builds the macros needed to load the
 # appropriate platform-specific .mk file, then defines all (most?)
 # of the generic macros.
 #
 
 # Define an include-at-most-once flag
-#ifdef INCLUDED_CONFIG_MK
-#$(error Don't include config.mk twice!)
-#endif
+ifdef INCLUDED_CONFIG_MK
+$(error Don't include config.mk twice!)
+endif
 INCLUDED_CONFIG_MK = 1
 
 EXIT_ON_ERROR = set -e; # Shell loops continue past errors without this.
 
 ifndef topsrcdir
 topsrcdir	= $(DEPTH)
 endif
 
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in
@@ -53,12 +53,11 @@ CPPSRCS		=				\
   $(NULL)
 
 # need static lib
 FORCE_STATIC_LIB = 1
 FORCE_USE_PIC = 1
 
 include $(topsrcdir)/config/rules.mk
 ifeq ($(OS_ARCH),Linux)
-include $(topsrcdir)/config/config.mk
 # need this to suppress errors when compiling common/linux/eintr_wrapper.h
 OS_CXXFLAGS := $(filter-out -pedantic,$(OS_CXXFLAGS))
 endif