Bug 1259554 - Remove INSTALL/PP_TARGETS from build/Makefile.in; r=ted
authorMike Shal <mshal@mozilla.com>
Mon, 21 Mar 2016 11:45:03 -0400
changeset 291223 4030e1cd45b9abdbff070aa2302c22060d49f3f0
parent 291222 9861363aaea9d0edd375f61522b058ab179543bb
child 291224 efbef8878c9f7568b872399574efd7c6c72467e5
push id30130
push userkwierso@gmail.com
push dateFri, 01 Apr 2016 22:29:37 +0000
treeherdermozilla-central@b6ea6a3bb8a6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1259554
milestone48.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 1259554 - Remove INSTALL/PP_TARGETS from build/Makefile.in; r=ted The lone remaining INSTALL_TARGETS is for moztt, which relies on including a Makefile from that repository. We could potentially add a mozbuild file there instead. MozReview-Commit-ID: FXJDg3xPW1x
build/Makefile.in
build/moz.build
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -7,63 +7,24 @@ USE_RCS_MK := 1
 include $(topsrcdir)/config/makefiles/makeutils.mk
 
 ifdef MOZ_APP_BASENAME
 APP_INI_DEPS = $(topsrcdir)/config/milestone.txt
 
 APP_INI_DEPS += $(DEPTH)/config/autoconf.mk
 endif
 
-# NOTE: Keep .gdbinit in the topsrcdir for people who run gdb from the topsrcdir.
-# needs to be absolute to be distinct from $(topsrcdir)/.gdbinit
-GDBINIT_OBJDIR_FILES = $(topsrcdir)/.gdbinit
-GDBINIT_OBJDIR_DEST = $(topobjdir)
-INSTALL_TARGETS += GDBINIT_OBJDIR
-
-# Put a .lldbinit in the bin directory and the objdir, to be picked up
-# automatically by LLDB when we debug executables using either of those two
-# directories as the current working directory.  The .lldbinit file will
-# load $(topsrcdir)/.lldbinit, which is where the actual debugging commands are.
-LLDBINIT_OBJDIR := .lldbinit.in
-LLDBINIT_OBJDIR_PATH = $(DEPTH)
-LLDBINIT_OBJDIR_FLAGS += -Dtopsrcdir=$(abspath $(topsrcdir))
-PP_TARGETS += LLDBINIT_OBJDIR
-
-LLDBINIT_FINAL_TARGET_FILES := $(DEPTH)/.lldbinit
-LLDBINIT_FINAL_TARGET_DEST = $(FINAL_TARGET)
-INSTALL_TARGETS += LLDBINIT_FINAL_TARGET
-
-# Put the .ycm_extra_conf.py file at the root of the objdir. It is used by
-# the vim plugin YouCompleteMe.
-YCM_FILES := $(topsrcdir)/.ycm_extra_conf.py
-YCM_DEST := $(topobjdir)
-YCM_TARGET := export
-INSTALL_TARGETS += YCM
-
 ifdef MOZTTDIR
 # Install the Firefox OS fonts.
 include $(MOZTTDIR)/fonts.mk
 MOZTT_DEST = $(FINAL_TARGET)/fonts
 MOZTT_FILES = $(patsubst external/moztt/%,$(MOZTTDIR)/%,$(filter external/moztt/%,$(subst :, ,$(PRODUCT_COPY_FILES))))
 INSTALL_TARGETS += MOZTT
 endif
 
-ifdef MOZ_VALGRIND
-_VALGRIND_DIR = $(DEPTH)/_valgrind
-GARBAGE_DIRS += $(_VALGRIND_DIR)
-
-_VALGRIND_FILES = \
-		$(topsrcdir)/build/valgrind/cross-architecture.sup \
-		$(topsrcdir)/build/valgrind/i386-redhat-linux-gnu.sup \
-		$(topsrcdir)/build/valgrind/x86_64-redhat-linux-gnu.sup \
-		$(NULL)
-_VALGRIND_DEST = $(_VALGRIND_DIR)
-INSTALL_TARGETS += _VALGRIND
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 TARGET_DEPTH = ..
 include $(srcdir)/automation-build.mk
 
 ifdef MOZ_APP_BASENAME
 $(FINAL_TARGET)/application.ini: $(APP_INI_DEPS)
 
--- a/build/moz.build
+++ b/build/moz.build
@@ -66,8 +66,30 @@ if CONFIG['MOZ_ASAN'] and CONFIG['CLANG_
     FINAL_TARGET_FILES += ['%' + CONFIG['MOZ_CLANG_RT_ASAN_LIB_PATH']]
 
 if CONFIG['MOZ_APP_BASENAME']:
     FINAL_TARGET_PP_FILES += ['application.ini']
     if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android' and CONFIG['MOZ_UPDATER']:
         FINAL_TARGET_PP_FILES += ['update-settings.ini']
 
 DEFINES['TOPOBJDIR'] = TOPOBJDIR
+
+# NOTE: Keep .gdbinit in the topsrcdir for people who run gdb from the topsrcdir.
+OBJDIR_FILES += ['/.gdbinit']
+
+# Put a .lldbinit in the bin directory and the objdir, to be picked up
+# automatically by LLDB when we debug executables using either of those two
+# directories as the current working directory.  The .lldbinit file will
+# load $(topsrcdir)/.lldbinit, which is where the actual debugging commands are.
+DEFINES['topsrcdir'] = TOPSRCDIR
+FINAL_TARGET_PP_FILES += ['.lldbinit.in']
+OBJDIR_FILES += ['!/dist/bin/.lldbinit']
+
+# Put the .ycm_extra_conf.py file at the root of the objdir. It is used by
+# the vim plugin YouCompleteMe.
+OBJDIR_FILES += ['/.ycm_extra_conf.py']
+
+if CONFIG['MOZ_VALGRIND']:
+    OBJDIR_FILES._valgrind += [
+        'valgrind/cross-architecture.sup',
+        'valgrind/i386-redhat-linux-gnu.sup',
+        'valgrind/x86_64-redhat-linux-gnu.sup',
+    ]