Bug 922974 - Replace NO_INSTALL with NO_DIST_INSTALL. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 03 Oct 2013 05:51:15 +0900
changeset 149762 c9d0dc574767a9ad61e7b997490d699a040a24df
parent 149761 de230ed86e9cc8d455525c614d30d43e8c5683b3
child 149763 3cf52700118c3660e180bb5af51280fe0c33745b
push id25401
push userphilringnalda@gmail.com
push dateThu, 03 Oct 2013 14:59:30 +0000
treeherdermozilla-central@51b36c5fd45f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs922974
milestone27.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 922974 - Replace NO_INSTALL with NO_DIST_INSTALL. r=gps
config/Makefile.in
config/moz.build
dom/plugins/test/testplugin/moz.build
dom/plugins/test/testplugin/testplugin.mk
dom/plugins/test/testplugin/testplugin.mozbuild
js/src/config/Makefile.in
js/src/config/moz.build
media/omx-plugin/Makefile.in
media/omx-plugin/froyo/Makefile.in
media/omx-plugin/gb/Makefile.in
media/omx-plugin/gb235/Makefile.in
media/omx-plugin/hc/Makefile.in
media/omx-plugin/lib/froyo/libstagefright/Makefile.in
media/omx-plugin/lib/gb/libstagefright/Makefile.in
media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in
media/omx-plugin/lib/gb/libutils/Makefile.in
media/omx-plugin/lib/gb235/libstagefright/Makefile.in
media/omx-plugin/lib/hc/libstagefright/Makefile.in
media/omx-plugin/lib/ics/libstagefright/Makefile.in
media/omx-plugin/lib/ics/libutils/Makefile.in
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -29,19 +29,16 @@ override NSBUILDROOT :=
 endif
 
 ifdef GNU_CC
 MODULE_OPTIMIZE_FLAGS = -O3
 endif
 
 include $(topsrcdir)/config/config.mk
 
-# Do not install util programs
-NO_INSTALL=1
-
 ifneq (WINNT,$(HOST_OS_ARCH))
 # Ensure nsinstall is atomically created
 nsinstall$(HOST_BIN_SUFFIX): $(HOST_PROGRAM)
 	cp $^ $@.tmp
 	mv $@.tmp $@
 
 NSINSTALL_FILES := nsinstall$(HOST_BIN_SUFFIX)
 NSINSTALL_DEST := $(DIST)/bin
--- a/config/moz.build
+++ b/config/moz.build
@@ -1,14 +1,16 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
+NO_DIST_INSTALL = True
+
 CONFIGURE_SUBST_FILES += [
     'autoconf.mk',
     'doxygen.cfg',
     'emptyvars.mk',
     'makefiles/test/Makefile',
     'tests/makefiles/autodeps/Makefile',
     'tests/src-simple/Makefile',
 ]
--- a/dom/plugins/test/testplugin/moz.build
+++ b/dom/plugins/test/testplugin/moz.build
@@ -2,16 +2,15 @@
 # vim: set filetype=python:
 # 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/.
 
 DIRS += ['secondplugin']
 
 MODULE = 'nptest'
-NO_DIST_INSTALL = True
 
 LIBRARY_NAME = 'nptest'
 
 FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
 
 relative_path = '.'
 include('testplugin.mozbuild')
--- a/dom/plugins/test/testplugin/testplugin.mk
+++ b/dom/plugins/test/testplugin/testplugin.mk
@@ -6,19 +6,16 @@
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; nptest isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; nptest isn't Gecko code
 USE_STATIC_LIBS = 1
 
-# Need to custom install plugins
-NO_INSTALL = 1
-
 VPATH += $(topsrcdir)/build
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
 include $(topsrcdir)/config/config.mk
 CXXFLAGS        += $(MOZ_QT_CFLAGS)
 CFLAGS          += $(MOZ_QT_CFLAGS)
 EXTRA_DSO_LDOPTS = \
                 $(MOZ_QT_LIBS) \
--- a/dom/plugins/test/testplugin/testplugin.mozbuild
+++ b/dom/plugins/test/testplugin/testplugin.mozbuild
@@ -1,14 +1,16 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
+NO_DIST_INSTALL = True
+
 CPP_SOURCES += [
     relative_path + '/nptest.cpp',
     relative_path + '/nptest_utils.cpp',
     'nptest_name.cpp',
 ]
 
 toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
 if toolkit == 'cocoa':
--- a/js/src/config/Makefile.in
+++ b/js/src/config/Makefile.in
@@ -18,19 +18,16 @@ override NSBUILDROOT :=
 endif
 
 ifdef GNU_CC
 MODULE_OPTIMIZE_FLAGS = -O3
 endif
 
 include $(topsrcdir)/config/config.mk
 
-# Do not install util programs
-NO_INSTALL=1
-
 # Force wrap zlib system header if building js as a shared library.
 ifneq (,$(JS_SHARED_LIBRARY)$(MOZ_NATIVE_ZLIB))
 DEFINES += -DMOZ_NATIVE_ZLIB=1
 endif
 
 ifneq (WINNT,$(HOST_OS_ARCH))
 # Ensure nsinstall is atomically created
 nsinstall$(HOST_BIN_SUFFIX): $(HOST_PROGRAM)
--- a/js/src/config/moz.build
+++ b/js/src/config/moz.build
@@ -1,12 +1,13 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
+NO_DIST_INSTALL = True
 
 if CONFIG['HOST_OS_ARCH'] != 'WINNT':
     HOST_CSRCS += [
         'nsinstall.c',
         'pathsub.c',
     ]
--- a/media/omx-plugin/Makefile.in
+++ b/media/omx-plugin/Makefile.in
@@ -16,19 +16,16 @@ MODULE_NAME = omxplugin
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
-# Need to custom install OMX media plugin
-NO_INSTALL = 1
-
 include $(topsrcdir)/config/rules.mk
 
 ifdef GNU_CXX
 # Stagefright header files define many multichar constants.
 CXXFLAGS += -Wno-multichar
 endif
 
 INCLUDES        += \
--- a/media/omx-plugin/froyo/Makefile.in
+++ b/media/omx-plugin/froyo/Makefile.in
@@ -16,19 +16,16 @@ MODULE_NAME = omxpluginfroyo
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
-# Need to custom install OMX media plugin
-NO_INSTALL = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES        += \
                 -I$(srcdir)/../../../content/media/plugins \
                 $(NULL)
 
 EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
--- a/media/omx-plugin/gb/Makefile.in
+++ b/media/omx-plugin/gb/Makefile.in
@@ -16,19 +16,16 @@ MODULE_NAME = omxplugingb
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
-# Need to custom install OMX media plugin
-NO_INSTALL = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES        += \
                 -I$(srcdir)/../../../content/media/plugins \
                 $(NULL)
 
 EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
--- a/media/omx-plugin/gb235/Makefile.in
+++ b/media/omx-plugin/gb235/Makefile.in
@@ -16,19 +16,16 @@ MODULE_NAME = omxplugingb235
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
-# Need to custom install OMX media plugin
-NO_INSTALL = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES        += \
                 -I$(srcdir)/../../../content/media/plugins \
                 $(NULL)
 
 EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
--- a/media/omx-plugin/hc/Makefile.in
+++ b/media/omx-plugin/hc/Makefile.in
@@ -16,19 +16,16 @@ MODULE_NAME = omxpluginhc
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
-# Need to custom install OMX media plugin
-NO_INSTALL = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES        += \
                 -I$(srcdir)/../../../content/media/plugins \
                 $(NULL)
 
 EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
--- a/media/omx-plugin/lib/froyo/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/froyo/libstagefright/Makefile.in
@@ -15,19 +15,16 @@ MODULE_NAME = libandroidstagefrightfroyo
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
-# Need to custom install OMX media plugin
-NO_INSTALL = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES        += \
                 -I$(topsrcdir)/media/omx-plugin/include/froyo \
                 -I$(topsrcdir)/media/omx-plugin/include/froyo/media/stagefright/openmax \
                 $(NULL)
 
 EXTRA_DSO_LDOPTS += \
--- a/media/omx-plugin/lib/gb/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/gb/libstagefright/Makefile.in
@@ -15,19 +15,16 @@ MODULE_NAME = libandroidstagefrightgb
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
-# Need to custom install OMX media plugin
-NO_INSTALL = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES        += \
                 -I$(topsrcdir)/media/omx-plugin/include/gb \
                 -I$(topsrcdir)/media/omx-plugin/include/gb/media/stagefright/openmax \
                 $(NULL)
 
 EXTRA_DSO_LDOPTS += \
--- a/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in
+++ b/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in
@@ -15,19 +15,16 @@ MODULE_NAME = libstagefright_color_conve
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
-# Need to custom install OMX media plugin
-NO_INSTALL = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES        += \
                 -I$(topsrcdir)/media/omx-plugin/include/gb \
                 -I$(topsrcdir)/media/omx-plugin/include/gb/media/stagefright/openmax \
                 $(NULL)
 
 # EXTRA_DSO_LDOPTS += \
--- a/media/omx-plugin/lib/gb/libutils/Makefile.in
+++ b/media/omx-plugin/lib/gb/libutils/Makefile.in
@@ -15,17 +15,14 @@ MODULE_NAME = libandroidutilsgb
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
-# Need to custom install OMX media plugin
-NO_INSTALL = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES        += \
                 -I$(topsrcdir)/media/omx-plugin/include/gb \
                 -I$(topsrcdir)/media/omx-plugin/include/gb/media/stagefright/openmax \
                 $(NULL)
--- a/media/omx-plugin/lib/gb235/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/gb235/libstagefright/Makefile.in
@@ -15,19 +15,16 @@ MODULE_NAME = libandroidstagefrightgb234
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
-# Need to custom install OMX media plugin
-NO_INSTALL = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES        += \
                 -I$(topsrcdir)/media/omx-plugin/include/gb \
                 -I$(topsrcdir)/media/omx-plugin/include/gb/media/stagefright/openmax \
                 $(NULL)
 
 EXTRA_DSO_LDOPTS += \
--- a/media/omx-plugin/lib/hc/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/hc/libstagefright/Makefile.in
@@ -15,19 +15,16 @@ MODULE_NAME = libandroidstagefrighthc
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
-# Need to custom install OMX media plugin
-NO_INSTALL = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES        += \
                 -I$(topsrcdir)/media/omx-plugin/include/gb \
                 -I$(topsrcdir)/media/omx-plugin/include/gb/media/stagefright/openmax \
                 $(NULL)
 
 EXTRA_DSO_LDOPTS += \
--- a/media/omx-plugin/lib/ics/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/ics/libstagefright/Makefile.in
@@ -15,19 +15,16 @@ MODULE_NAME = libandroidstagefright
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
-# Need to custom install OMX media plugin
-NO_INSTALL = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES        += \
                 -I$(topsrcdir)/media/omx-plugin/include/ics \
                 -I$(topsrcdir)/media/omx-plugin/include/ics/media/stagefright/openmax \
                 $(NULL)
 
 EXTRA_DSO_LDOPTS += \
--- a/media/omx-plugin/lib/ics/libutils/Makefile.in
+++ b/media/omx-plugin/lib/ics/libutils/Makefile.in
@@ -15,17 +15,14 @@ MODULE_NAME = libandroidutils
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
-# Need to custom install OMX media plugin
-NO_INSTALL = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES        += \
                 -I$(topsrcdir)/media/omx-plugin/include/ics \
                 -I$(topsrcdir)/media/omx-plugin/include/ics/media/stagefright/openmax \
                 $(NULL)