bug 870406: move to moz.build (config batch #1) r=mshal

UltraBlame original commit: 773937adfcacaafa0aded135ac9b95cc5b93b73c
marco-c · Sep 29, 2019 · 16e51e1 · 16e51e1
1 parent 1f16e1c
commit 16e51e1
Show file tree

Hide file tree

Showing 14 changed files with 94 additions and 10 deletions.
diff --git a/intl/uconv/tools/Makefile.in b/intl/uconv/tools/Makefile.in
@@ -10,11 +10,11 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-CSRCS		= \
+DISABLED_CSRCS		= \
 		umaptable.c \
 		$(NULL)
 
-SIMPLE_PROGRAMS	= $(CSRCS:.c=$(BIN_SUFFIX))
+SIMPLE_PROGRAMS	= $(DISABLED_CSRCS:.c=$(BIN_SUFFIX))
 
 include $(topsrcdir)/config/rules.mk
 

diff --git a/intl/uconv/tools/moz.build b/intl/uconv/tools/moz.build
@@ -4,3 +4,6 @@
 # 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/.
 
+CSRCS += [
+    'umaptable.c',
+]
diff --git a/modules/libmar/tool/Makefile.in b/modules/libmar/tool/Makefile.in
@@ -43,7 +43,7 @@ HOST_CFLAGS += \
 HOST_CSRCS = \
   mar.c \
   $(NULL)
-CSRCS = $(HOST_CSRCS)
+DISABLED_CSRCS = $(HOST_CSRCS)
 
 HOST_LIBS = $(DIST)/host/lib/$(LIB_PREFIX)hostmar.$(LIB_SUFFIX)
 LIBS = $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX)

diff --git a/modules/libmar/tool/moz.build b/modules/libmar/tool/moz.build
@@ -8,3 +8,9 @@ MODULE = 'mar'
 
 if CONFIG['MOZ_ENABLE_SIGNMAR']:
     PROGRAM = 'signmar'
+
+# bug 875549: Temporarly break dep on HOST_CSRCS= so CSRCS can convert.
+host_csrcs = [
+    'mar.c',
+]
+CSRCS += host_csrcs
diff --git a/netwerk/dns/Makefile.in b/netwerk/dns/Makefile.in
@@ -23,7 +23,7 @@ CPPSRCS = \
   nsEffectiveTLDService.cpp \
   $(NULL)
 
-CSRCS = \
+DISABLED_CSRCS = \
   race.c \
   nameprep.c \
   punycode.c \

diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build
@@ -21,3 +21,8 @@ EXPORTS.mozilla.net += [
     'DNS.h',
 ]
 
+CSRCS += [
+    'nameprep.c',
+    'punycode.c',
+    'race.c',
+]
diff --git a/netwerk/sctp/src/Makefile.in b/netwerk/sctp/src/Makefile.in
@@ -25,7 +25,7 @@ CPPSRCS = \
   $(NULL)
 endif
 
-CSRCS = \
+DISABLED_CSRCS = \
   user_environment.c \
   user_mbuf.c \
   user_recv_thread.c \

diff --git a/netwerk/sctp/src/moz.build b/netwerk/sctp/src/moz.build
@@ -12,3 +12,30 @@ EXPORTS.mozilla.net += [
     'usrsctp.h',
 ]
 
+CSRCS += [
+    'sctp6_usrreq.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_timer.c',
+    'sctp_userspace.c',
+    'sctp_usrreq.c',
+    'sctputil.c',
+    'user_environment.c',
+    'user_mbuf.c',
+    'user_recv_thread.c',
+    'user_sctp_timer_iterate.c',
+    'user_socket.c',
+]
diff --git a/netwerk/srtp/src/Makefile.in b/netwerk/srtp/src/Makefile.in
@@ -24,7 +24,7 @@ LIBRARY_NAME = nksrtp_s
 LIBXUL_LIBRARY = 1
 FORCE_STATIC_LIB = 1
 
-CSRCS := \
+DISABLED_CSRCS := \
   ekt.c \
   srtp.c \
   aes.c \

diff --git a/netwerk/srtp/src/moz.build b/netwerk/srtp/src/moz.build
@@ -8,3 +8,29 @@ XPIDL_MODULE = 'necko_srtp'
 
 MODULE = 'necko'
 
+CSRCS += [
+    'aes.c',
+    'aes_cbc.c',
+    'aes_icm.c',
+    'alloc.c',
+    'auth.c',
+    'cipher.c',
+    'crypto_kernel.c',
+    'ctr_prng.c',
+    'datatypes.c',
+    'ekt.c',
+    'err.c',
+    'gf2_8.c',
+    'hmac.c',
+    'key.c',
+    'null_auth.c',
+    'null_cipher.c',
+    'prng.c',
+    'rand_source.c',
+    'rdb.c',
+    'rdbx.c',
+    'sha1.c',
+    'srtp.c',
+    'stat.c',
+    'ut_sim.c',
+]
diff --git a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
@@ -67,7 +67,7 @@ CMMSRCS += \
   mac/dump_syms.mm
 endif
 
-CSRCS = \
+DISABLED_CSRCS = \
   convert_UTF.c \
   $(NULL)
 

diff --git a/toolkit/crashreporter/google-breakpad/src/common/moz.build b/toolkit/crashreporter/google-breakpad/src/common/moz.build
@@ -9,3 +9,6 @@ if CONFIG['OS_ARCH'] in ('Darwin', 'Linux'):
 
 MODULE = 'breakpad_common'
 
+CSRCS += [
+    'convert_UTF.c',
+]
diff --git a/tools/codesighs/Makefile.in b/tools/codesighs/Makefile.in
@@ -11,18 +11,18 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 
-CSRCS += \
+DISABLED_CSRCS += \
 		codesighs.c \
 		maptsvdifftool.c \
 		$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
-CSRCS += \
+DISABLED_CSRCS += \
 		msmap2tsv.c \
 		msdump2symdb.c \
 		$(NULL)
 else
-CSRCS += \
+DISABLED_CSRCS += \
 		nm2tsv.c \
 		$(NULL)
 endif

diff --git a/tools/codesighs/moz.build b/tools/codesighs/moz.build
@@ -4,3 +4,17 @@
 # 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/.
 
+CSRCS += [
+    'codesighs.c',
+    'maptsvdifftool.c',
+]
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    CSRCS += [
+        'msdump2symdb.c',
+        'msmap2tsv.c',
+    ]
+else:
+    CSRCS += [
+        'nm2tsv.c',
+    ]