Unreviewed. Fix make distcheck.
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 16 Dec 2012 02:01:34 +0000 (02:01 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 16 Dec 2012 02:01:34 +0000 (02:01 +0000)
* bindings/gobject/GNUmakefile.am: Do not dist generated DOM
bindings headers.
* platform/ScrollAnimatorNone.cpp: Include PlatformGestureEvent.h
only if gesture events are enabled.

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

Source/WebCore/ChangeLog
Source/WebCore/bindings/gobject/GNUmakefile.am
Source/WebCore/platform/ScrollAnimatorNone.cpp

index 016629b..24300cb 100644 (file)
@@ -1,3 +1,12 @@
+2012-12-15  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Fix make distcheck.
+
+        * bindings/gobject/GNUmakefile.am: Do not dist generated DOM
+        bindings headers.
+        * platform/ScrollAnimatorNone.cpp: Include PlatformGestureEvent.h
+        only if gesture events are enabled.
+
 2012-12-15  Alexey Proskuryakov  <ap@apple.com>
 
         Build fix.
index 0531bd8..2762e1d 100644 (file)
@@ -493,7 +493,7 @@ DerivedSources/webkitdom/WebKitDOM%.cpp DerivedSources/webkitdom/WebKitDOM%.h De
        $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl --include $(WebCore)/dom --include $(WebCore)/html --include $(WebCore)/css --include $(WebCore)/page --include $(WebCore)/xml --include $(WebCore)/svg --outputDir "$(GENSOURCES_WEBKITDOM)" --defines "LANGUAGE_GOBJECT=1 $(gdom_feature_defines)" --generator GObject --supplementalDependencyFile $(supplemental_dependency_file) $<
 
 libwebkitdomincludedir = $(libwebkitgtkincludedir)/webkitdom
-libwebkitdominclude_HEADERS = \
+nodist_libwebkitdominclude_HEADERS = \
        $(webkitgtk_gdom_built_h_api)
 
 noinst_LTLIBRARIES += \
index 128a52c..802ab8a 100644 (file)
@@ -37,7 +37,6 @@
 #include "FloatPoint.h"
 #include "NotImplemented.h"
 #include <wtf/OwnArrayPtr.h>
-#include "PlatformGestureEvent.h"
 #include "ScrollableArea.h"
 #include "ScrollbarTheme.h"
 #include <algorithm>
 #include "TraceEvent.h"
 #endif
 
+#if ENABLE(GESTURE_EVENTS)
+#include "PlatformGestureEvent.h"
+#endif
+
 using namespace std;
 
 namespace WebCore {