[Gtk] Remove SVG_FEATURES and HTML_FEATURES from Source/WebCore/GNUmakefile.am
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 13 Aug 2012 11:42:39 +0000 (11:42 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 13 Aug 2012 11:42:39 +0000 (11:42 +0000)
https://bugs.webkit.org/show_bug.cgi?id=90693

Reviewed by Philippe Normand.

.:

Remove exportation of SVG_FLAGS and HTML_FLAGS as Automake conditionals
as they are not required anymore.

* configure.ac:

Source/WebCore:

Remove SVG_FEATURES and HTML_FEATURES variables. They can be replaced by the
FEATURE_DEFINES variable wherever they are used.

No new tests - no new functionality.

* GNUmakefile.am:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@125408 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.am
configure.ac

index 877bb56..20f5340 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-08-13  Zan Dobersek  <zandobersek@gmail.com>
+
+        [Gtk] Remove SVG_FEATURES and HTML_FEATURES from Source/WebCore/GNUmakefile.am
+        https://bugs.webkit.org/show_bug.cgi?id=90693
+
+        Reviewed by Philippe Normand.
+
+        Remove exportation of SVG_FLAGS and HTML_FLAGS as Automake conditionals
+        as they are not required anymore.
+
+        * configure.ac:
+
 2012-08-12  Loïc Yhuel  <loic.yhuel@softathome.com>
 
         [Qt] Make it possible to build without QtTest/QtPrintSupport
index 5ea10dc..e1bb2de 100644 (file)
@@ -1,3 +1,17 @@
+2012-08-13  Zan Dobersek  <zandobersek@gmail.com>
+
+        [Gtk] Remove SVG_FEATURES and HTML_FEATURES from Source/WebCore/GNUmakefile.am
+        https://bugs.webkit.org/show_bug.cgi?id=90693
+
+        Reviewed by Philippe Normand.
+
+        Remove SVG_FEATURES and HTML_FEATURES variables. They can be replaced by the
+        FEATURE_DEFINES variable wherever they are used.
+
+        No new tests - no new functionality.
+
+        * GNUmakefile.am:
+
 2012-08-13  Mario Sanchez Prada  <msanchez@igalia.com>
 
         [GTK] Implementation of atk_editable_text_insert_text ignores 'length' parameter
index e714c5a..47f37e0 100644 (file)
@@ -1,8 +1,5 @@
 include $(srcdir)/Source/WebCore/GNUmakefile.list.am
 
-SVG_FEATURES :=
-HTML_FEATURES :=
-
 WEBCORE_CSS_PROPERTY_NAMES := $(WebCore)/css/CSSPropertyNames.in
 WEBCORE_CSS_VALUE_KEYWORDS := $(WebCore)/css/CSSValueKeywords.in
 
@@ -226,7 +223,6 @@ endif # END ENABLE_SQL_DATABASE
 # ----
 if ENABLE_DATALIST_ELEMENT
 FEATURE_DEFINES += ENABLE_DATALIST_ELEMENT=1
-HTML_FEATURES += ENABLE_DATALIST_ELEMENT=1
 webcore_cppflags += -DENABLE_DATALIST_ELEMENT=1
 endif # END ENABLE_DATALIST_ELEMENT
 
@@ -354,7 +350,6 @@ endif # END ENABLE_ORIENTATION_EVENTS
 # ----
 if ENABLE_VIDEO
 FEATURE_DEFINES += ENABLE_VIDEO=1
-HTML_FEATURES += ENABLE_VIDEO=1
 webcore_cppflags += -DENABLE_VIDEO=1
 
 if USE_GSTREAMER
@@ -464,10 +459,6 @@ endif
 if ENABLE_FILTERS
 FEATURE_DEFINES += ENABLE_FILTERS=1
 webcore_cppflags += -DENABLE_FILTERS=1
-if ENABLE_SVG
-SVG_FEATURES += ENABLE_FILTERS=1
-endif
-
 endif # END ENABLE_FILTERS
 
 # ----
@@ -563,7 +554,6 @@ WEBCORE_CSS_VALUE_KEYWORDS += $(WebCore)/css/SVGCSSValueKeywords.in
 # SVG Features
 if ENABLE_SVG_FONTS
 FEATURE_DEFINES += ENABLE_SVG_FONTS=1
-SVG_FEATURES += ENABLE_SVG_FONTS=1
 webcore_cppflags += -DENABLE_SVG_FONTS=1
 endif
 
@@ -572,14 +562,8 @@ endif # END ENABLE_SVG
 # SVG tag and attribute names (need to pass an extra flag if svg experimental features are enabled)
 DerivedSources/WebCore/SVGNames.cpp: DerivedSources/WebCore/SVGElementFactory.cpp
 DerivedSources/WebCore/JSSVGElementWrapperFactory.cpp: DerivedSources/WebCore/SVGElementFactory.cpp
-
-if SVG_FLAGS
 DerivedSources/WebCore/SVGElementFactory.cpp: $(WebCore)/dom/make_names.pl $(WebCore)/svg/svgtags.in $(WebCore)/svg/svgattrs.in
-       $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --extraDefines "$(SVG_FEATURES)" --factory --wrapperFactory --outputDir "$(GENSOURCES_WEBCORE)"
-else
-DerivedSources/WebCore/SVGElementFactory.cpp: $(WebCore)/dom/make_names.pl $(WebCore)/svg/svgtags.in $(WebCore)/svg/svgattrs.in
-       $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --factory --wrapperFactory --outputDir "$(GENSOURCES_WEBCORE)"
-endif # SVG_FLAGS
+       $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --extraDefines "$(FEATURE_DEFINES)" --factory --wrapperFactory --outputDir "$(GENSOURCES_WEBCORE)"
 
 # end SVG Features
 
@@ -849,13 +833,8 @@ DerivedSources/WebCore/JSHTMLElementWrapperFactory.cpp: DerivedSources/WebCore/H
 DerivedSources/WebCore/HTMLElementFactory.cpp: DerivedSources/WebCore/HTMLElementFactory.h
 DerivedSources/WebCore/HTMLElementFactory.h: DerivedSources/WebCore/HTMLNames.cpp
 DerivedSources/WebCore/HTMLNames.cpp: DerivedSources/WebCore/HTMLNames.h
-if HTML_FLAGS
-DerivedSources/WebCore/HTMLNames.h: $(WebCore)/dom/make_names.pl $(WebCore)/html/HTMLTagNames.in $(WebCore)/html/HTMLAttributeNames.in
-       $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --extraDefines "$(HTML_FEATURES)" --factory --wrapperFactory --outputDir "$(GENSOURCES_WEBCORE)"
-else
 DerivedSources/WebCore/HTMLNames.h: $(WebCore)/dom/make_names.pl $(WebCore)/html/HTMLTagNames.in $(WebCore)/html/HTMLAttributeNames.in
-       $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --factory --wrapperFactory --outputDir "$(GENSOURCES_WEBCORE)"
-endif # HTML_FLAGS
+       $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --extraDefines "$(FEATURE_DEFINES)" --factory --wrapperFactory --outputDir "$(GENSOURCES_WEBCORE)"
 
 
 DerivedSources/WebCore/XMLNSNames.cpp DerivedSources/WebCore/XMLNSNames.h: $(WebCore)/dom/make_names.pl $(WebCore)/xml/xmlnsattrs.in
index 7ea5b95..ac31e59 100644 (file)
@@ -937,12 +937,9 @@ AC_ARG_ENABLE(svg_fonts,
 AC_MSG_RESULT([$enable_svg_fonts])
 
 # check for SVG features, enabling SVG if necessary
-if test "$enable_svg_fonts" = "yes"; then
-   svg_flags=yes
-   if test "$enable_svg" = "no"; then
-       AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support])
-       enable_svg=yes
-   fi
+if test "$enable_svg_fonts" = "yes" && test "$enable_svg" = "no"; then
+   AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support])
+   enable_svg=yes
 fi
 
 # check whether to enable Web Socket support
@@ -1332,11 +1329,6 @@ if test "$enable_coverage" = "yes"; then
    AC_SUBST([COVERAGE_LDFLAGS])
 fi
 
-# check for HTML features
-if test "$enable_video" = "yes"; then
-    html_flags=yes
-fi
-
 # WebKit2
 # If you change the default here, please also make sure the assumptions made
 # in Tools/Scripts/webkitdirs.pm:buildAutotoolsProject still make sense.
@@ -1476,8 +1468,6 @@ AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"])
 AM_CONDITIONAL([ENABLE_WORKERS],[test "$enable_workers" = "yes"])
 AM_CONDITIONAL([ENABLE_SHADOW_DOM],[test "$enable_shadow_dom" = "yes"])
 AM_CONDITIONAL([ENABLE_SHARED_WORKERS],[test "$enable_shared_workers" = "yes"])
-AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"])
-AM_CONDITIONAL([HTML_FLAGS],[test "$html_flags" = "yes"])
 AM_CONDITIONAL([ENABLE_WEB_SOCKETS],[test "$enable_web_sockets" = "yes"])
 AM_CONDITIONAL([ENABLE_WEB_AUDIO],[test "$enable_web_audio" = "yes"])
 AM_CONDITIONAL([ENABLE_WEB_TIMING],[test "$enable_web_timing" = "yes"])