Title: [106265] releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk
Diff
Modified: releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/ChangeLog (106264 => 106265)
--- releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/ChangeLog 2012-01-30 19:26:48 UTC (rev 106264)
+++ releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/ChangeLog 2012-01-30 19:28:53 UTC (rev 106265)
@@ -1,5 +1,14 @@
2012-01-30 Gustavo Noronha Silva <[email protected]>
+ GTK+ build fix. Rename the INCLUDES variable so it is not picked
+ up by random bystanders. Also do some more cleanup on stuff we
+ inherited from gtk-doc.make.
+
+ * GNUmakefile.gtk-doc.am:
+ * docs/GNUmakefile.am:
+
+2012-01-30 Gustavo Noronha Silva <[email protected]>
+
[GTK] Streamline wk1 documentation build
https://bugs.webkit.org/show_bug.cgi?id=70447
Modified: releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/GNUmakefile.gtk-doc.am (106264 => 106265)
--- releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/GNUmakefile.gtk-doc.am 2012-01-30 19:26:48 UTC (rev 106264)
+++ releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/GNUmakefile.gtk-doc.am 2012-01-30 19:28:53 UTC (rev 106265)
@@ -1,16 +1,9 @@
# -*- mode: makefile -*-
-GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(GTKDOC_INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
GTKDOC_RUN = $(LIBTOOL) --mode=execute
-# We set GPATH here; this gives us semantics for GNU make
-# which are more like other make's VPATH, when it comes to
-# whether a source that is a target of one rule is then
-# searched for in VPATH/GPATH.
-#
-GPATH = $(srcdir)
-
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
SETUP_FILES = \
Modified: releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/docs/GNUmakefile.am (106264 => 106265)
--- releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/docs/GNUmakefile.am 2012-01-30 19:26:48 UTC (rev 106264)
+++ releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/docs/GNUmakefile.am 2012-01-30 19:28:53 UTC (rev 106265)
@@ -1,8 +1,5 @@
## Process this file with automake to produce GNUmakefile.in
-# We require automake 1.6 at least.
-AUTOMAKE_OPTIONS = 1.6
-
# This is a blank Makefile.am for using gtk-doc.
# Copy this to your project's API docs directory and modify the variables to
# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples
@@ -79,7 +76,7 @@
# signals and properties.
# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES= \
+GTKDOC_INCLUDES= \
-I$(abs_srcdir)/Source/WebKit/gtk \
-I$(abs_builddir)/Source/WebKit/gtk \
$(global_cppflags) \
@@ -96,6 +93,7 @@
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBSOUP_CFLAGS)
+
GTKDOC_LIBS= \
$(abs_builddir)/libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
$(abs_builddir)/libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
