Changeset 105419 in webkit

Timestamp:

Jan 19, 2012 9:40:25 AM (12 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] WebKit2 GTK+ API public headers are not installed
​https://bugs.webkit.org/show_bug.cgi?id=76626

Reviewed by Martin Robinson.

• GNUmakefile.am: Rename webkit2gtk_headers as

libwebkit2gtkinclude_HEADERS to match libwebkit2gtkincludedir so
that headers are installed during make install.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (6 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-01-19  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] WebKit2 GTK+ API public headers are not installed
+        https://bugs.webkit.org/show_bug.cgi?id=76626
+
+        Reviewed by Martin Robinson.
+
+        * GNUmakefile.am: Rename webkit2gtk_headers as
+        libwebkit2gtkinclude_HEADERS to match libwebkit2gtkincludedir so
+        that headers are installed during make install.
+
 2012-01-19  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/GNUmakefile.am

@@ -79 +79 @@
 
 libwebkit2gtkincludedir = $(libwebkitgtkincludedir)/webkit2
-webkit2gtk_headers = \
+libwebkit2gtkinclude_HEADERS = \
+        DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitEnumTypes.h \
         $(WebKit2)/UIProcess/API/gtk/WebKitBackForwardList.h \
         $(WebKit2)/UIProcess/API/gtk/WebKitBackForwardListItem.h \
@@ -1074 +1075 @@
 BUILT_SOURCES += generate-webkit2-forwarding-headers
 
-$(GENSOURCES_WEBKIT2)/webkit2gtk/include/webkit2: $(webkit2gtk_headers)
+$(GENSOURCES_WEBKIT2)/webkit2gtk/include/webkit2: $(libwebkit2gtkinclude_HEADERS)
         $(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/webkit2gtk/include \
         && ln -n -s -f ${shell pwd}/$(WebKit2)/UIProcess/API/gtk $@
@@ -1124 +1125 @@
         @true
 
-stamp-webkit2enumtypes: $(webkit2gtk_headers) $(WebKit2)/GNUmakefile.am
+stamp-webkit2enumtypes: $(libwebkit2gtkinclude_HEADERS) $(WebKit2)/GNUmakefile.am
         $(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2 \
         && glib-mkenums \
@@ -1140 +1141 @@
                         --eprod "#define WEBKIT_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \
                         --eprod "WEBKIT_API GType\n@enum_name@_get_type(void);\n\n" \
-                $(webkit2gtk_headers) | \
+                $(libwebkit2gtkinclude_HEADERS) | \
                 sed 's,web_kit,webkit,' | \
                 sed 's,WEBKIT_TYPE_KIT,WEBKIT_TYPE,' \
@@ -1148 +1149 @@
         && echo timestamp > $(@F)
 
-$(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitEnumTypes.cpp: $(webkit2gtk_headers) $(WebKit2)/GNUmakefile.am
+$(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitEnumTypes.cpp: $(libwebkit2gtkinclude_HEADERS) $(WebKit2)/GNUmakefile.am
         $(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2 \
         && glib-mkenums \
@@ -1165 +1166 @@
                         --vtail "    return type;\n}\n\n" \
                         --ftail "}\n" \
-                $(webkit2gtk_headers) | \
+                $(libwebkit2gtkinclude_HEADERS) | \
                 sed 's,web_kit,webkit,' \
                 > xgen-gtc \