Title: [161865] trunk
Revision
161865
Author
[email protected]
Date
2014-01-13 01:02:55 -0800 (Mon, 13 Jan 2014)

Log Message

Unreviewed, rolling out r161808.
http://trac.webkit.org/changeset/161808
https://bugs.webkit.org/show_bug.cgi?id=126874

This patch make several files to be always regenerated on
every make (Requested by KaL on #webkit).

Source/WebCore:

* GNUmakefile.am:
* bindings/gobject/GNUmakefile.am:

Source/WebKit/gtk:

* GNUmakefile.am:

Tools:

* WebKitTestRunner/GNUmakefile.am:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (161864 => 161865)


--- trunk/Source/WebCore/ChangeLog	2014-01-13 08:12:36 UTC (rev 161864)
+++ trunk/Source/WebCore/ChangeLog	2014-01-13 09:02:55 UTC (rev 161865)
@@ -1,3 +1,15 @@
+2014-01-13  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r161808.
+        http://trac.webkit.org/changeset/161808
+        https://bugs.webkit.org/show_bug.cgi?id=126874
+
+        This patch make several files to be always regenerated on
+        every make (Requested by KaL on #webkit).
+
+        * GNUmakefile.am:
+        * bindings/gobject/GNUmakefile.am:
+
 2014-01-12  Commit Queue  <[email protected]>
 
         Unreviewed, rolling out r161843.

Modified: trunk/Source/WebCore/GNUmakefile.am (161864 => 161865)


--- trunk/Source/WebCore/GNUmakefile.am	2014-01-13 08:12:36 UTC (rev 161864)
+++ trunk/Source/WebCore/GNUmakefile.am	2014-01-13 09:02:55 UTC (rev 161865)
@@ -388,14 +388,11 @@
 dist_audio_DATA = $(audio_DATA)
 endif  # END ENABLE_WEB_AUDIO
 
-DerivedSources/ANGLE:
-	$(AM_V_at)mkdir -p $@
-
 # ANGLE tokenizer & parser
-DerivedSources/ANGLE/glslang.cpp: Source/ThirdParty/ANGLE/src/compiler/glslang.l DerivedSources/ANGLE/glslang_tab.cpp DerivedSources/ANGLE
+DerivedSources/ANGLE/glslang.cpp: Source/ThirdParty/ANGLE/src/compiler/glslang.l DerivedSources/ANGLE/glslang_tab.cpp
 	$(AM_V_GEN)$(FLEX) --noline --nounistd --outfile="$@" "$<"
 
-DerivedSources/ANGLE/glslang_tab.cpp: Source/ThirdParty/ANGLE/src/compiler/glslang.y DerivedSources/ANGLE
+DerivedSources/ANGLE/glslang_tab.cpp: Source/ThirdParty/ANGLE/src/compiler/glslang.y
 	$(AM_V_GEN)$(BISON) --no-lines --defines="DerivedSources/ANGLE/glslang_tab.h" --skeleton=yacc.c --output="$@" $<
 DerivedSources/ANGLE/glslang_tab.h: DerivedSources/ANGLE/glslang_tab.cpp
 

Modified: trunk/Source/WebCore/bindings/gobject/GNUmakefile.am (161864 => 161865)


--- trunk/Source/WebCore/bindings/gobject/GNUmakefile.am	2014-01-13 08:12:36 UTC (rev 161864)
+++ trunk/Source/WebCore/bindings/gobject/GNUmakefile.am	2014-01-13 09:02:55 UTC (rev 161865)
@@ -474,12 +474,10 @@
 
 gdom_class_list := $(subst WebKitDOM,, $(filter-out %Private, $(basename $(notdir $(webkitgtk_gdom_built_sources)))))
 gdom_class_list += Custom EventTarget Object Deprecated
-DerivedSources/webkitdom:
-	$(AM_V_at)mkdir -p $@
-DerivedSources/webkitdom/webkitdom.h: $(WebCore)/bindings/scripts/gobject-generate-headers.pl $(WebCore)/bindings/gobject/GNUmakefile.am DerivedSources/webkitdom
+DerivedSources/webkitdom/webkitdom.h: $(WebCore)/bindings/scripts/gobject-generate-headers.pl $(WebCore)/bindings/gobject/GNUmakefile.am
 	$(AM_V_GEN)echo $(gdom_class_list) | $(PERL) $< gdom > $@
 
-DerivedSources/webkitdom/webkitdomdefines.h: $(WebCore)/bindings/scripts/gobject-generate-headers.pl $(WebCore)/bindings/gobject/GNUmakefile.am DerivedSources/webkitdom
+DerivedSources/webkitdom/webkitdomdefines.h: $(WebCore)/bindings/scripts/gobject-generate-headers.pl $(WebCore)/bindings/gobject/GNUmakefile.am
 	$(AM_V_GEN)echo $(gdom_class_list) | $(PERL) $< defines > $@
 
 noinst_DATA += DerivedSources/webkitdom/webkitdom.symbols
@@ -520,16 +518,16 @@
 # DerivedSources/webkitdom directory.  The reason is that we want all header files distributed in the
 # include/webkit-x.y/webkitdom directory, but do not want to name the WebCore/bindings/gobject directory
 # "webkitdom", as that's a bit presumptuous for a GTK binding.
-$(top_builddir)/DerivedSources/webkitdom/WebKitDOMObject.h: $(WebCore)/bindings/gobject/WebKitDOMObject.h $(top_builddir)/DerivedSources/webkitdom
+$(top_builddir)/DerivedSources/webkitdom/WebKitDOMObject.h: $(WebCore)/bindings/gobject/WebKitDOMObject.h
 	$(AM_V_GEN)cp -f $< $@
 
-$(top_builddir)/DerivedSources/webkitdom/WebKitDOMEventTarget.h: $(WebCore)/bindings/gobject/WebKitDOMEventTarget.h $(top_builddir)/DerivedSources/webkitdom
+$(top_builddir)/DerivedSources/webkitdom/WebKitDOMEventTarget.h: $(WebCore)/bindings/gobject/WebKitDOMEventTarget.h
 	$(AM_V_GEN)cp -f $< $@
 
-$(top_builddir)/DerivedSources/webkitdom/WebKitDOMEventTargetPrivate.h: $(WebCore)/bindings/gobject/WebKitDOMEventTargetPrivate.h $(top_builddir)/DerivedSources/webkitdom
+$(top_builddir)/DerivedSources/webkitdom/WebKitDOMEventTargetPrivate.h: $(WebCore)/bindings/gobject/WebKitDOMEventTargetPrivate.h
 	$(AM_V_GEN)cp -f $< $@
 
-$(top_builddir)/DerivedSources/webkitdom/WebKitDOMCustom.h: $(WebCore)/bindings/gobject/WebKitDOMCustom.h $(top_builddir)/DerivedSources/webkitdom
+$(top_builddir)/DerivedSources/webkitdom/WebKitDOMCustom.h: $(WebCore)/bindings/gobject/WebKitDOMCustom.h
 	$(AM_V_GEN)cp -f $< $@
 
 $(top_builddir)/DerivedSources/webkitdom/WebKitDOMDeprecated.h: $(WebCore)/bindings/gobject/WebKitDOMDeprecated.h

Modified: trunk/Source/WebKit/gtk/ChangeLog (161864 => 161865)


--- trunk/Source/WebKit/gtk/ChangeLog	2014-01-13 08:12:36 UTC (rev 161864)
+++ trunk/Source/WebKit/gtk/ChangeLog	2014-01-13 09:02:55 UTC (rev 161865)
@@ -1,3 +1,14 @@
+2014-01-13  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r161808.
+        http://trac.webkit.org/changeset/161808
+        https://bugs.webkit.org/show_bug.cgi?id=126874
+
+        This patch make several files to be always regenerated on
+        every make (Requested by KaL on #webkit).
+
+        * GNUmakefile.am:
+
 2014-01-12  Carlos Garcia Campos  <[email protected]>
 
         Unreviewed. Fix make distcheck.

Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (161864 => 161865)


--- trunk/Source/WebKit/gtk/GNUmakefile.am	2014-01-13 08:12:36 UTC (rev 161864)
+++ trunk/Source/WebKit/gtk/GNUmakefile.am	2014-01-13 09:02:55 UTC (rev 161865)
@@ -349,16 +349,13 @@
 $(GENSOURCES_WEBKIT)/webkitmarshal.h: stamp-webkitmarshal.h
 	@true
 
-$(GENSOURCES_WEBKIT):
-	$(AM_V_at)mkdir -p $@
-
-stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST) $(GENSOURCES_WEBKIT)
+stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST)
 	$(AM_V_GEN) echo "extern \"C\" {" > $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
 	$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
 	echo '}' >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
 	echo timestamp > $(@F)
 
-stamp-webkitmarshal.h: $(WEBKIT_MARSHAL_LIST) $(GENSOURCES_WEBKIT)
+stamp-webkitmarshal.h: $(WEBKIT_MARSHAL_LIST)
 	$(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(GENSOURCES_WEBKIT)/webkitmarshal.h && \
 	echo timestamp > $(@F)
 
@@ -373,7 +370,7 @@
 	&& rm -f xgen-gth \
 	&& echo timestamp > $(@F)
 
-$(GENSOURCES_WEBKIT)/webkitenumtypes.cpp: $(webkitgtk_h_api) $(WebKit)/GNUmakefile.am $(GENSOURCES_WEBKIT)
+$(GENSOURCES_WEBKIT)/webkitenumtypes.cpp: $(webkitgtk_h_api) $(WebKit)/GNUmakefile.am
 	$(AM_V_GEN)glib-mkenums --template $(srcdir)/Source/WebKit/gtk/webkit/webkitenumtypes.cpp.template $(webkitgtk_h_api) | \
 		sed 's,web_kit,webkit,' \
 		> xgen-gtc \

Modified: trunk/Tools/ChangeLog (161864 => 161865)


--- trunk/Tools/ChangeLog	2014-01-13 08:12:36 UTC (rev 161864)
+++ trunk/Tools/ChangeLog	2014-01-13 09:02:55 UTC (rev 161865)
@@ -1,3 +1,14 @@
+2014-01-13  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r161808.
+        http://trac.webkit.org/changeset/161808
+        https://bugs.webkit.org/show_bug.cgi?id=126874
+
+        This patch make several files to be always regenerated on
+        every make (Requested by KaL on #webkit).
+
+        * WebKitTestRunner/GNUmakefile.am:
+
 2014-01-13  Adrian Perez de Castro  <[email protected]>
 
         [GTK] Make MiniBrowser windows non-transient by default

Modified: trunk/Tools/WebKitTestRunner/GNUmakefile.am (161864 => 161865)


--- trunk/Tools/WebKitTestRunner/GNUmakefile.am	2014-01-13 08:12:36 UTC (rev 161864)
+++ trunk/Tools/WebKitTestRunner/GNUmakefile.am	2014-01-13 09:02:55 UTC (rev 161865)
@@ -156,10 +156,7 @@
 	Source/WebCore/bindings/scripts/InFilesParser.pm \
 	Source/WebCore/bindings/scripts/generate-bindings.pl
 
-$(top_builddir)/DerivedSources/InjectedBundle:
-	$(AM_V_at)mkdir -p $@
-
-DerivedSources/InjectedBundle/JS%.cpp: Tools/WebKitTestRunner/InjectedBundle/Bindings/%.idl $(code_generation_dependencies) $(top_builddir)/DerivedSources/InjectedBundle
+DerivedSources/InjectedBundle/JS%.cpp: Tools/WebKitTestRunner/InjectedBundle/Bindings/%.idl $(code_generation_dependencies)
 	$(AM_V_GEN)$(PERL) \
 		-I $(srcdir)/Source/WebCore/bindings/scripts \
 		-I $(srcdir)/Tools/WebKitTestRunner/InjectedBundle/Bindings \
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to