Bug 1368699 - Pre: Remove MY_{CONFIG,RULES} Makefile customization hooks. r=gps
I very much doubt these are used, but even if we are -- we shouldn't
support this type of local customization, since it doesn't extend to
non-Make-based backends.
With the customization point removed, there's no way to set ETAGS, so
we remove what little support there was for generating Emacs tags.
MozReview-Commit-ID: IEF2Q4tISEn
--- a/config/config.mk
+++ b/config/config.mk
@@ -175,22 +175,16 @@ MAKE_JARS_FLAGS = \
ifdef USE_EXTENSION_MANIFEST
MAKE_JARS_FLAGS += -e
endif
TAR_CREATE_FLAGS = -chf
#
-# Personal makefile customizations go in these optional make include files.
-#
-MY_CONFIG := $(DEPTH)/config/myconfig.mk
-MY_RULES := $(DEPTH)/config/myrules.mk
-
-#
# Default command macros; can be overridden in <arch>.mk.
#
CCC = $(CXX)
INCLUDES = \
-I$(srcdir) \
-I$(CURDIR) \
$(LOCAL_INCLUDES) \
@@ -291,21 +285,17 @@ ifdef MOZ_ASAN
WIN32_EXE_LDFLAGS += -STACK:6291456
else
# set stack to 2MB on x64 build. See bug 582910
WIN32_EXE_LDFLAGS += -STACK:2097152
endif
endif
endif
-#
-# Include any personal overrides the user might think are needed.
-#
-include $(topsrcdir)/$(MOZ_BUILD_APP)/app-config.mk
--include $(MY_CONFIG)
######################################################################
GARBAGE += $(DEPENDENCIES) core $(wildcard core.[0-9]*) $(wildcard *.err) $(wildcard *.pure) $(wildcard *_pure_*.o) Templates.DB
ifeq ($(OS_ARCH),Darwin)
ifndef NSDISTMODE
NSDISTMODE=absolute_symlink
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1339,29 +1339,16 @@ MDDEPEND_FILES := $(strip $(wildcard $(
ifneq (,$(MDDEPEND_FILES))
-include $(MDDEPEND_FILES)
endif
#############################################################################
-include $(topsrcdir)/$(MOZ_BUILD_APP)/app-rules.mk
--include $(MY_RULES)
-
-#
-# Generate Emacs tags in a file named TAGS if ETAGS was set in $(MY_CONFIG)
-# or in $(MY_RULES)
-#
-ifdef ETAGS
-ifneq ($(CSRCS)$(CPPSRCS)$(HEADERS),)
-all:: TAGS
-TAGS:: $(CSRCS) $(CPPSRCS) $(HEADERS)
- $(ETAGS) $(CSRCS) $(CPPSRCS) $(HEADERS)
-endif
-endif
################################################################################
# Install/copy rules
#
# The INSTALL_TARGETS variable contains a list of all install target
# categories. Each category defines a list of files and executables, and an
# install destination,
#
