Changeset 32257 in webkit
- Timestamp:
- Apr 18, 2008 10:16:00 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r32242 r32257 1 2008-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 1 12 2008-04-11 Mark Rowe <mrowe@apple.com> 2 13 -
trunk/GNUmakefile.am
r32242 r32257 32 32 # Directory for autogenerated sources 33 33 GENSOURCES := $(top_builddir)/DerivedSources 34 GENPROGRAMS := $(top_builddir)/Programs 34 35 35 36 # Script for creating hash tables … … 37 38 38 39 # Libraries and support components 39 noinst_HEADERS :=40 41 40 noinst_PROGRAMS := 42 41 … … 48 47 EXTRA_DIST := 49 48 50 #51 49 # Global flags to CPP 52 50 global_cppflags := … … 100 98 # The variables above are already included below so no need to touch 101 99 # these variables unless you really have to 100 nodist_EXTRA_libJavaScriptCore_la_SOURCES = \ 101 $(javascriptcore_built_sources) 102 102 103 libJavaScriptCore_ladir = $(prefix)/include/webkit-1.0/JavaScriptCore 103 104 libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api) 104 105 105 106 libJavaScriptCore_la_SOURCES = \ 106 $(javascriptcore_built_sources) \107 107 $(javascriptcore_sources) 108 108 … … 138 138 webcore_built_nosources := 139 139 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 := 140 nodist_libWebCore_la_SOURCES = \ 141 $(webcore_built_sources) 150 142 151 143 libWebCore_la_SOURCES = \ 152 $(webcore_built_sources) \153 144 $(webcore_headers) \ 154 145 $(webcore_sources) … … 187 178 $(webcore_cppflags) \ 188 179 $(javascriptcore_cppflags) \ 189 $(webkitgtk_cppflags) 180 $(webkitgtk_cppflags) \ 181 $(HILDON_CPPFLAGS) 190 182 191 183 libWebCore_la_LIBADD = \ … … 204 196 -ljpeg 205 197 198 # WebKit 199 webkitgtk_h_api := 200 webkitgtk_headers := 201 webkitgtk_sources := 202 webkitgtk_cppflags := 203 webkitgtk_built_sources := 204 webkitgtk_built_nosources := 205 webkitgtk_cleanfiles := 206 207 nodist_libwebkit_1_0_la_SOURCES = \ 208 $(webkitgtk_built_sources) 209 206 210 libwebkit_1_0_ladir = $(prefix)/include/webkit-1.0/webkit 207 211 libwebkit_1_0_la_HEADERS = $(webkitgtk_h_api) 208 212 209 213 libwebkit_1_0_la_SOURCES = \ 210 $(webkitgtk_built_sources) \211 214 $(webkitgtk_headers) \ 212 215 $(webkitgtk_sources) … … 292 295 293 296 webkitgtk_built_sources += \ 294 WebKit/gtk/webkit/webkit-marshal.h \295 WebKit/gtk/webkit/webkit-marshal.cpp297 DerivedSources/webkit-marshal.h \ 298 DerivedSources/webkit-marshal.cpp 296 299 297 300 webkitgtk_headers += \ … … 328 331 pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc 329 332 330 WEBKIT_MARSHAL = $( CURDIR)/WebKit/gtk/webkit/webkit-marshal333 WEBKIT_MARSHAL = $(GENSOURCES)/webkit-marshal 331 334 WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/webkit/webkit-marshal.list 332 335 … … 335 338 stamp-webkit-marshal.h 336 339 337 WebKit/gtk/webkit/webkit-marshal.cpp: stamp-webkit-marshal.cpp340 DerivedSources/webkit-marshal.cpp: stamp-webkit-marshal.cpp 338 341 @true 339 342 340 WebKit/gtk/webkit/webkit-marshal.h: stamp-webkit-marshal.h343 DerivedSources/webkit-marshal.h: stamp-webkit-marshal.h 341 344 @true 342 345 … … 361 364 include WebCore/GNUmakefile.am 362 365 include WebKitTools/GNUmakefile.am 363 364 366 365 367 # Autogenerated sources … … 374 376 # Project-wide clean rules 375 377 CLEANFILES += \ 376 $(webkitgtk_cleanfiles) \ 377 $(top_builddir)/Programs/DumpRenderTree \ 378 $(top_builddir)/Programs/testkjs \ 379 $(GENSOURCES) 378 $(webkitgtk_cleanfiles) 380 379 381 380 MAINTAINERCLEANFILES += \ … … 386 385 INSTALL \ 387 386 README 387 388 # remove built sources and program directories 389 clean-local: 390 -rm -rf $(GENSOURCES) $(GENPROGRAMS) -
trunk/JavaScriptCore/ChangeLog
r32255 r32257 1 2008-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 1 12 2008-04-18 Jon Honeycutt <jhoneycutt@apple.com> 2 13 -
trunk/JavaScriptCore/GNUmakefile.am
r31949 r32257 1 # tell automake to create gensources/ for us2 nodist_EXTRA_libJavaScriptCore_la_SOURCES = \3 DerivedSources/dummy.cxx4 5 1 javascriptcore_cppflags += \ 6 2 -I$(srcdir)/JavaScriptCore/ForwardingHeaders \ … … 156 152 libJavaScriptCore.la \ 157 153 -lstdc++ 158 Programs_minidom_LDFLAGS = -rpath $(CURDIR)/.libs154 Programs_minidom_LDFLAGS = -rpath @abs_top_builddir@/.libs 159 155 160 156 # testkjs … … 170 166 Programs_testkjs_LDADD = \ 171 167 libJavaScriptCore.la 172 Programs_testkjs_LDFLAGS = -rpath $(CURDIR)/.libs168 Programs_testkjs_LDFLAGS = -rpath @abs_top_builddir@/.libs 173 169 174 170 # Clean rules for JavaScriptCore … … 180 176 JavaScriptCore/kjs/regexp_object.lut.h \ 181 177 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 1 2008-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 1 12 2008-04-18 Jon Honeycutt <jhoneycutt@apple.com> 2 13 -
trunk/WebCore/GNUmakefile.am
r32202 r32257 1187 1187 # ---- 1188 1188 if ENABLE_DOM_STORAGE 1189 FEATURE_DEFINES_JAVASCRIPT += ENABLE_DOM_STORAGE 1189 FEATURE_DEFINES_JAVASCRIPT += ENABLE_DOM_STORAGE=1 1190 1190 1191 1191 webcore_built_sources += \ … … 2086 2086 2087 2087 # 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 > $@ 2088 DerivedSources/DocTypeStrings.cpp : $(WebCore)/html/DocTypeStrings.gperf 2089 $(GPERF) -CEot -L ANSI-C -k "*" -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards $(WebCore)/html/DocTypeStrings.gperf > $@ 2091 2090 2092 2091 # HTML entity names 2093 $(GENSOURCES)/HTMLEntityNames.c : $(WebCore)/html/HTMLEntityNames.gperf2092 DerivedSources/HTMLEntityNames.c : $(WebCore)/html/HTMLEntityNames.gperf 2094 2093 $(GPERF) -a -L ANSI-C -C -G -c -o -t -k '*' -N findEntity -D -s 2 \ 2095 2094 $(WebCore)/html/HTMLEntityNames.gperf > $@ 2096 2095 2097 2096 # color names 2098 $(GENSOURCES)/ColorData.c: $(WebCore)/platform/ColorData.gperf2097 DerivedSources/ColorData.c: $(WebCore)/platform/ColorData.gperf 2099 2098 $(GPERF) -CDEot -L ANSI-C -k '*' -N findColor -D -s 2 $< > $@ 2100 2099 2101 2100 # CSS tokenizer 2102 $(GENSOURCES)/tokenizer.cpp : $(WebCore)/css/tokenizer.flex $(WebCore)/css/maketokenizer2101 DerivedSources/tokenizer.cpp : $(WebCore)/css/tokenizer.flex $(WebCore)/css/maketokenizer 2103 2102 $(FLEX) -t $< | $(PERL) $(WebCore)/css/maketokenizer > $@ 2104 2103 2105 2104 # CSS grammar 2106 2105 2107 $(GENSOURCES)/CSSGrammar.h: $(GENSOURCES)/CSSGrammar.cpp;2106 DerivedSources/CSSGrammar.h: $(GENSOURCES)/CSSGrammar.cpp; 2108 2107 2109 2108 # NOTE: older versions of bison do not inject an inclusion guard, so we do it 2110 $(GENSOURCES)/CSSGrammar.cpp: $(WebCore)/css/CSSGrammar.y2109 DerivedSources/CSSGrammar.cpp: $(WebCore)/css/CSSGrammar.y 2111 2110 rm -f $(GENSOURCES)/CSSGrammar.cpp.h $(GENSOURCES)/CSSGrammar.hpp 2112 2111 $(BISON) -d -p cssyy $< -o $(GENSOURCES)/CSSGrammar.cpp … … 2119 2118 2120 2119 # 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 2120 USER_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 2127 SCRIPTS_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 2122 2132 2123 2133 DerivedSources/UserAgentStyleSheetsData.cpp: DerivedSources/UserAgentStyleSheets.h; … … 2125 2135 DerivedSources/UserAgentStyleSheets.h: $(WebCore)/css/make-css-file-arrays.pl $(USER_AGENT_STYLE_SHEETS) 2126 2136 $(PERL) $< $@ DerivedSources/UserAgentStyleSheetsData.cpp $(USER_AGENT_STYLE_SHEETS) 2127 2128 # character set name table2129 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.txt2133 2134 DerivedSources/CharsetData.cpp : $(CHARSET_TABLE_DEPS)2135 $(PERL) $^ kTextEncoding > $@2136 2137 2137 2138 # lookup tables for old-style JavaScript bindings … … 2146 2147 2147 2148 DerivedSources/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) 2152 2150 2153 2151 DerivedSources/XMLNames.h: DerivedSources/XMLNames.cpp; 2154 2152 2155 2153 DerivedSources/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) 2167 2155 2168 2156 vpath %.idl = \ … … 2181 2169 DerivedSources/JS%.h: DerivedSources/JS%.cpp; 2182 2170 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) $< 2171 DerivedSources/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 $< 2189 2173 2190 2174 # Clean rules for WebCore … … 2193 2177 WebCore/bindings/js/JSEventTargetBase.lut.h \ 2194 2178 WebCore/bindings/js/JSHTMLInputElementBaseTable.cpp \ 2195 JSDOMWindowBase.lut.h \2196 JSRGBColor.lut.h \2197 JSXSLTProcessor.lut.h2198 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 1 2008-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 1 12 2008-04-18 Adam Roben <aroben@apple.com> 2 13 -
trunk/WebKitTools/GNUmakefile.am
r31214 r32257 20 20 libwebkit-1.0.la 21 21 22 Programs_GtkLauncher_LDFLAGS = -rpath $(CURDIR)/.libs22 Programs_GtkLauncher_LDFLAGS = -rpath @abs_top_builddir@/.libs 23 23 24 24 # DumpRenderTree … … 48 48 libwebkit-1.0.la 49 49 50 Programs_DumpRenderTree_LDFLAGS = -rpath $(CURDIR)/.libs 50 Programs_DumpRenderTree_LDFLAGS = -rpath @abs_top_builddir@/.libs 51 52 # clean target 53 CLEANFILES += \ 54 Programs/GtkLauncher \ 55 Programs/DumpRenderTree
Note: See TracChangeset
for help on using the changeset viewer.