Bug 523576: Build nsSMILKeySpline even when SMIL is disabled, since the CSS transitions code needs it. r=roc

content/Makefile.in

@@ -43,12 +43,10 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= content
-PARALLEL_DIRS		= base canvas html xml xul xbl xslt
+PARALLEL_DIRS		= base canvas events html smil xml xul xbl xslt
 
 ifdef MOZ_MEDIA
-PARALLEL_DIRS	+= \
-		media \
-		$(NULL)
+PARALLEL_DIRS	+= media
 endif
 
 ifdef MOZ_SVG
@@ -59,16 +57,10 @@ ifdef MOZ_XTF
 PARALLEL_DIRS   += xtf
 endif
 
-ifdef MOZ_SMIL
-PARALLEL_DIRS	+= smil
-endif
-
 ifdef MOZ_MATHML
 PARALLEL_DIRS   += mathml
 endif
 
-PARALLEL_DIRS   += events
-
 ifdef ENABLE_TESTS
 TOOL_DIRS += test
 endif
@@ -83,4 +75,3 @@ endif
 endif # WINNT
 
 include $(topsrcdir)/config/rules.mk
-

content/smil/Makefile.in

@@ -47,7 +47,13 @@ LIBRARY_NAME	= gkconsmil_s
 LIBXUL_LIBRARY	= 1
 
 
-CPPSRCS		= \
+# nsSMILKeySpline is used by CSS transitions -- need to build it regardless
+# of whether SMIL is enabled.
+CPPSRCS		= nsSMILKeySpline.cpp
+EXPORTS		= nsSMILKeySpline.h
+
+ifdef MOZ_SMIL
+CPPSRCS		+= \
 	nsSMILAnimationController.cpp \
 	nsSMILAnimationFunction.cpp \
 	nsSMILCompositor.cpp \
@@ -55,7 +61,6 @@ CPPSRCS		= \
 	nsSMILCSSValueType.cpp \
 	nsSMILFloatType.cpp \
 	nsSMILInstanceTime.cpp \
-	nsSMILKeySpline.cpp \
 	nsSMILNullType.cpp \
 	nsSMILParserUtils.cpp \
 	nsSMILRepeatCount.cpp \
@@ -66,17 +71,19 @@ CPPSRCS		= \
 	nsSMILTimeValueSpec.cpp \
 	nsSMILValue.cpp \
 		$(NULL)
+endif
 
 include $(topsrcdir)/config/config.mk
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
+ifdef MOZ_SMIL
 ifdef ENABLE_TESTS
 TOOL_DIRS		+= test
-endif
+endif # ENABLE_TESTS
 
-EXPORTS		= \
+EXPORTS		+= \
 	  nsISMILAnimationElement.h \
 	  nsISMILAttr.h \
 	  nsSMILAnimationController.h \
@@ -86,11 +93,12 @@ EXPORTS		= \
 	  nsSMILTypes.h \
 	  $(NULL)
 
-include $(topsrcdir)/config/rules.mk
-
 INCLUDES += 	\
 		-I$(srcdir)/../base/src \
 		-I$(srcdir)/../../layout/style \
 		$(NULL)
+endif # MOZ_SMIL
+
+include $(topsrcdir)/config/rules.mk
 
 DEFINES += -D_IMPL_NS_LAYOUT

layout/build/Makefile.in

@@ -186,11 +186,9 @@ SHARED_LIBRARY_LIBS += \
 		$(NULL)
 endif
 
-ifdef MOZ_SMIL
 SHARED_LIBRARY_LIBS += \
 		$(DEPTH)/content/smil/$(LIB_PREFIX)gkconsmil_s.$(LIB_SUFFIX) \
 		$(NULL)
-endif
 
 ifdef MOZ_PLAINTEXT_EDITOR_ONLY
 DEFINES += -DMOZILLA_PLAINTEXT_EDITOR_ONLY