Changeset 30702 in webkit
- Timestamp:
- Mar 2, 2008 11:51:26 AM (16 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r30645 r30702 1 2008-03-02 Alp Toker <alp@atoker.com> 2 3 Reviewed by Mark Rowe. 4 5 Split the WebKit GTK+ build out of the WebCore build and change the 6 shared object name to match the package name. 7 8 * GNUmakefile.am: 9 1 10 2008-02-28 Alp Toker <alp@atoker.com> 2 11 -
trunk/GNUmakefile.am
r30542 r30702 80 80 # Shared libraries 81 81 lib_LTLIBRARIES = \ 82 lib WebKitGtk.la82 libwebkit-1.0.la 83 83 84 84 # Convenience libraries 85 85 noinst_LTLIBRARIES = \ 86 libJavaScriptCore.la 86 libJavaScriptCore.la \ 87 libWebCore.la 87 88 88 89 # … … 96 97 # The variables above are already included below so no need to touch 97 98 # these variables unless you really have to 98 libJavaScriptCore_ladir = $(prefix)/include/ WebKit/JavaScriptCore99 libJavaScriptCore_ladir = $(prefix)/include/webkit-1.0/JavaScriptCore 99 100 libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api) 100 101 … … 129 130 webcore_sources := 130 131 webcore_headers := 132 webcore_libadd := 131 133 webcore_built_sources := 132 134 webcore_built_nosources := 133 135 134 # WebKitGtk 136 webcore_cppflags += $(HILDON_CPPFLAGS) 137 138 # WebKit 135 139 webkitgtk_h_api := 136 140 webkitgtk_headers := 137 141 webkitgtk_sources := 138 142 webkitgtk_cppflags := 139 webkitgtk_libadd :=140 143 webkitgtk_built_sources := 141 144 webkitgtk_built_nosources := 142 145 webkitgtk_cleanfiles := 143 146 144 webkitgtk_cppflags += $(HILDON_CPPFLAGS) 145 146 # No need to touch the following variables unless you have to. If you need to change the values 147 # for the following variables, use the "webkitgtk_" variables above 148 libWebKitGtk_ladir := $(prefix)/include/WebKit/webkit 149 150 libWebKitGtk_la_HEADERS = $(webkitgtk_h_api) 151 152 libWebKitGtk_la_SOURCES = \ 147 libWebCore_la_SOURCES = \ 153 148 $(webcore_built_sources) \ 154 149 $(webcore_headers) \ 155 $(webcore_sources) \ 156 $(webkitgtk_built_sources) \ 157 $(webkitgtk_headers) \ 158 $(webkitgtk_sources) 159 160 libWebKitGtk_la_CXXFLAGS = \ 150 $(webcore_sources) 151 152 libWebCore_la_CXXFLAGS = \ 161 153 -fno-strict-aliasing \ 162 154 $(global_cxxflags) \ … … 171 163 $(HILDON_CFLAGS) 172 164 173 libWeb KitGtk_la_CFLAGS = \165 libWebCore_la_CFLAGS = \ 174 166 -fno-strict-aliasing \ 175 167 $(global_cflags) \ … … 183 175 $(HILDON_CFLAGS) 184 176 185 libWeb KitGtk_la_CPPFLAGS = \177 libWebCore_la_CPPFLAGS = \ 186 178 $(global_cppflags) \ 187 179 $(webcore_cppflags) \ … … 189 181 $(ICU_CPPFLAGS) 190 182 191 libWebKitGtk_la_LIBADD = libJavaScriptCore.la \ 192 $(webkitgtk_libadd) \ 183 libWebCore_la_LIBADD = \ 184 libJavaScriptCore.la \ 185 $(webcore_libadd) \ 193 186 $(GLOBALDEPS_LIBS) \ 194 187 $(WEBKITDEPS_LIBS) \ … … 202 195 -ljpeg 203 196 204 libWebKitGtk_la_LDFLAGS = \ 197 libwebkit_1_0_ladir = $(prefix)/include/webkit-1.0/webkit 198 libwebkit_1_0_la_HEADERS = $(webkitgtk_h_api) 199 200 libwebkit_1_0_la_SOURCES = \ 201 $(webkitgtk_built_sources) \ 202 $(webkitgtk_headers) \ 203 $(webkitgtk_sources) 204 205 libwebkit_1_0_la_CXXFLAGS = \ 206 $(libWebCore_la_CXXFLAGS) 207 208 libwebkit_1_0_la_CFLAGS = \ 209 $(libWebCore_la_CFLAGS) 210 211 libwebkit_1_0_la_CPPFLAGS = \ 212 $(libWebCore_la_CPPFLAGS) 213 214 libwebkit_1_0_la_LDFLAGS = \ 205 215 $(COVERAGE_LDFLAGS) \ 206 216 -version-info @LIBWEBKITGTK_VERSION@ 217 218 libwebkit_1_0_la_LIBADD = \ 219 libWebCore.la 207 220 208 221 # … … 251 264 252 265 if ENABLE_VIDEO 253 webkitgtk_libadd += -lgstinterfaces-0.10 -lgstvideo-0.10 254 endif 255 256 # 257 # WEBKIT GTK+ 266 webcore_libadd += -lgstinterfaces-0.10 -lgstvideo-0.10 267 endif 268 258 269 webkitgtk_cppflags += \ 259 270 -I$(top_builddir)/WebKit/gtk/webkit \ -
trunk/WebKit/gtk/ChangeLog
r30623 r30702 1 2008-03-02 Alp Toker <alp@atoker.com> 2 3 Reviewed by Mark Rowe. 4 5 Split the WebKit GTK+ build out of the WebCore build and change the 6 shared object name to match the package name. 7 8 * webkit.pc.in: 9 1 10 2008-02-27 Adam Roben <aroben@apple.com> 2 11 -
trunk/WebKit/gtk/webkit.pc.in
r29909 r30702 5 5 6 6 Name: WebKit 7 Description: Web content engine for GTK+ applications7 Description: Web content engine for GTK+ 8 8 Version: @VERSION@ 9 9 Requires: gtk+-2.0 10 Libs: -L${libdir} -l WebKitGtk11 Cflags: -I${includedir}/ WebKit10 Libs: -L${libdir} -lwebkit-1.0 11 Cflags: -I${includedir}/webkit-1.0 -
trunk/WebKitTools/ChangeLog
r30701 r30702 1 2008-03-02 Alp Toker <alp@atoker.com> 2 3 Reviewed by Mark Rowe. 4 5 Split the WebKit GTK+ build out of the WebCore build and change the 6 shared object name to match the package name. 7 8 * GNUmakefile.am: 9 1 10 2008-03-01 Mark Rowe <mrowe@apple.com> 2 11 -
trunk/WebKitTools/GNUmakefile.am
r30542 r30702 19 19 $(GLOBALDEPS_LIBS) \ 20 20 $(WEBKITDEPS_LIBS) \ 21 libJavaScriptCore.la \ 22 libWebKitGtk.la 21 libwebkit-1.0.la 23 22 24 23 Programs_GtkLauncher_LDFLAGS = -rpath $(CURDIR)/.libs … … 49 48 $(GLOBALDEPS_LIBS) \ 50 49 $(WEBKITDEPS_LIBS) \ 51 libJavaScriptCore.la \ 52 libWebKitGtk.la 50 libwebkit-1.0.la 53 51 54 52 Programs_DumpRenderTree_LDFLAGS = -rpath $(CURDIR)/.libs
Note: See TracChangeset
for help on using the changeset viewer.