Changeset 32257 in webkit


Ignore:
Timestamp:
Apr 18, 2008 10:16:00 PM (16 years ago)
Author:
alp@webkit.org
Message:

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.

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r32242 r32257  
     12008-04-18  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
     2
     3        Reviewed by Alp Toker.
     4
     5        http://bugs.webkit.org/show_bug.cgi?id=14750
     6        [gtk] Implement plugin support in GTK backend
     7
     8        Cleanups.
     9
     10        * GNUmakefile.am:
     11
    1122008-04-11  Mark Rowe  <mrowe@apple.com>
    213
  • trunk/GNUmakefile.am

    r32242 r32257  
    3232# Directory for autogenerated sources
    3333GENSOURCES := $(top_builddir)/DerivedSources
     34GENPROGRAMS := $(top_builddir)/Programs
    3435
    3536# Script for creating hash tables
     
    3738
    3839# Libraries and support components
    39 noinst_HEADERS :=
    40 
    4140noinst_PROGRAMS :=
    4241
     
    4847EXTRA_DIST :=
    4948
    50 #
    5149# Global flags to CPP
    5250global_cppflags :=
     
    10098# The variables above are already included below so no need to touch
    10199# these variables unless you really have to
     100nodist_EXTRA_libJavaScriptCore_la_SOURCES = \
     101        $(javascriptcore_built_sources)
     102
    102103libJavaScriptCore_ladir = $(prefix)/include/webkit-1.0/JavaScriptCore
    103104libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api)
    104105
    105106libJavaScriptCore_la_SOURCES = \
    106         $(javascriptcore_built_sources) \
    107107        $(javascriptcore_sources)
    108108
     
    138138webcore_built_nosources :=
    139139
    140 webcore_cppflags += $(HILDON_CPPFLAGS)
    141 
    142 # WebKit
    143 webkitgtk_h_api :=
    144 webkitgtk_headers :=
    145 webkitgtk_sources :=
    146 webkitgtk_cppflags :=
    147 webkitgtk_built_sources :=
    148 webkitgtk_built_nosources :=
    149 webkitgtk_cleanfiles :=
     140nodist_libWebCore_la_SOURCES = \
     141        $(webcore_built_sources)
    150142
    151143libWebCore_la_SOURCES = \
    152         $(webcore_built_sources) \
    153144        $(webcore_headers) \
    154145        $(webcore_sources)
     
    187178        $(webcore_cppflags) \
    188179        $(javascriptcore_cppflags) \
    189         $(webkitgtk_cppflags)
     180        $(webkitgtk_cppflags) \
     181        $(HILDON_CPPFLAGS)
    190182
    191183libWebCore_la_LIBADD = \
     
    204196        -ljpeg
    205197
     198# WebKit
     199webkitgtk_h_api :=
     200webkitgtk_headers :=
     201webkitgtk_sources :=
     202webkitgtk_cppflags :=
     203webkitgtk_built_sources :=
     204webkitgtk_built_nosources :=
     205webkitgtk_cleanfiles :=
     206
     207nodist_libwebkit_1_0_la_SOURCES = \
     208        $(webkitgtk_built_sources)
     209
    206210libwebkit_1_0_ladir = $(prefix)/include/webkit-1.0/webkit
    207211libwebkit_1_0_la_HEADERS = $(webkitgtk_h_api)
    208212
    209213libwebkit_1_0_la_SOURCES = \
    210         $(webkitgtk_built_sources) \
    211214        $(webkitgtk_headers) \
    212215        $(webkitgtk_sources)
     
    292295
    293296webkitgtk_built_sources += \
    294         WebKit/gtk/webkit/webkit-marshal.h \
    295         WebKit/gtk/webkit/webkit-marshal.cpp
     297        DerivedSources/webkit-marshal.h \
     298        DerivedSources/webkit-marshal.cpp
    296299
    297300webkitgtk_headers += \
     
    328331pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
    329332
    330 WEBKIT_MARSHAL = $(CURDIR)/WebKit/gtk/webkit/webkit-marshal
     333WEBKIT_MARSHAL = $(GENSOURCES)/webkit-marshal
    331334WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/webkit/webkit-marshal.list
    332335
     
    335338        stamp-webkit-marshal.h
    336339
    337 WebKit/gtk/webkit/webkit-marshal.cpp: stamp-webkit-marshal.cpp
     340DerivedSources/webkit-marshal.cpp: stamp-webkit-marshal.cpp
    338341        @true
    339342
    340 WebKit/gtk/webkit/webkit-marshal.h: stamp-webkit-marshal.h
     343DerivedSources/webkit-marshal.h: stamp-webkit-marshal.h
    341344        @true
    342345
     
    361364include WebCore/GNUmakefile.am
    362365include WebKitTools/GNUmakefile.am
    363 
    364366
    365367# Autogenerated sources
     
    374376# Project-wide clean rules
    375377CLEANFILES += \
    376         $(webkitgtk_cleanfiles) \
    377         $(top_builddir)/Programs/DumpRenderTree \
    378         $(top_builddir)/Programs/testkjs \
    379         $(GENSOURCES)
     378        $(webkitgtk_cleanfiles)
    380379
    381380MAINTAINERCLEANFILES += \
     
    386385        INSTALL \
    387386        README
     387
     388# remove built sources and program directories
     389clean-local:
     390        -rm -rf $(GENSOURCES) $(GENPROGRAMS)
  • trunk/JavaScriptCore/ChangeLog

    r32255 r32257  
     12008-04-18 Jan  Michael Alonzo  <jmalonzo@unpluggable.com>
     2
     3        Reviewed by Alp Toker.
     4
     5        http://bugs.webkit.org/show_bug.cgi?id=14750
     6        [gtk] Implement plugin support in GTK backend
     7
     8        Cleanups.
     9
     10        * GNUmakefile.am:
     11
    1122008-04-18  Jon Honeycutt  <jhoneycutt@apple.com>
    213
  • trunk/JavaScriptCore/GNUmakefile.am

    r31949 r32257  
    1 # tell automake to create gensources/ for us
    2 nodist_EXTRA_libJavaScriptCore_la_SOURCES = \
    3         DerivedSources/dummy.cxx
    4 
    51javascriptcore_cppflags += \
    62        -I$(srcdir)/JavaScriptCore/ForwardingHeaders \
     
    156152         libJavaScriptCore.la \
    157153         -lstdc++
    158 Programs_minidom_LDFLAGS = -rpath $(CURDIR)/.libs
     154Programs_minidom_LDFLAGS = -rpath @abs_top_builddir@/.libs
    159155
    160156# testkjs
     
    170166Programs_testkjs_LDADD = \
    171167        libJavaScriptCore.la
    172 Programs_testkjs_LDFLAGS = -rpath $(CURDIR)/.libs
     168Programs_testkjs_LDFLAGS = -rpath @abs_top_builddir@/.libs
    173169
    174170# Clean rules for JavaScriptCore
     
    180176        JavaScriptCore/kjs/regexp_object.lut.h \
    181177        JavaScriptCore/kjs/string_object.lut.h \
    182         JavaScriptCore/pcre/chartables.c
     178        JavaScriptCore/pcre/chartables.c \
     179        Programs/testkjs \
     180        Programs/minidom
  • trunk/WebCore/ChangeLog

    r32252 r32257  
     12008-04-18 Jan  Michael Alonzo  <jmalonzo@unpluggable.com>
     2
     3        Reviewed by Alp Toker.
     4
     5        http://bugs.webkit.org/show_bug.cgi?id=14750
     6        [gtk] Implement plugin support in GTK backend
     7
     8        Cleanups.
     9
     10        * GNUmakefile.am:
     11
    1122008-04-18  Jon Honeycutt  <jhoneycutt@apple.com>
    213
  • trunk/WebCore/GNUmakefile.am

    r32202 r32257  
    11871187# ----
    11881188if ENABLE_DOM_STORAGE
    1189 FEATURE_DEFINES_JAVASCRIPT += ENABLE_DOM_STORAGE =1
     1189FEATURE_DEFINES_JAVASCRIPT += ENABLE_DOM_STORAGE=1
    11901190
    11911191webcore_built_sources += \
     
    20862086
    20872087# DOCTYPE strings
    2088 $(GENSOURCES)/DocTypeStrings.cpp : $(WebCore)/html/DocTypeStrings.gperf
    2089         $(GPERF) -CEot -L ANSI-C -k "*" -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards \
    2090         $(WebCore)/html/DocTypeStrings.gperf > $@
     2088DerivedSources/DocTypeStrings.cpp : $(WebCore)/html/DocTypeStrings.gperf
     2089        $(GPERF) -CEot -L ANSI-C -k "*" -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards $(WebCore)/html/DocTypeStrings.gperf > $@
    20912090
    20922091# HTML entity names
    2093 $(GENSOURCES)/HTMLEntityNames.c : $(WebCore)/html/HTMLEntityNames.gperf
     2092DerivedSources/HTMLEntityNames.c : $(WebCore)/html/HTMLEntityNames.gperf
    20942093        $(GPERF) -a -L ANSI-C -C -G -c -o -t -k '*' -N findEntity -D -s 2 \
    20952094        $(WebCore)/html/HTMLEntityNames.gperf > $@
    20962095
    20972096# color names
    2098 $(GENSOURCES)/ColorData.c: $(WebCore)/platform/ColorData.gperf
     2097DerivedSources/ColorData.c: $(WebCore)/platform/ColorData.gperf
    20992098        $(GPERF) -CDEot -L ANSI-C -k '*' -N findColor -D -s 2 $< > $@
    21002099
    21012100# CSS tokenizer
    2102 $(GENSOURCES)/tokenizer.cpp : $(WebCore)/css/tokenizer.flex $(WebCore)/css/maketokenizer
     2101DerivedSources/tokenizer.cpp : $(WebCore)/css/tokenizer.flex $(WebCore)/css/maketokenizer
    21032102        $(FLEX) -t $< | $(PERL) $(WebCore)/css/maketokenizer > $@
    21042103
    21052104# CSS grammar
    21062105
    2107 $(GENSOURCES)/CSSGrammar.h: $(GENSOURCES)/CSSGrammar.cpp;
     2106DerivedSources/CSSGrammar.h: $(GENSOURCES)/CSSGrammar.cpp;
    21082107
    21092108# NOTE: older versions of bison do not inject an inclusion guard, so we do it
    2110 $(GENSOURCES)/CSSGrammar.cpp: $(WebCore)/css/CSSGrammar.y
     2109DerivedSources/CSSGrammar.cpp: $(WebCore)/css/CSSGrammar.y
    21112110        rm -f $(GENSOURCES)/CSSGrammar.cpp.h $(GENSOURCES)/CSSGrammar.hpp
    21122111        $(BISON) -d -p cssyy $< -o $(GENSOURCES)/CSSGrammar.cpp
     
    21192118
    21202119# user agent style sheets
    2121 USER_AGENT_STYLE_SHEETS = $(WebCore)/css/html4.css $(WebCore)/css/quirks.css $(WebCore)/css/view-source.css $(WebCore)/css/svg.css
     2120USER_AGENT_STYLE_SHEETS = \
     2121        $(WebCore)/css/html4.css \
     2122        $(WebCore)/css/quirks.css \
     2123        $(WebCore)/css/view-source.css \
     2124        $(WebCore)/css/svg.css
     2125
     2126# new-style JavaScript bindings
     2127SCRIPTS_BINDINGS = \
     2128        $(WebCore)/bindings/scripts/CodeGenerator.pm \
     2129        $(WebCore)/bindings/scripts/IDLParser.pm \
     2130        $(WebCore)/bindings/scripts/IDLStructure.pm \
     2131        $(WebCore)/bindings/scripts/generate-bindings.pl
    21222132
    21232133DerivedSources/UserAgentStyleSheetsData.cpp: DerivedSources/UserAgentStyleSheets.h;
     
    21252135DerivedSources/UserAgentStyleSheets.h: $(WebCore)/css/make-css-file-arrays.pl $(USER_AGENT_STYLE_SHEETS)
    21262136        $(PERL) $< $@ DerivedSources/UserAgentStyleSheetsData.cpp $(USER_AGENT_STYLE_SHEETS)
    2127 
    2128 # character set name table
    2129 CHARSET_TABLE_DEPS := \
    2130         $(WebCore)/platform/text/mac/make-charset-table.pl \
    2131         $(WebCore)/platform/text/mac/character-sets.txt \
    2132         $(WebCore)/platform/text/mac/mac-encodings.txt
    2133 
    2134 DerivedSources/CharsetData.cpp : $(CHARSET_TABLE_DEPS)
    2135         $(PERL) $^ kTextEncoding > $@
    21362137
    21372138# lookup tables for old-style JavaScript bindings
     
    21462147
    21472148DerivedSources/HTMLNames.cpp: $(WebCore)/dom/make_names.pl $(WebCore)/html/HTMLTagNames.in $(WebCore)/html/HTMLAttributeNames.in
    2148         $(PERL) $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in \
    2149             --namespace HTML --namespacePrefix xhtml --cppNamespace WebCore \
    2150             --namespaceURI "http://www.w3.org/1999/xhtml" --attrsNullNamespace \
    2151             --output $(GENSOURCES)
     2149        $(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)
    21522150
    21532151DerivedSources/XMLNames.h: DerivedSources/XMLNames.cpp;
    21542152
    21552153DerivedSources/XMLNames.cpp: $(WebCore)/dom/make_names.pl $(WebCore)/xml/xmlattrs.in
    2156         $(PERL) $< --attrs $(WebCore)/xml/xmlattrs.in \
    2157             --namespace XML --cppNamespace WebCore --namespaceURI "http://www.w3.org/XML/1998/namespace" \
    2158             --output $(GENSOURCES)
    2159 
    2160 # new-style JavaScript bindings
    2161 SCRIPTS_JS_BINDINGS = \
    2162         $(WebCore)/bindings/scripts/CodeGenerator.pm \
    2163         $(WebCore)/bindings/scripts/CodeGeneratorJS.pm \
    2164         $(WebCore)/bindings/scripts/IDLParser.pm \
    2165         $(WebCore)/bindings/scripts/IDLStructure.pm \
    2166         $(WebCore)/bindings/scripts/generate-bindings.pl
     2154        $(PERL) $< --attrs $(WebCore)/xml/xmlattrs.in --namespace XML --cppNamespace WebCore --namespaceURI "http://www.w3.org/XML/1998/namespace" --output $(GENSOURCES)
    21672155
    21682156vpath %.idl = \
     
    21812169DerivedSources/JS%.h: DerivedSources/JS%.cpp;
    21822170
    2183 DerivedSources/JS%.cpp: %.idl $(SCRIPTS_JS_BINDINGS)
    2184         $(PERL) -I$(WebCore)/bindings/scripts \
    2185         $(WebCore)/bindings/scripts/generate-bindings.pl --defines \
    2186         "$(FEATURE_DEFINES_JAVASCRIPT)" --generator JS --include $(WebCore)/dom \
    2187         --include $(WebCore)/html --include $(WebCore)/css --include $(WebCore)/page \
    2188         --include $(WebCore)/xml --include $(WebCore)/svg --outputdir $(GENSOURCES) $<
     2171DerivedSources/JS%.cpp: %.idl $(SCRIPTS_BINDINGS) $(WebCore)/bindings/scripts/CodeGeneratorJS.pm
     2172        $(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 $<
    21892173
    21902174# Clean rules for WebCore
     
    21932177        WebCore/bindings/js/JSEventTargetBase.lut.h \
    21942178        WebCore/bindings/js/JSHTMLInputElementBaseTable.cpp \
    2195         JSDOMWindowBase.lut.h \
    2196         JSRGBColor.lut.h \
    2197         JSXSLTProcessor.lut.h
    2198 
     2179        WebCore/bindings/js/JSDOMWindowBase.lut.h \
     2180        WebCore/bindings/js/JSRGBColor.lut.h \
     2181        WebCore/bindings/js/JSXSLTProcessor.lut.h
     2182
  • trunk/WebKitTools/ChangeLog

    r32212 r32257  
     12008-04-18  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
     2
     3        Reviewed by Alp Toker.
     4
     5        http://bugs.webkit.org/show_bug.cgi?id=14750
     6        [gtk] Implement plugin support in GTK backend
     7
     8        Cleanups.
     9
     10        * GNUmakefile.am:
     11
    1122008-04-18  Adam Roben  <aroben@apple.com>
    213
  • trunk/WebKitTools/GNUmakefile.am

    r31214 r32257  
    2020        libwebkit-1.0.la
    2121
    22 Programs_GtkLauncher_LDFLAGS = -rpath $(CURDIR)/.libs
     22Programs_GtkLauncher_LDFLAGS = -rpath @abs_top_builddir@/.libs
    2323
    2424# DumpRenderTree
     
    4848        libwebkit-1.0.la
    4949
    50 Programs_DumpRenderTree_LDFLAGS = -rpath $(CURDIR)/.libs
     50Programs_DumpRenderTree_LDFLAGS = -rpath @abs_top_builddir@/.libs
     51
     52# clean target
     53CLEANFILES += \
     54        Programs/GtkLauncher \
     55        Programs/DumpRenderTree
Note: See TracChangeset for help on using the changeset viewer.