2008-04-18 Jan Michael Alonzo <jmalonzo@unpluggable.com>
authoralp@webkit.org <alp@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 19 Apr 2008 05:16:00 +0000 (05:16 +0000)
committeralp@webkit.org <alp@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 19 Apr 2008 05:16:00 +0000 (05:16 +0000)
        Reviewed by Alp Toker.

        http://bugs.webkit.org/show_bug.cgi?id=14750
        [gtk] Implement plugin support in GTK backend

        Cleanups.

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

ChangeLog
GNUmakefile.am
JavaScriptCore/ChangeLog
JavaScriptCore/GNUmakefile.am
WebCore/ChangeLog
WebCore/GNUmakefile.am
WebKitTools/ChangeLog
WebKitTools/GNUmakefile.am

index 649aceb..9c339c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+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.
+
+        * GNUmakefile.am:
+
 2008-04-11  Mark Rowe  <mrowe@apple.com>
 
         Rubber-stamped by Antti Koivisto.
index 1b010bc..68cd53d 100644 (file)
@@ -31,13 +31,12 @@ VPATH = @srcdir@
 
 # 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 @@ IDL_BINDINGS :=
 # Files that will be distributed
 EXTRA_DIST :=
 
-#
 # Global flags to CPP
 global_cppflags :=
 
@@ -99,11 +97,13 @@ javascriptcore_cppflags += \
 
 # 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_libadd :=
 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 @@ libWebCore_la_CPPFLAGS = \
        $(global_cppflags) \
        $(webcore_cppflags) \
        $(javascriptcore_cppflags) \
-       $(webkitgtk_cppflags)
+       $(webkitgtk_cppflags) \
+       $(HILDON_CPPFLAGS)
 
 libWebCore_la_LIBADD = \
        libJavaScriptCore.la \
@@ -203,11 +195,22 @@ libWebCore_la_LIBADD = \
        -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 @@ webkitgtk_h_api += \
        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 @@ webkitgtk_cleanfiles += \
 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 JavaScriptCore/GNUmakefile.am
 include WebCore/GNUmakefile.am
 include WebKitTools/GNUmakefile.am
 
-
 # Autogenerated sources
 BUILT_SOURCES = \
        $(javascriptcore_built_sources) \
@@ -373,10 +375,7 @@ BUILT_SOURCES = \
 
 # 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 @@ MAINTAINERCLEANFILES += \
        GNUmakefile.in \
        INSTALL \
        README
+
+# remove built sources and program directories
+clean-local:
+       -rm -rf $(GENSOURCES) $(GENPROGRAMS)
index 39dcaad..d4b109f 100644 (file)
@@ -1,3 +1,14 @@
+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.
+
+        * GNUmakefile.am:
+
 2008-04-18  Jon Honeycutt  <jhoneycutt@apple.com>
 
         * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Windows
index 2ce805b..6c2b703 100644 (file)
@@ -1,7 +1,3 @@
-# tell automake to create gensources/ for us
-nodist_EXTRA_libJavaScriptCore_la_SOURCES = \
-       DerivedSources/dummy.cxx
-
 javascriptcore_cppflags += \
        -I$(srcdir)/JavaScriptCore/ForwardingHeaders \
        -I$(srcdir)/JavaScriptCore/wtf/unicode \
@@ -155,7 +151,7 @@ Programs_minidom_CXXFLAGS = \
 Programs_minidom_LDADD = \
         libJavaScriptCore.la \
         -lstdc++
-Programs_minidom_LDFLAGS = -rpath $(CURDIR)/.libs
+Programs_minidom_LDFLAGS = -rpath @abs_top_builddir@/.libs
 
 # testkjs
 Programs_testkjs_SOURCES = JavaScriptCore/kjs/testkjs.cpp
@@ -169,7 +165,7 @@ Programs_testkjs_CXXFLAGS = \
        $(UNICODE_CFLAGS)
 Programs_testkjs_LDADD = \
        libJavaScriptCore.la
-Programs_testkjs_LDFLAGS = -rpath $(CURDIR)/.libs
+Programs_testkjs_LDFLAGS = -rpath @abs_top_builddir@/.libs
 
 # Clean rules for JavaScriptCore
 CLEANFILES += \
@@ -179,4 +175,6 @@ CLEANFILES += \
        JavaScriptCore/kjs/number_object.lut.h \
        JavaScriptCore/kjs/regexp_object.lut.h \
        JavaScriptCore/kjs/string_object.lut.h \
-       JavaScriptCore/pcre/chartables.c
+       JavaScriptCore/pcre/chartables.c \
+       Programs/testkjs \
+       Programs/minidom
index a8f0063..cba159c 100644 (file)
@@ -1,3 +1,14 @@
+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.
+
+        * GNUmakefile.am:
+
 2008-04-18  Jon Honeycutt  <jhoneycutt@apple.com>
 
         Reviewed by Ollie.
index 57c22e5..88593ef 100644 (file)
@@ -1186,7 +1186,7 @@ endif # END ENABLE_DATABASE
 # HTML5 client-side session and persistent storage
 # ----
 if ENABLE_DOM_STORAGE
-FEATURE_DEFINES_JAVASCRIPT += ENABLE_DOM_STORAGE =1
+FEATURE_DEFINES_JAVASCRIPT += ENABLE_DOM_STORAGE=1
 
 webcore_built_sources += \
        DerivedSources/JSStorage.h \
@@ -2085,29 +2085,28 @@ DerivedSources/CSSValueKeywords.h: $(WebCore)/css/CSSValueKeywords.in $(WebCore)
 endif !ENABLE_SVG # END ENABLE_SVG
 
 # DOCTYPE strings
-$(GENSOURCES)/DocTypeStrings.cpp : $(WebCore)/html/DocTypeStrings.gperf
-       $(GPERF) -CEot -L ANSI-C -k "*" -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards \
-       $(WebCore)/html/DocTypeStrings.gperf > $@
+DerivedSources/DocTypeStrings.cpp : $(WebCore)/html/DocTypeStrings.gperf
+       $(GPERF) -CEot -L ANSI-C -k "*" -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards $(WebCore)/html/DocTypeStrings.gperf > $@
 
 # HTML entity names
-$(GENSOURCES)/HTMLEntityNames.c : $(WebCore)/html/HTMLEntityNames.gperf
+DerivedSources/HTMLEntityNames.c : $(WebCore)/html/HTMLEntityNames.gperf
        $(GPERF) -a -L ANSI-C -C -G -c -o -t -k '*' -N findEntity -D -s 2 \
        $(WebCore)/html/HTMLEntityNames.gperf > $@
 
 # color names
-$(GENSOURCES)/ColorData.c: $(WebCore)/platform/ColorData.gperf
+DerivedSources/ColorData.c: $(WebCore)/platform/ColorData.gperf
        $(GPERF) -CDEot -L ANSI-C -k '*' -N findColor -D -s 2 $< > $@
 
 # CSS tokenizer
-$(GENSOURCES)/tokenizer.cpp : $(WebCore)/css/tokenizer.flex $(WebCore)/css/maketokenizer
+DerivedSources/tokenizer.cpp : $(WebCore)/css/tokenizer.flex $(WebCore)/css/maketokenizer
        $(FLEX) -t $< | $(PERL) $(WebCore)/css/maketokenizer > $@
 
 # CSS grammar
 
-$(GENSOURCES)/CSSGrammar.h: $(GENSOURCES)/CSSGrammar.cpp;
+DerivedSources/CSSGrammar.h: $(GENSOURCES)/CSSGrammar.cpp;
 
 # NOTE: older versions of bison do not inject an inclusion guard, so we do it
-$(GENSOURCES)/CSSGrammar.cpp: $(WebCore)/css/CSSGrammar.y
+DerivedSources/CSSGrammar.cpp: $(WebCore)/css/CSSGrammar.y
        rm -f $(GENSOURCES)/CSSGrammar.cpp.h $(GENSOURCES)/CSSGrammar.hpp
        $(BISON) -d -p cssyy $< -o $(GENSOURCES)/CSSGrammar.cpp
        touch $(GENSOURCES)/CSSGrammar.cpp.h $(GENSOURCES)/CSSGrammar.hpp
@@ -2118,22 +2117,24 @@ $(GENSOURCES)/CSSGrammar.cpp: $(WebCore)/css/CSSGrammar.y
        rm -f $(GENSOURCES)/CSSGrammar.cpp.h $(GENSOURCES)/CSSGrammar.hpp
 
 # user agent style sheets
-USER_AGENT_STYLE_SHEETS = $(WebCore)/css/html4.css $(WebCore)/css/quirks.css $(WebCore)/css/view-source.css $(WebCore)/css/svg.css
+USER_AGENT_STYLE_SHEETS = \
+       $(WebCore)/css/html4.css \
+       $(WebCore)/css/quirks.css \
+       $(WebCore)/css/view-source.css \
+       $(WebCore)/css/svg.css
+
+# new-style JavaScript bindings
+SCRIPTS_BINDINGS = \
+       $(WebCore)/bindings/scripts/CodeGenerator.pm \
+       $(WebCore)/bindings/scripts/IDLParser.pm \
+       $(WebCore)/bindings/scripts/IDLStructure.pm \
+       $(WebCore)/bindings/scripts/generate-bindings.pl
 
 DerivedSources/UserAgentStyleSheetsData.cpp: DerivedSources/UserAgentStyleSheets.h;
 
 DerivedSources/UserAgentStyleSheets.h: $(WebCore)/css/make-css-file-arrays.pl $(USER_AGENT_STYLE_SHEETS)
        $(PERL) $< $@ DerivedSources/UserAgentStyleSheetsData.cpp $(USER_AGENT_STYLE_SHEETS)
 
-# character set name table
-CHARSET_TABLE_DEPS := \
-       $(WebCore)/platform/text/mac/make-charset-table.pl \
-       $(WebCore)/platform/text/mac/character-sets.txt \
-       $(WebCore)/platform/text/mac/mac-encodings.txt
-
-DerivedSources/CharsetData.cpp : $(CHARSET_TABLE_DEPS)
-       $(PERL) $^ kTextEncoding > $@
-
 # lookup tables for old-style JavaScript bindings
 %.lut.h: %.cpp $(CREATE_HASH_TABLE)
        $(CREATE_HASH_TABLE) $< > $@
@@ -2145,25 +2146,12 @@ WebCore/bindings/js/%Table.cpp: $(srcdir)/WebCore/bindings/js/JSHTMLInputElement
 DerivedSources/HTMLNames.h: DerivedSources/HTMLNames.cpp;
 
 DerivedSources/HTMLNames.cpp: $(WebCore)/dom/make_names.pl $(WebCore)/html/HTMLTagNames.in $(WebCore)/html/HTMLAttributeNames.in
-       $(PERL) $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in \
-           --namespace HTML --namespacePrefix xhtml --cppNamespace WebCore \
-           --namespaceURI "http://www.w3.org/1999/xhtml" --attrsNullNamespace \
-           --output $(GENSOURCES)
+       $(PERL) $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --namespace HTML --namespacePrefix xhtml --cppNamespace WebCore --namespaceURI "http://www.w3.org/1999/xhtml" --attrsNullNamespace --output $(GENSOURCES)
 
 DerivedSources/XMLNames.h: DerivedSources/XMLNames.cpp;
 
 DerivedSources/XMLNames.cpp: $(WebCore)/dom/make_names.pl $(WebCore)/xml/xmlattrs.in
-       $(PERL) $< --attrs $(WebCore)/xml/xmlattrs.in \
-            --namespace XML --cppNamespace WebCore --namespaceURI "http://www.w3.org/XML/1998/namespace" \
-           --output $(GENSOURCES)
-
-# new-style JavaScript bindings
-SCRIPTS_JS_BINDINGS = \
-       $(WebCore)/bindings/scripts/CodeGenerator.pm \
-       $(WebCore)/bindings/scripts/CodeGeneratorJS.pm \
-       $(WebCore)/bindings/scripts/IDLParser.pm \
-       $(WebCore)/bindings/scripts/IDLStructure.pm \
-       $(WebCore)/bindings/scripts/generate-bindings.pl
+       $(PERL) $< --attrs $(WebCore)/xml/xmlattrs.in --namespace XML --cppNamespace WebCore --namespaceURI "http://www.w3.org/XML/1998/namespace" --output $(GENSOURCES)
 
 vpath %.idl = \
     $(WebCore) \
@@ -2180,19 +2168,15 @@ vpath %.idl = \
 
 DerivedSources/JS%.h: DerivedSources/JS%.cpp;
 
-DerivedSources/JS%.cpp: %.idl $(SCRIPTS_JS_BINDINGS)
-       $(PERL) -I$(WebCore)/bindings/scripts \
-       $(WebCore)/bindings/scripts/generate-bindings.pl --defines \
-       "$(FEATURE_DEFINES_JAVASCRIPT)" --generator JS --include $(WebCore)/dom \
-       --include $(WebCore)/html --include $(WebCore)/css --include $(WebCore)/page \
-       --include $(WebCore)/xml --include $(WebCore)/svg --outputdir $(GENSOURCES) $<
+DerivedSources/JS%.cpp: %.idl $(SCRIPTS_BINDINGS) $(WebCore)/bindings/scripts/CodeGeneratorJS.pm
+       $(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) --defines "$(FEATURE_DEFINES_JAVASCRIPT)" --generator JS $<
 
 # Clean rules for WebCore
 
 CLEANFILES += \
        WebCore/bindings/js/JSEventTargetBase.lut.h \
        WebCore/bindings/js/JSHTMLInputElementBaseTable.cpp \
-       JSDOMWindowBase.lut.h \
-       JSRGBColor.lut.h \
-       JSXSLTProcessor.lut.h
+       WebCore/bindings/js/JSDOMWindowBase.lut.h \
+       WebCore/bindings/js/JSRGBColor.lut.h \
+       WebCore/bindings/js/JSXSLTProcessor.lut.h
 
index 1d6f1b7..eb4c0a3 100644 (file)
@@ -1,3 +1,14 @@
+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.
+
+        * GNUmakefile.am:
+
 2008-04-18  Adam Roben  <aroben@apple.com>
 
         Drop the hang timer to 30 seconds
index 2ba6400..c9db11b 100644 (file)
@@ -19,7 +19,7 @@ Programs_GtkLauncher_CFLAGS = \
 Programs_GtkLauncher_LDADD = \
        libwebkit-1.0.la
 
-Programs_GtkLauncher_LDFLAGS = -rpath $(CURDIR)/.libs
+Programs_GtkLauncher_LDFLAGS = -rpath @abs_top_builddir@/.libs
 
 # DumpRenderTree
 Programs_DumpRenderTree_CPPFLAGS = \
@@ -47,4 +47,9 @@ Programs_DumpRenderTree_CXXFLAGS = \
 Programs_DumpRenderTree_LDADD = \
        libwebkit-1.0.la
 
-Programs_DumpRenderTree_LDFLAGS = -rpath $(CURDIR)/.libs
+Programs_DumpRenderTree_LDFLAGS = -rpath @abs_top_builddir@/.libs
+
+# clean target
+CLEANFILES += \
+       Programs/GtkLauncher \
+       Programs/DumpRenderTree