Bug 906619 - Part b: move the CSRCS definition in intl/lwbrk/src into moz.build; r=mshal
authorMs2ger <ms2ger@gmail.com>
Thu, 22 Aug 2013 08:56:02 +0200
changeset 143777 169e13a5298583917e430398c8adcd593d814ca5
parent 143776 884ced1e6cb7f056c5b8fd14cacae37a553e23f0
child 143778 40def2576900d22156f631389240e93777b1855d
push id25137
push userMs2ger@gmail.com
push dateThu, 22 Aug 2013 06:58:17 +0000
treeherdermozilla-central@2ab07dec6404 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs906619
milestone26.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 906619 - Part b: move the CSRCS definition in intl/lwbrk/src into moz.build; r=mshal
intl/lwbrk/src/Makefile.in
intl/lwbrk/src/moz.build
--- a/intl/lwbrk/src/Makefile.in
+++ b/intl/lwbrk/src/Makefile.in
@@ -5,29 +5,15 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq  ($(MOZ_WIDGET_TOOLKIT),gtk2)
-else
-ifeq  ($(MOZ_WIDGET_TOOLKIT),gtk3)
-else
-ifeq  ($(MOZ_WIDGET_TOOLKIT),windows)
-else
-ifeq ($(MOZ_WIDGET_TOOLKIT), cocoa)
-else
-CSRCS		= rulebrk.c
-endif
-endif
-endif
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_WIDGET_GTK
 CXXFLAGS	+= \
 		$(MOZ_PANGO_CFLAGS) \
 		$(NULL)
 endif
--- a/intl/lwbrk/src/moz.build
+++ b/intl/lwbrk/src/moz.build
@@ -23,15 +23,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wi
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CPP_SOURCES += [
         'nsCarbonBreaker.cpp',
     ]
 else:
     CPP_SOURCES += [
         'nsRuleBreaker.cpp',
     ]
+    CSRCS += [
+        'rulebrk.c',
+    ]
+
 
 LIBRARY_NAME = 'lwbrk_s'
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True