2008-04-18 Jan Michael Alonzo <jmalonzo@unpluggable.com>
Reviewed by Alp Toker.
http://bugs.webkit.org/show_bug.cgi?id=14750
[gtk] Implement plugin support in GTK backend
Cleanups.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@32257 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 1b010bc..68cd53d 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -31,13 +31,12 @@
# Directory for autogenerated sources
GENSOURCES := $(top_builddir)/DerivedSources
+GENPROGRAMS := $(top_builddir)/Programs
# Script for creating hash tables
CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/kjs/create_hash_table
# Libraries and support components
-noinst_HEADERS :=
-
noinst_PROGRAMS :=
lib_LIBRARIES :=
@@ -47,7 +46,6 @@
# Files that will be distributed
EXTRA_DIST :=
-#
# Global flags to CPP
global_cppflags :=
@@ -99,11 +97,13 @@
# The variables above are already included below so no need to touch
# these variables unless you really have to
+nodist_EXTRA_libJavaScriptCore_la_SOURCES = \
+ $(javascriptcore_built_sources)
+
libJavaScriptCore_ladir = $(prefix)/include/webkit-1.0/JavaScriptCore
libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api)
libJavaScriptCore_la_SOURCES = \
- $(javascriptcore_built_sources) \
$(javascriptcore_sources)
libJavaScriptCore_la_LIBADD = \
@@ -137,19 +137,10 @@
webcore_built_sources :=
webcore_built_nosources :=
-webcore_cppflags += $(HILDON_CPPFLAGS)
-
-# WebKit
-webkitgtk_h_api :=
-webkitgtk_headers :=
-webkitgtk_sources :=
-webkitgtk_cppflags :=
-webkitgtk_built_sources :=
-webkitgtk_built_nosources :=
-webkitgtk_cleanfiles :=
+nodist_libWebCore_la_SOURCES = \
+ $(webcore_built_sources)
libWebCore_la_SOURCES = \
- $(webcore_built_sources) \
$(webcore_headers) \
$(webcore_sources)
@@ -186,7 +177,8 @@
$(global_cppflags) \
$(webcore_cppflags) \
$(javascriptcore_cppflags) \
- $(webkitgtk_cppflags)
+ $(webkitgtk_cppflags) \
+ $(HILDON_CPPFLAGS)
libWebCore_la_LIBADD = \
libJavaScriptCore.la \
@@ -203,11 +195,22 @@
-lpthread \
-ljpeg
+# WebKit
+webkitgtk_h_api :=
+webkitgtk_headers :=
+webkitgtk_sources :=
+webkitgtk_cppflags :=
+webkitgtk_built_sources :=
+webkitgtk_built_nosources :=
+webkitgtk_cleanfiles :=
+
+nodist_libwebkit_1_0_la_SOURCES = \
+ $(webkitgtk_built_sources)
+
libwebkit_1_0_ladir = $(prefix)/include/webkit-1.0/webkit
libwebkit_1_0_la_HEADERS = $(webkitgtk_h_api)
libwebkit_1_0_la_SOURCES = \
- $(webkitgtk_built_sources) \
$(webkitgtk_headers) \
$(webkitgtk_sources)
@@ -291,8 +294,8 @@
WebKit/gtk/webkit/webkitwebview.h
webkitgtk_built_sources += \
- WebKit/gtk/webkit/webkit-marshal.h \
- WebKit/gtk/webkit/webkit-marshal.cpp
+ DerivedSources/webkit-marshal.h \
+ DerivedSources/webkit-marshal.cpp
webkitgtk_headers += \
WebKit/gtk/webkit/webkitprivate.h \
@@ -327,17 +330,17 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
-WEBKIT_MARSHAL = $(CURDIR)/WebKit/gtk/webkit/webkit-marshal
+WEBKIT_MARSHAL = $(GENSOURCES)/webkit-marshal
WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/webkit/webkit-marshal.list
stamp_files := \
stamp-webkit-marshal.cpp \
stamp-webkit-marshal.h
-WebKit/gtk/webkit/webkit-marshal.cpp: stamp-webkit-marshal.cpp
+DerivedSources/webkit-marshal.cpp: stamp-webkit-marshal.cpp
@true
-WebKit/gtk/webkit/webkit-marshal.h: stamp-webkit-marshal.h
+DerivedSources/webkit-marshal.h: stamp-webkit-marshal.h
@true
stamp-webkit-marshal.cpp: $(WEBKIT_MARSHAL_LIST)
@@ -361,7 +364,6 @@
include WebCore/GNUmakefile.am
include WebKitTools/GNUmakefile.am
-
# Autogenerated sources
BUILT_SOURCES = \
$(javascriptcore_built_sources) \
@@ -373,10 +375,7 @@
# Project-wide clean rules
CLEANFILES += \
- $(webkitgtk_cleanfiles) \
- $(top_builddir)/Programs/DumpRenderTree \
- $(top_builddir)/Programs/testkjs \
- $(GENSOURCES)
+ $(webkitgtk_cleanfiles)
MAINTAINERCLEANFILES += \
$(srcdir)/aconfig.h.in \
@@ -385,3 +384,7 @@
GNUmakefile.in \
INSTALL \
README
+
+# remove built sources and program directories
+clean-local:
+ -rm -rf $(GENSOURCES) $(GENPROGRAMS)
