Bug 1135654 - part 4 - remove libs:: rule for installing Valgrind suppressions in favor of INSTALL_TARGETS; r=mshal
authorNathan Froyd <froydnj@mozilla.com>
Mon, 23 Feb 2015 08:38:50 -0500
changeset 230603 e847b1ee714d2594ad858cbec2caf673b5567991
parent 230602 e8ec9655dce6c3a0af0b48e311d66291d643a990
child 230604 99af18fdfdfea3ee2e24976a4a481648520f54af
push id28332
push usercbook@mozilla.com
push dateWed, 25 Feb 2015 11:06:35 +0000
treeherdermozilla-central@6608e0605dfc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1135654
milestone39.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 1135654 - part 4 - remove libs:: rule for installing Valgrind suppressions in favor of INSTALL_TARGETS; r=mshal
build/Makefile.in
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -64,16 +64,29 @@ INSTALL_TARGETS += LLDBINIT_FINAL_TARGET
 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)
 
@@ -82,25 +95,11 @@ application.ini.h: appini_header.py $(FI
 	$(PYTHON) $^ > $@
 export:: application.ini.h
 GARBAGE += application.ini.h
 endif
 endif
 
 libs:: automation.py
 
-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)
-
-libs:: $(_VALGRIND_FILES)
-	$(INSTALL) $^ $(_VALGRIND_DIR)
-endif
-
 ifdef ENABLE_TESTS
 GARBAGE += $(srcdir)/automationutils.pyc
 endif # ENABLE_TESTS