Title: [161808] trunk
- Revision
- 161808
- Author
- [email protected]
- Date
- 2014-01-12 08:15:48 -0800 (Sun, 12 Jan 2014)
Log Message
Source/WebCore: --disable-dependency-tracking causes build failure due to missing directories
https://bugs.webkit.org/show_bug.cgi?id=94488
Patch by Tobias Mueller <[email protected]> on 2014-01-12
Reviewed by Gustavo Noronha Silva.
Ensure output directory existing
before generating DerivedSources. This allows for
--disable-dependency-tracking to be run.
* GNUmakefile.am: Added new target DerivedSources/ANGLE which is a directory to be created
* bindings/gobject/GNUmakefile.am: Added new target DerivedSources/webkitdom which is a directory to be created
Source/WebKit/gtk: --disable-dependency-tracking causes build failure due to missing directories
https://bugs.webkit.org/show_bug.cgi?id=94488
Patch by Tobias Mueller <[email protected]> on 2014-01-12
Reviewed by Gustavo Noronha Silva.
Autotools build fix: Ensure output directory existing
before generating DerivedSources. This allows for
--disable-dependency-tracking to be run.
* GNUmakefile.am: Added a new target of the directory in which files are meant to be stored ($(GENSOURCES_WEBKIT)).
Tools: --disable-dependency-tracking causes build failure due to missing directories
https://bugs.webkit.org/show_bug.cgi?id=94488
Patch by Tobias Mueller <[email protected]> on 2014-01-12
Reviewed by Gustavo Noronha Silva.
Autotools build fix: Ensure output directory existing
before generating DerivedSources. This allows for
--disable-dependency-tracking to be run.
* WebKitTestRunner/GNUmakefile.am: Added a new target of the directory in which files are meant to be stored.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161807 => 161808)
--- trunk/Source/WebCore/ChangeLog 2014-01-12 16:09:51 UTC (rev 161807)
+++ trunk/Source/WebCore/ChangeLog 2014-01-12 16:15:48 UTC (rev 161808)
@@ -1,3 +1,17 @@
+2014-01-12 Tobias Mueller <[email protected]>
+
+ --disable-dependency-tracking causes build failure due to missing directories
+ https://bugs.webkit.org/show_bug.cgi?id=94488
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Ensure output directory existing
+ before generating DerivedSources. This allows for
+ --disable-dependency-tracking to be run.
+
+ * GNUmakefile.am: Added new target DerivedSources/ANGLE which is a directory to be created
+ * bindings/gobject/GNUmakefile.am: Added new target DerivedSources/webkitdom which is a directory to be created
+
2014-01-12 David Kilzer <[email protected]>
[iOS] WebFontCache is Mac-only
Modified: trunk/Source/WebCore/GNUmakefile.am (161807 => 161808)
--- trunk/Source/WebCore/GNUmakefile.am 2014-01-12 16:09:51 UTC (rev 161807)
+++ trunk/Source/WebCore/GNUmakefile.am 2014-01-12 16:15:48 UTC (rev 161808)
@@ -387,11 +387,14 @@
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/glslang.cpp: Source/ThirdParty/ANGLE/src/compiler/glslang.l DerivedSources/ANGLE/glslang_tab.cpp DerivedSources/ANGLE
$(AM_V_GEN)$(FLEX) --noline --nounistd --outfile="$@" "$<"
-DerivedSources/ANGLE/glslang_tab.cpp: Source/ThirdParty/ANGLE/src/compiler/glslang.y
+DerivedSources/ANGLE/glslang_tab.cpp: Source/ThirdParty/ANGLE/src/compiler/glslang.y DerivedSources/ANGLE
$(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 (161807 => 161808)
--- trunk/Source/WebCore/bindings/gobject/GNUmakefile.am 2014-01-12 16:09:51 UTC (rev 161807)
+++ trunk/Source/WebCore/bindings/gobject/GNUmakefile.am 2014-01-12 16:15:48 UTC (rev 161808)
@@ -474,10 +474,12 @@
gdom_class_list := $(subst WebKitDOM,, $(filter-out %Private, $(basename $(notdir $(webkitgtk_gdom_built_sources)))))
gdom_class_list += Custom EventTarget Object Deprecated
-DerivedSources/webkitdom/webkitdom.h: $(WebCore)/bindings/scripts/gobject-generate-headers.pl $(WebCore)/bindings/gobject/GNUmakefile.am
+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
$(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/webkitdomdefines.h: $(WebCore)/bindings/scripts/gobject-generate-headers.pl $(WebCore)/bindings/gobject/GNUmakefile.am DerivedSources/webkitdom
$(AM_V_GEN)echo $(gdom_class_list) | $(PERL) $< defines > $@
noinst_DATA += DerivedSources/webkitdom/webkitdom.symbols
@@ -518,16 +520,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/WebKitDOMObject.h: $(WebCore)/bindings/gobject/WebKitDOMObject.h $(top_builddir)/DerivedSources/webkitdom
$(AM_V_GEN)cp -f $< $@
-$(top_builddir)/DerivedSources/webkitdom/WebKitDOMEventTarget.h: $(WebCore)/bindings/gobject/WebKitDOMEventTarget.h
+$(top_builddir)/DerivedSources/webkitdom/WebKitDOMEventTarget.h: $(WebCore)/bindings/gobject/WebKitDOMEventTarget.h $(top_builddir)/DerivedSources/webkitdom
$(AM_V_GEN)cp -f $< $@
-$(top_builddir)/DerivedSources/webkitdom/WebKitDOMEventTargetPrivate.h: $(WebCore)/bindings/gobject/WebKitDOMEventTargetPrivate.h
+$(top_builddir)/DerivedSources/webkitdom/WebKitDOMEventTargetPrivate.h: $(WebCore)/bindings/gobject/WebKitDOMEventTargetPrivate.h $(top_builddir)/DerivedSources/webkitdom
$(AM_V_GEN)cp -f $< $@
-$(top_builddir)/DerivedSources/webkitdom/WebKitDOMCustom.h: $(WebCore)/bindings/gobject/WebKitDOMCustom.h
+$(top_builddir)/DerivedSources/webkitdom/WebKitDOMCustom.h: $(WebCore)/bindings/gobject/WebKitDOMCustom.h $(top_builddir)/DerivedSources/webkitdom
$(AM_V_GEN)cp -f $< $@
$(top_builddir)/DerivedSources/webkitdom/WebKitDOMDeprecated.h: $(WebCore)/bindings/gobject/WebKitDOMDeprecated.h
Modified: trunk/Source/WebKit/gtk/ChangeLog (161807 => 161808)
--- trunk/Source/WebKit/gtk/ChangeLog 2014-01-12 16:09:51 UTC (rev 161807)
+++ trunk/Source/WebKit/gtk/ChangeLog 2014-01-12 16:15:48 UTC (rev 161808)
@@ -1,3 +1,16 @@
+2014-01-12 Tobias Mueller <[email protected]>
+
+ --disable-dependency-tracking causes build failure due to missing directories
+ https://bugs.webkit.org/show_bug.cgi?id=94488
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Autotools build fix: Ensure output directory existing
+ before generating DerivedSources. This allows for
+ --disable-dependency-tracking to be run.
+
+ * GNUmakefile.am: Added a new target of the directory in which files are meant to be stored ($(GENSOURCES_WEBKIT)).
+
2014-01-10 Anders Carlsson <[email protected]>
Tweak ProgressTrackerClient functions
Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (161807 => 161808)
--- trunk/Source/WebKit/gtk/GNUmakefile.am 2014-01-12 16:09:51 UTC (rev 161807)
+++ trunk/Source/WebKit/gtk/GNUmakefile.am 2014-01-12 16:15:48 UTC (rev 161808)
@@ -349,13 +349,16 @@
$(GENSOURCES_WEBKIT)/webkitmarshal.h: stamp-webkitmarshal.h
@true
-stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST)
+$(GENSOURCES_WEBKIT):
+ $(AM_V_at)mkdir -p $@
+
+stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST) $(GENSOURCES_WEBKIT)
$(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)
+stamp-webkitmarshal.h: $(WEBKIT_MARSHAL_LIST) $(GENSOURCES_WEBKIT)
$(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(GENSOURCES_WEBKIT)/webkitmarshal.h && \
echo timestamp > $(@F)
@@ -370,7 +373,7 @@
&& rm -f xgen-gth \
&& echo timestamp > $(@F)
-$(GENSOURCES_WEBKIT)/webkitenumtypes.cpp: $(webkitgtk_h_api) $(WebKit)/GNUmakefile.am
+$(GENSOURCES_WEBKIT)/webkitenumtypes.cpp: $(webkitgtk_h_api) $(WebKit)/GNUmakefile.am $(GENSOURCES_WEBKIT)
$(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 (161807 => 161808)
--- trunk/Tools/ChangeLog 2014-01-12 16:09:51 UTC (rev 161807)
+++ trunk/Tools/ChangeLog 2014-01-12 16:15:48 UTC (rev 161808)
@@ -1,3 +1,17 @@
+2014-01-12 Tobias Mueller <[email protected]>
+
+ --disable-dependency-tracking causes build failure due to missing directories
+ https://bugs.webkit.org/show_bug.cgi?id=94488
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Autotools build fix: Ensure output directory existing
+ before generating DerivedSources. This allows for
+ --disable-dependency-tracking to be run.
+
+
+ * WebKitTestRunner/GNUmakefile.am: Added a new target of the directory in which files are meant to be stored.
+
2014-01-12 Carlos Garcia Campos <[email protected]>
[GTK] Fix return value of WebKitDownload::created-destination
Modified: trunk/Tools/WebKitTestRunner/GNUmakefile.am (161807 => 161808)
--- trunk/Tools/WebKitTestRunner/GNUmakefile.am 2014-01-12 16:09:51 UTC (rev 161807)
+++ trunk/Tools/WebKitTestRunner/GNUmakefile.am 2014-01-12 16:15:48 UTC (rev 161808)
@@ -156,7 +156,10 @@
Source/WebCore/bindings/scripts/InFilesParser.pm \
Source/WebCore/bindings/scripts/generate-bindings.pl
-DerivedSources/InjectedBundle/JS%.cpp: Tools/WebKitTestRunner/InjectedBundle/Bindings/%.idl $(code_generation_dependencies)
+$(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
$(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
