Commit 94c06559 authored by alp@webkit.org's avatar alp@webkit.org

2008-01-31 Alp Toker <alp@atoker.com>

        Reviewed by Adam Roben.

        http://bugs.webkit.org/show_bug.cgi?id=17006
        [GTK] Header path should be webkit/webkit.h

        Move the GTK+ API sources as needed and update the build systems.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@29898 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 8c222731
2008-01-31 Alp Toker <alp@atoker.com>
Reviewed by Adam Roben.
http://bugs.webkit.org/show_bug.cgi?id=17006
[GTK] Header path should be webkit/webkit.h
Move the GTK+ API sources as needed and update the build systems.
* GNUmakefile.am:
* WebKit.pri:
2008-01-27 Jan Michael Alonzo <jmalonzo@unpluggable.com>
Reviewed by Alp Toker.
......
......@@ -125,7 +125,7 @@ webkitgtk_cleanfiles :=
# No need to touch the following variables unless you have to. If you need to change the values
# for the following variables, use the "webkitgtk_" variables above
libWebKitGtk_ladir := $(prefix)/include/WebKit
libWebKitGtk_ladir := $(prefix)/include/WebKit/webkit
libWebKitGtk_la_HEADERS = $(webkitgtk_h_api)
......@@ -229,26 +229,26 @@ endif
#
# WEBKIT GTK+
webkitgtk_cppflags += \
-I$(top_builddir)/WebKit/gtk/WebView \
-I$(top_builddir)/WebKit/gtk/webkit \
-DBUILDING_CAIRO__=1 \
-DBUILD_WEBKIT
webkitgtk_h_api += \
WebKit/gtk/WebView/webkit.h \
WebKit/gtk/WebView/webkitdefines.h \
WebKit/gtk/WebView/webkitnetworkrequest.h \
WebKit/gtk/WebView/webkitwebbackforwardlist.h \
WebKit/gtk/WebView/webkitwebframe.h \
WebKit/gtk/WebView/webkitwebhistoryitem.h \
WebKit/gtk/WebView/webkitwebsettings.h \
WebKit/gtk/WebView/webkitwebview.h
WebKit/gtk/webkit/webkit.h \
WebKit/gtk/webkit/webkitdefines.h \
WebKit/gtk/webkit/webkitnetworkrequest.h \
WebKit/gtk/webkit/webkitwebbackforwardlist.h \
WebKit/gtk/webkit/webkitwebframe.h \
WebKit/gtk/webkit/webkitwebhistoryitem.h \
WebKit/gtk/webkit/webkitwebsettings.h \
WebKit/gtk/webkit/webkitwebview.h
webkitgtk_built_sources += \
WebKit/gtk/WebView/webkit-marshal.h \
WebKit/gtk/WebView/webkit-marshal.cpp
WebKit/gtk/webkit/webkit-marshal.h \
WebKit/gtk/webkit/webkit-marshal.cpp
webkitgtk_headers += \
WebKit/gtk/WebView/webkitprivate.h \
WebKit/gtk/webkit/webkitprivate.h \
WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \
WebKit/gtk/WebCoreSupport/DragClientGtk.h \
......@@ -258,13 +258,13 @@ webkitgtk_headers += \
WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h
webkitgtk_sources += \
WebKit/gtk/WebView/webkitnetworkrequest.cpp \
WebKit/gtk/WebView/webkitprivate.cpp \
WebKit/gtk/WebView/webkitwebbackforwardlist.cpp \
WebKit/gtk/WebView/webkitwebframe.cpp \
WebKit/gtk/WebView/webkitwebhistoryitem.cpp \
WebKit/gtk/WebView/webkitwebsettings.cpp \
WebKit/gtk/WebView/webkitwebview.cpp \
WebKit/gtk/webkit/webkitnetworkrequest.cpp \
WebKit/gtk/webkit/webkitprivate.cpp \
WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
WebKit/gtk/webkit/webkitwebframe.cpp \
WebKit/gtk/webkit/webkitwebhistoryitem.cpp \
WebKit/gtk/webkit/webkitwebsettings.cpp \
WebKit/gtk/webkit/webkitwebview.cpp \
WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \
......@@ -280,17 +280,17 @@ webkitgtk_cleanfiles += \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = WebKit/gtk/WebKitGtk.pc
WEBKIT_MARSHAL = $(CURDIR)/WebKit/gtk/WebView/webkit-marshal
WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/WebView/webkit-marshal.list
WEBKIT_MARSHAL = $(CURDIR)/WebKit/gtk/webkit/webkit-marshal
WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/webkit/webkit-marshal.list
stamp_files := \
stamp-webkit-marshal.cpp \
stamp-webkit-marshal.h
WebKit/gtk/WebView/webkit-marshal.cpp: stamp-webkit-marshal.cpp
WebKit/gtk/webkit/webkit-marshal.cpp: stamp-webkit-marshal.cpp
@true
WebKit/gtk/WebView/webkit-marshal.h: stamp-webkit-marshal.h
WebKit/gtk/webkit/webkit-marshal.h: stamp-webkit-marshal.h
@true
stamp-webkit-marshal.cpp: $(WEBKIT_MARSHAL_LIST)
......
2008-01-31 Alp Toker <alp@atoker.com>
Reviewed by Adam Roben.
http://bugs.webkit.org/show_bug.cgi?id=17006
[GTK] Header path should be webkit/webkit.h
Move the GTK+ API sources as needed and update the build systems.
* GNUmakefile.am:
* WebCore.pro:
2008-01-31 Sam Weinig <sam@webkit.org>
Reviewed by Geoff Garen.
......@@ -40,8 +40,9 @@ webkitgtk_cppflags += \
-I$(srcdir)/WebCore/platform/graphics/cairo \
-I$(srcdir)/WebCore/loader/gtk \
-I$(srcdir)/WebCore/page/gtk \
-I$(srcdir)/WebKit/gtk \
-I$(srcdir)/WebKit/gtk/WebCoreSupport \
-I$(srcdir)/WebKit/gtk/WebView
-I$(srcdir)/WebKit/gtk/webkit
webcore_built_nosources += \
DerivedSources/DocTypeStrings.cpp \
......
......@@ -154,8 +154,9 @@ gtk-port {
$$PWD/platform/image-decoders/xbm \
$$PWD/loader/gtk \
$$PWD/page/gtk \
$$PWD/../WebKit/gtk \
$$PWD/../WebKit/gtk/WebCoreSupport \
$$PWD/../WebKit/gtk/WebView
$$PWD/../WebKit/gtk/webkit
DEPENDPATH += \
platform/gtk \
......@@ -172,8 +173,9 @@ gtk-port {
platform/image-decoders/xbm \
loader/gtk \
page/gtk \
../WebKit/gtk \
../WebKit/gtk/WebCoreSupport \
../WebKit/gtk/WebView
../WebKit/gtk/webkit
}
INCLUDEPATH += $$PWD \
......@@ -986,15 +988,15 @@ gtk-port {
HEADERS += \
../WebCore/platform/gtk/ClipboardGtk.h \
../WebCore/platform/gtk/PasteboardHelper.h \
../WebKit/gtk/WebView/webkit.h \
../WebKit/gtk/WebView/webkitdefines.h \
../WebKit/gtk/WebView/webkitnetworkrequest.h \
../WebKit/gtk/WebView/webkitprivate.h \
../WebKit/gtk/WebView/webkitwebbackforwardlist.h \
../WebKit/gtk/WebView/webkitwebframe.h \
../WebKit/gtk/WebView/webkitwebhistoryitem.h \
../WebKit/gtk/WebView/webkitwebsettings.h \
../WebKit/gtk/WebView/webkitwebview.h \
../WebKit/gtk/webkit/webkit.h \
../WebKit/gtk/webkit/webkitdefines.h \
../WebKit/gtk/webkit/webkitnetworkrequest.h \
../WebKit/gtk/webkit/webkitprivate.h \
../WebKit/gtk/webkit/webkitwebbackforwardlist.h \
../WebKit/gtk/webkit/webkitwebframe.h \
../WebKit/gtk/webkit/webkitwebhistoryitem.h \
../WebKit/gtk/webkit/webkitwebsettings.h \
../WebKit/gtk/webkit/webkitwebview.h \
../WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
../WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \
../WebKit/gtk/WebCoreSupport/DragClientGtk.h \
......@@ -1067,13 +1069,13 @@ gtk-port {
platform/image-decoders/bmp/BMPImageDecoder.cpp \
platform/image-decoders/ico/ICOImageDecoder.cpp \
platform/image-decoders/xbm/XBMImageDecoder.cpp \
../WebKit/gtk/WebView/webkitnetworkrequest.cpp \
../WebKit/gtk/WebView/webkitprivate.cpp \
../WebKit/gtk/WebView/webkitwebbackforwardlist.cpp \
../WebKit/gtk/WebView/webkitwebframe.cpp \
../WebKit/gtk/WebView/webkitwebhistoryitem.cpp \
../WebKit/gtk/WebView/webkitwebsettings.cpp \
../WebKit/gtk/WebView/webkitwebview.cpp \
../WebKit/gtk/webkit/webkitnetworkrequest.cpp \
../WebKit/gtk/webkit/webkitprivate.cpp \
../WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
../WebKit/gtk/webkit/webkitwebframe.cpp \
../WebKit/gtk/webkit/webkitwebhistoryitem.cpp \
../WebKit/gtk/webkit/webkitwebsettings.cpp \
../WebKit/gtk/webkit/webkitwebview.cpp \
../WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
../WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
../WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \
......@@ -1794,7 +1796,7 @@ gtk-port {
target.path = $$WEBKIT_LIB_DIR
INSTALLS += target
include($$PWD/../WebKit/gtk/WebView/headers.pri)
include($$PWD/../WebKit/gtk/webkit/headers.pri)
headers.files = $$WEBKIT_API_HEADERS
headers.path = $$WEBKIT_INC_DIR
INSTALLS += headers
......@@ -1814,7 +1816,7 @@ gtk-port {
QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace
}
GENMARSHALS = ../WebKit/gtk/WebView/webkit-marshal.list
GENMARSHALS = ../WebKit/gtk/webkit/webkit-marshal.list
GENMARSHALS_PREFIX = webkit_marshal
#
......
......@@ -17,7 +17,7 @@ qt-port:!building-libs {
gtk-port:!building-libs {
QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
LIBS += -lWebKitGtk
DEPENDPATH += $$PWD/WebKit/gtk/WebView $$PWD/WebKit/gtk/WebCoreSupport
DEPENDPATH += $$PWD/WebKit/gtk $$PWD/WebKit/gtk/WebCoreSupport $$PWD/WebKit/gtk/webkit
}
gtk-port {
......@@ -73,8 +73,9 @@ gtk-port:INCLUDEPATH += \
$$BASE_DIR/WebCore/platform/graphics/cairo \
$$BASE_DIR/WebCore/loader/gtk \
$$BASE_DIR/WebCore/page/gtk \
$$BASE_DIR/WebKit/gtk/WebView \
$$BASE_DIR/WebKit/gtk/WebCoreSupport
$$BASE_DIR/WebKit/gtk \
$$BASE_DIR/WebKit/gtk/WebCoreSupport \
$$BASE_DIR/WebKit/gtk/webkit
INCLUDEPATH += \
$$BASE_DIR/JavaScriptCore/ \
$$BASE_DIR/JavaScriptCore/kjs \
......
2008-01-31 Alp Toker <alp@atoker.com>
Reviewed by Adam Roben.
http://bugs.webkit.org/show_bug.cgi?id=17006
[GTK] Header path should be webkit/webkit.h
Move the GTK+ API sources as needed and update the build systems.
* WebView: Removed.
* WebView/headers.pri: Removed.
* WebView/webkit-marshal.list: Removed.
* WebView/webkit.h: Removed.
* WebView/webkitdefines.h: Removed.
* WebView/webkitnetworkrequest.cpp: Removed.
* WebView/webkitnetworkrequest.h: Removed.
* WebView/webkitprivate.cpp: Removed.
* WebView/webkitprivate.h: Removed.
* WebView/webkitwebbackforwardlist.cpp: Removed.
* WebView/webkitwebbackforwardlist.h: Removed.
* WebView/webkitwebframe.cpp: Removed.
* WebView/webkitwebframe.h: Removed.
* WebView/webkitwebhistoryitem.cpp: Removed.
* WebView/webkitwebhistoryitem.h: Removed.
* WebView/webkitwebsettings.cpp: Removed.
* WebView/webkitwebsettings.h: Removed.
* WebView/webkitwebview.cpp: Removed.
* WebView/webkitwebview.h: Removed.
* webkit: Copied from WebKit/gtk/WebView.
* webkit/webkit.h:
* webkit/webkitnetworkrequest.h:
* webkit/webkitprivate.h:
* webkit/webkitwebbackforwardlist.h:
* webkit/webkitwebframe.h:
* webkit/webkitwebhistoryitem.h:
* webkit/webkitwebsettings.h:
* webkit/webkitwebview.h:
2008-01-27 Jan Michael Alonzo <jmalonzo@unpluggable.com>
Reviewed by Alp Toker.
......
......@@ -20,12 +20,12 @@
#ifndef __WEBKIT_H__
#define __WEBKIT_H__
#include <webkitdefines.h>
#include <webkitnetworkrequest.h>
#include <webkitwebframe.h>
#include <webkitwebsettings.h>
#include <webkitwebview.h>
#include <webkitwebbackforwardlist.h>
#include <webkitwebhistoryitem.h>
#include <webkit/webkitdefines.h>
#include <webkit/webkitnetworkrequest.h>
#include <webkit/webkitwebframe.h>
#include <webkit/webkitwebsettings.h>
#include <webkit/webkitwebview.h>
#include <webkit/webkitwebbackforwardlist.h>
#include <webkit/webkitwebhistoryitem.h>
#endif /* __WEBKIT_H__ */
......@@ -22,7 +22,7 @@
#include <glib-object.h>
#include "webkitdefines.h"
#include <webkit/webkitdefines.h>
G_BEGIN_DECLS
......
......@@ -27,12 +27,12 @@
* They are using WebCore which musn't be exposed to the outer world.
*/
#include "webkitdefines.h"
#include "webkitwebview.h"
#include "webkitwebframe.h"
#include "webkitwebsettings.h"
#include "webkitnetworkrequest.h"
#include "webkitwebbackforwardlist.h"
#include <webkit/webkitdefines.h>
#include <webkit/webkitwebview.h>
#include <webkit/webkitwebframe.h>
#include <webkit/webkitwebsettings.h>
#include <webkit/webkitnetworkrequest.h>
#include <webkit/webkitwebbackforwardlist.h>
#include "BackForwardList.h"
#include "HistoryItem.h"
......
......@@ -23,8 +23,8 @@
#include <glib.h>
#include <glib-object.h>
#include "webkitdefines.h"
#include "webkitwebhistoryitem.h"
#include <webkit/webkitdefines.h>
#include <webkit/webkitwebhistoryitem.h>
G_BEGIN_DECLS
......
......@@ -24,7 +24,7 @@
#include <glib-object.h>
#include <JavaScriptCore/JSBase.h>
#include "webkitdefines.h"
#include <webkit/webkitdefines.h>
G_BEGIN_DECLS
......
......@@ -24,7 +24,7 @@
#include <glib-object.h>
#include <gdk/gdk.h>
#include "webkitdefines.h"
#include <webkit/webkitdefines.h>
G_BEGIN_DECLS
......
......@@ -22,7 +22,7 @@
#include <glib-object.h>
#include "webkitdefines.h"
#include <webkit/webkitdefines.h>
G_BEGIN_DECLS
......
......@@ -23,10 +23,10 @@
#include <gtk/gtk.h>
#include <JavaScriptCore/JSBase.h>
#include "webkitdefines.h"
#include "webkitwebbackforwardlist.h"
#include "webkitwebhistoryitem.h"
#include "webkitwebsettings.h"
#include <webkit/webkitdefines.h>
#include <webkit/webkitwebbackforwardlist.h>
#include <webkit/webkitwebhistoryitem.h>
#include <webkit/webkitwebsettings.h>
G_BEGIN_DECLS
......
2008-01-31 Alp Toker <alp@atoker.com>
Reviewed by Adam Roben.
http://bugs.webkit.org/show_bug.cgi?id=17006
[GTK] Header path should be webkit/webkit.h
Move the GTK+ API sources as needed and update the build systems.
* DumpRenderTree/gtk/DumpRenderTree.cpp:
* DumpRenderTree/gtk/DumpRenderTreeGtk.h:
* DumpRenderTree/gtk/WorkQueueItemGtk.cpp:
* GNUmakefile.am:
* GtkLauncher/main.c:
2008-01-30 Stephanie <slewis@apple.com>
Reviewed by Geoff.
......
......@@ -31,7 +31,7 @@
#include "WorkQueueItem.h"
#include <gtk/gtk.h>
#include <webkit.h>
#include <webkit/webkit.h>
#include <JavaScriptCore/JSBase.h>
#include <JavaScriptCore/JSContextRef.h>
......
......@@ -29,7 +29,7 @@
#ifndef DumpRenderTreeGtk_h
#define DumpRenderTreeGtk_h
#include "webkitdefines.h"
#include <webkit/webkitdefines.h>
extern WebKitWebFrame* mainFrame;
extern WebKitWebFrame* topLoadingFrame;
......
......@@ -18,13 +18,10 @@
*/
#include "WorkQueueItem.h"
#include "webkitnetworkrequest.h"
#include "webkitwebframe.h"
#include "webkitwebview.h"
#include "DumpRenderTree.h"
#include <JavaScriptCore/JSStringRef.h>
#include <webkit/webkit.h>
// Returns a newly allocated UTF-8 character buffer which must be freed with g_free()
static gchar* JSStringCopyUTF8CString(JSStringRef jsString)
......
......@@ -4,7 +4,7 @@ noinst_PROGRAMS += \
# GtkLauncher
Programs_GtkLauncher_CPPFLAGS = \
-I$(srcdir)/WebKit/gtk/WebView \
-I$(srcdir)/WebKit/gtk \
$(global_cppflags)
Programs_GtkLauncher_SOURCES = \
......@@ -25,7 +25,7 @@ Programs_GtkLauncher_LDFLAGS = -ljpeg -rpath $(CURDIR)/.libs
Programs_DumpRenderTree_CPPFLAGS = \
-I$(srcdir)/WebKitTools/DumpRenderTree \
-I$(srcdir)/WebKitTools/DumpRenderTree/gtk \
-I$(srcdir)/WebKit/gtk/WebView \
-I$(srcdir)/WebKit/gtk \
$(global_cppflags)
Programs_DumpRenderTree_SOURCES = \
......
......@@ -25,7 +25,7 @@
*/
#include <gtk/gtk.h>
#include <webkit.h>
#include <webkit/webkit.h>
static GtkWidget* main_window;
static GtkWidget* uri_entry;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment