Bug 897921 - Remove some dead assignments in makefiles; r=mshal

This commit is contained in:
Ms2ger 2013-08-02 09:03:55 +02:00
parent 12e1ffe745
commit a4e67abf5e
28 changed files with 0 additions and 357 deletions

View File

@ -39,8 +39,6 @@ MIDL_GENERATED_FILES = \
ISimpleDOMText_i.c \
$(NULL)
SRCDIR_CSRCS = $(addprefix $(srcdir)/,$(CSRCS))
OS_LIBS = $(call EXPAND_LIBNAME,kernel32 rpcns4 rpcrt4 oleaut32)
$(MIDL_GENERATED_FILES): done_gen

View File

@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk
USE_STATIC_LIBS = 1
DISABLE_SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
LIBS = \
$(XPCOM_STATICRUNTIME_GLUE_LDOPTS) \
$(DIST)/lib/$(LIB_PREFIX)unicharutil_external_s.$(LIB_SUFFIX) \

View File

@ -19,11 +19,6 @@ include $(srcdir)/objs.mk
DIST_INSTALL = 1
SDK_LIBRARY = $(LIBRARY)
DISABLED_SDK_HEADERS = \
nsUnicharUtils.h \
$(NULL)
FORCE_STATIC_LIB = 1
USE_STATIC_LIBS = 1

View File

@ -12,7 +12,5 @@ include $(DEPTH)/config/autoconf.mk
ifeq (WINNT,$(OS_TARGET))
VISIBILITY_FLAGS =
endif
DISABLED_CSRCS = kiss_fft.c kiss_fftr.c
include $(topsrcdir)/config/rules.mk

View File

@ -15,55 +15,30 @@ ifeq ($(OS_TARGET),WINNT)
VISIBILITY_FLAGS =
endif
DISABLED_CSRCS = \
cubeb.c \
$(NULL)
ifeq ($(OS_TARGET),WINNT)
DISABLED_CSRCS += \
cubeb_winmm.c \
$(NULL)
DEFINES += -DUSE_WINMM -DUSE_WASAPI
endif
ifeq ($(OS_TARGET),Android)
ifneq ($(MOZ_WIDGET_TOOLKIT),gonk)
DISABLED_CSRCS += \
cubeb_audiotrack.c \
$(NULL)
DEFINES += -DUSE_AUDIOTRACK
endif
DISABLED_CSRCS += \
cubeb_opensl.c \
$(NULL)
DEFINES += -DUSE_OPENSL
endif
ifeq ($(OS_TARGET),Darwin)
DISABLED_CSRCS += \
cubeb_audiounit.c \
$(NULL)
DEFINES += -DUSE_AUDIOUNIT
endif
ifeq ($(OS_ARCH),OpenBSD)
DISABLED_CSRCS += \
cubeb_sndio.c \
$(NULL)
DEFINES += -DUSE_SNDIO
endif
ifdef MOZ_ALSA
DISABLED_CSRCS += \
cubeb_alsa.c \
$(NULL)
DEFINES += -DUSE_ALSA
endif
ifdef MOZ_PULSEAUDIO
DISABLED_CSRCS += \
cubeb_pulse.c \
$(NULL)
DEFINES += -DUSE_PULSE
ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
DEFINES += -DDISABLE_LIBPULSE_DLOPEN

View File

@ -16,59 +16,6 @@ ifeq ($(OS_ARCH),WINNT)
VISIBILITY_FLAGS =
endif
DISABLED_CSRCS = \
jcomapi.c \
jdapimin.c \
jdapistd.c \
jdatadst.c \
jdatasrc.c \
jdcoefct.c \
jdcolor.c \
jddctmgr.c \
jdhuff.c \
jdinput.c \
jdmainct.c \
jdmarker.c \
jdmaster.c \
jdmerge.c \
jdphuff.c \
jdpostct.c \
jdsample.c \
jdtrans.c \
jerror.c \
jfdctflt.c \
jfdctfst.c \
jfdctint.c \
jidctflt.c \
jidctfst.c \
jidctint.c \
jidctred.c \
jmemmgr.c \
jmemnobs.c \
jquant1.c \
jquant2.c \
jutils.c \
$(NULL)
# These files enable support for writing JPEGs
DISABLED_CSRCS += \
jcapimin.c \
jcapistd.c \
jccoefct.c \
jccolor.c \
jcdctmgr.c \
jchuff.c \
jcinit.c \
jcmainct.c \
jcmarker.c \
jcmaster.c \
jcparam.c \
jcphuff.c \
jcprepct.c \
jcsample.c \
jctrans.c \
$(NULL)
AS=$(LIBJPEG_TURBO_AS)
ASM_SUFFIX=asm
ASFLAGS=$(LIBJPEG_TURBO_ASFLAGS) -I$(topsrcdir)/media/libjpeg/simd/
@ -78,75 +25,6 @@ ifeq ($(AS),yasm)
AS_DASH_C_FLAG=
endif
# No SIMD support?
ifeq (,$(LIBJPEG_TURBO_X86_ASM)$(LIBJPEG_TURBO_X64_ASM)$(LIBJPEG_TURBO_ARM_ASM))
DISABLED_CSRCS += jsimd_none.c
endif
ifeq (1,$(LIBJPEG_TURBO_ARM_ASM))
DISABLED_CSRCS += simd/jsimd_arm.c
endif
ifeq (1,$(LIBJPEG_TURBO_X64_ASM))
DISABLED_CSRCS += simd/jsimd_x86_64.c
DISABLED_ASFILES += \
simd/jccolss2-64.asm \
simd/jcgrass2-64.asm \
simd/jcqnts2f-64.asm \
simd/jcqnts2i-64.asm \
simd/jcsamss2-64.asm \
simd/jdcolss2-64.asm \
simd/jdmerss2-64.asm \
simd/jdsamss2-64.asm \
simd/jfss2fst-64.asm \
simd/jfss2int-64.asm \
simd/jfsseflt-64.asm \
simd/jiss2flt-64.asm \
simd/jiss2fst-64.asm \
simd/jiss2int-64.asm \
simd/jiss2red-64.asm \
$(NULL)
endif
ifeq (1,$(LIBJPEG_TURBO_X86_ASM))
DISABLED_CSRCS +=simd/jsimd_i386.c
DISABLED_ASFILES += \
simd/jccolmmx.asm \
simd/jccolss2.asm \
simd/jcgrammx.asm \
simd/jcgrass2.asm \
simd/jcqnt3dn.asm \
simd/jcqntmmx.asm \
simd/jcqnts2f.asm \
simd/jcqnts2i.asm \
simd/jcqntsse.asm \
simd/jcsammmx.asm \
simd/jcsamss2.asm \
simd/jdcolmmx.asm \
simd/jdcolss2.asm \
simd/jdmermmx.asm \
simd/jdmerss2.asm \
simd/jdsammmx.asm \
simd/jdsamss2.asm \
simd/jf3dnflt.asm \
simd/jfmmxfst.asm \
simd/jfmmxint.asm \
simd/jfss2fst.asm \
simd/jfss2int.asm \
simd/jfsseflt.asm \
simd/ji3dnflt.asm \
simd/jimmxfst.asm \
simd/jimmxint.asm \
simd/jimmxred.asm \
simd/jiss2flt.asm \
simd/jiss2fst.asm \
simd/jiss2int.asm \
simd/jiss2red.asm \
simd/jisseflt.asm \
simd/jsimdcpu.asm \
$(NULL)
endif
# need static lib for some of the libimg componentry to link properly
FORCE_STATIC_LIB = 1

View File

@ -15,9 +15,4 @@ ifeq (WINNT,$(OS_TARGET))
VISIBILITY_FLAGS =
endif
DISABLED_CSRCS = \
nestegg.c \
halloc.c \
$(NULL)
include $(topsrcdir)/config/rules.mk

View File

@ -15,9 +15,4 @@ ifeq (WINNT,$(OS_TARGET))
VISIBILITY_FLAGS =
endif
DISABLED_CSRCS = \
ogg_bitwise.c \
ogg_framing.c \
$(NULL)
include $(topsrcdir)/config/rules.mk

View File

@ -18,13 +18,7 @@ endif
DEFINES += -DMOZ_MEMORY_IMPL
DISABLED_CSRCS = \
mozmemory_wrap.c \
jemalloc_config.c \
$(NULL)
ifdef MOZ_JEMALLOC3
DISABLED_CSRCS += mozjemalloc_compat.c
LOCAL_INCLUDES += -I../jemalloc/src/include
ifdef _MSC_VER
LOCAL_INCLUDES += -I$(topsrcdir)/memory/jemalloc/src/include/msvc_compat
@ -39,7 +33,6 @@ endif
ifdef MOZ_REPLACE_MALLOC
DEFINES += -DMOZ_REPLACE_MALLOC
DISABLED_CSRCS += replace_malloc.c
# The zone allocator for OSX needs some jemalloc internal functions
ifeq (Darwin,$(OS_TARGET))

View File

@ -17,13 +17,6 @@ SDK_LIBRARY = $(REAL_LIBRARY)
DIST_INSTALL = 1
endif
DISABLED_CSRCS := $(notdir $(wildcard $(srcdir)/src/src/*.c))
# Only OSX needs the zone allocation implementation, but only if
# replace-malloc is not enabled.
ifneq ($(OS_TARGET)$(MOZ_REPLACE_MALLOC),Darwin)
DISABLED_CSRCS := $(filter-out zone.c,$(CSRCS))
endif
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES += \

View File

@ -11,8 +11,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifndef MOZ_JEMALLOC3
DISABLED_CSRCS = jemalloc.c
FORCE_STATIC_LIB= 1
ifeq ($(OS_ARCH),SunOS)

View File

@ -17,8 +17,6 @@ DEFINES += -DMOZ_NO_MOZALLOC
VPATH += $(topsrcdir)/xpcom/base
VPATH += $(topsrcdir)/nsprpub/lib/libc/src
DISABLED_CSRCS += strcpy.c
VPATH += $(topsrcdir)/mfbt
# Disable mozglue.

View File

@ -11,6 +11,4 @@ include $(DEPTH)/config/autoconf.mk
FORCE_SHARED_LIB = 1
DISABLED_CSRCS = dummy_replace_malloc.c
include $(topsrcdir)/config/rules.mk

View File

@ -20,19 +20,7 @@ endif
VPATH += $(topsrcdir)/memory/build
DISABLED_CSRCS = \
mozjemalloc_compat.c \
jemalloc_config.c \
$(NULL)
MOZ_GLUE_LDFLAGS = # Don't link against mozglue
WRAP_LDFLAGS = # Never wrap malloc function calls with -Wl,--wrap
# Android doesn't have pthread_atfork, so just implement a dummy function.
# It shouldn't make much problem, as the use of fork is pretty limited on
# Android.
ifeq ($(MOZ_WIDGET_TOOLKIT),android)
DISABLED_CSRCS += pthread_atfork.c
endif
include $(topsrcdir)/config/rules.mk

View File

@ -40,8 +40,6 @@ HOST_CFLAGS += \
$(DEFINES) \
$(NULL)
DISABLED_CSRCS = $(HOST_CSRCS)
HOST_LIBS = $(DIST)/host/lib/$(LIB_PREFIX)hostmar.$(LIB_SUFFIX)
LIBS = $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX)

View File

@ -14,12 +14,6 @@ MSVC_ENABLE_PGO := 1
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS := 1
DISABLED_CSRCS = \
race.c \
nameprep.c \
punycode.c \
$(NULL)
# need to include etld_data.inc
LOCAL_INCLUDES = \
-I$(srcdir)/../base/src \

View File

@ -18,34 +18,6 @@ LIBRARY_NAME = nksctp_s
LIBXUL_LIBRARY = 1
NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO
DISABLED_CSRCS = \
user_environment.c \
user_mbuf.c \
user_recv_thread.c \
user_sctp_timer_iterate.c \
user_socket.c \
sctp_asconf.c \
sctp_auth.c \
sctp_bsd_addr.c \
sctp_callout.c \
sctp_cc_functions.c \
sctp_crc32.c \
sctp_hashdriver.c \
sctp_indata.c \
sctp_input.c \
sctp_output.c \
sctp_pcb.c \
sctp_peeloff.c \
sctp_sha1.c \
sctp_ss_functions.c \
sctp_sysctl.c \
sctp_userspace.c \
sctp_timer.c \
sctp_usrreq.c \
sctputil.c \
sctp6_usrreq.c \
$(NULL)
LOCAL_INCLUDES = \
-I$(srcdir)/../../base/src \
-I$(topsrcdir)/content/base/src \

View File

@ -23,33 +23,6 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = nksrtp_s
LIBXUL_LIBRARY = 1
DISABLED_CSRCS := \
ekt.c \
srtp.c \
aes.c \
aes_cbc.c \
aes_icm.c \
cipher.c \
null_cipher.c \
auth.c \
hmac.c \
null_auth.c \
sha1.c \
alloc.c \
crypto_kernel.c \
err.c \
key.c \
datatypes.c \
gf2_8.c \
stat.c \
rdb.c \
rdbx.c \
ut_sim.c \
ctr_prng.c \
prng.c \
rand_source.c \
$(NULL)
LOCAL_INCLUDES = \
-I$(srcdir)/include \
-I$(srcdir)/crypto/include \

View File

@ -12,8 +12,4 @@ include $(DEPTH)/config/autoconf.mk
LIBXUL_LIBRARY = 1
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
DISABLE_CMMSRCS += nsUserInfoMac.mm
endif
include $(topsrcdir)/config/rules.mk

View File

@ -38,10 +38,6 @@ HOST_CPPSRCS = \
endif
endif
DISABLED_CSRCS = \
convert_UTF.c \
$(NULL)
ifeq ($(OS_TARGET),Android)
VPATH += $(srcdir)/android
TARGET_LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include/

View File

@ -27,24 +27,6 @@ endif
endif #if OS_ARCH == WINNT
DISABLED_SDK_HEADERS = \
nsAutoPtr.h \
nsError.h \
ErrorList.h \
ErrorListCxxDefines.h \
ErrorListCDefines.h \
nsISupportsBase.h \
nscore.h \
nsCycleCollector.h \
nsObjCExceptions.h \
ifeq ($(OS_ARCH),WINNT)
DISABLED_SDK_HEADERS += \
nsWindowsHelpers.h \
$(NULL)
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

View File

@ -59,11 +59,6 @@ LOCAL_INCLUDES = \
-I$(srcdir)/../../docshell/base \
$(NULL)
DISABLED_SDK_HEADERS = \
nsXPCOM.h \
nsXPCOMCID.h \
$(NULL)
GARBAGE += $(XPCOM_GLUE_SRC_LCPPSRCS) $(XPCOM_GLUENS_SRC_LCPPSRCS)
include $(topsrcdir)/config/config.mk

View File

@ -19,52 +19,6 @@ LOCAL_INCLUDES = \
-I$(srcdir)/../build \
$(NULL)
DISABLED_SDK_HEADERS = \
nsArrayEnumerator.h \
nsArrayUtils.h \
nsBaseHashtable.h \
nsCOMArray.h \
nsCOMPtr.h \
nsCRTGlue.h \
nsCategoryCache.h \
nsClassHashtable.h \
nsComponentManagerUtils.h \
nsCycleCollectionParticipant.h \
nsCycleCollectorUtils.h \
nsDataHashtable.h \
nsDebug.h \
nsDeque.h \
nsEnumeratorUtils.h \
nsHashKeys.h \
nsIClassInfoImpl.h \
nsID.h \
nsIInterfaceRequestorUtils.h \
nsINIParser.h \
nsISupportsImpl.h \
nsISupportsUtils.h \
nsIWeakReferenceUtils.h \
nsInterfaceHashtable.h \
nsJSThingHashtable.h \
nsMemory.h \
nsQuickSort.h \
nsRefPtrHashtable.h \
nsServiceManagerUtils.h \
nsStringAPI.h \
nsStringGlue.h \
nsTArray.h \
nsTArray-inl.h \
nsTArrayForwardDeclare.h \
nsTHashtable.h \
nsTObserverArray.h \
nsTWeakRef.h \
nsTextFormatter.h \
nsTraceRefcnt.h \
nsVersionComparator.h \
nsVoidArray.h \
nsWeakReference.h \
pldhash.h \
$(NULL)
SDK_LIBRARY = \
$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
$(NULL)

View File

@ -19,10 +19,6 @@ LOCAL_INCLUDES = \
-I$(srcdir)/../../build \
$(NULL)
DISABLED_SDK_HEADERS = \
nsXPCOMGlue.h \
$(NULL)
SDK_LIBRARY = \
$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
$(NULL)

View File

@ -22,12 +22,6 @@ MODULE_OPTIMIZE_FLAGS = $(MOZ_OPTIMIZE_FLAGS) -fno-strict-aliasing
endif
endif
DISABLED_SDK_HEADERS = \
nsDirectoryServiceDefs.h \
nsDirectoryServiceUtils.h \
$(NULL)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

View File

@ -10,8 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DISABLED_SIMPLE_PROGRAMS = TestInterfaceInfo$(BIN_SUFFIX)
LIBS = \
$(XPCOM_GLUE_LDOPTS) \
$(NSPR_LIBS) \

View File

@ -10,9 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
# SIMPLE_PROGRAMS compiles a single .cpp file into an executable
DISABLED_SIMPLE_PROGRAMS = nsTestSample$(BIN_SUFFIX)
# LIBS specifies linker flags when building an executable program from
# this Makefile. We link against the "standalone glue" which does not require
# that the application be linked against the XPCOM dynamic library or the NSPR

View File

@ -10,8 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DISABLED_SIMPLE_PROGRAMS = windbgdlg$(BIN_SUFFIX)
MOZ_WINCONSOLE = 0
include $(topsrcdir)/config/rules.mk