Based on idea and original patch by Evan Martin.
Remove libWebCore intermediate library, to improve link time.
[GTK] Build time must be reduced
https://bugs.webkit.org/show_bug.cgi?id=32921
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@52813
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2010-01-05 Gustavo Noronha Silva <gns@gnome.org>
+
+ Reviewed by Xan Lopez.
+
+ Based on idea and original patch by Evan Martin.
+
+ Remove libWebCore intermediate library, to improve link time.
+
+ [GTK] Build time must be reduced
+ https://bugs.webkit.org/show_bug.cgi?id=32921
+
+ * GNUmakefile.am:
+
2010-01-05 Xan Lopez <xlopez@igalia.com>
Bump for 1.1.18 release.
bin_PROGRAMS :=
noinst_PROGRAMS :=
noinst_HEADERS :=
+noinst_LTLIBRARIES :=
lib_LIBRARIES :=
IDL_BINDINGS :=
TEST_PROGS :=
libwebkit-1.0.la
# Convenience libraries
-noinst_LTLIBRARIES = \
- libJavaScriptCore.la \
- libWebCore.la
+noinst_LTLIBRARIES += \
+ libJavaScriptCore.la
# JavaScriptCore
javascriptcore_cppflags += \
$(global_cppflags) \
$(javascriptcore_cppflags)
-# WebCore
-nodist_EXTRA_libWebCore_la_SOURCES = \
+# WebKit
+nodist_EXTRA_libwebkit_1_0_la_SOURCES = \
$(webcore_built_nosources)
-nodist_libWebCore_la_SOURCES = \
- $(webcore_built_sources)
-
-libWebCore_la_SOURCES = \
- $(webcore_sources) \
- $(webcoregtk_sources)
-
-libWebCore_la_CXXFLAGS = \
- $(global_cxxflags) \
- $(corekit_cflags)
-
-libWebCore_la_CFLAGS = \
- $(global_cflags) \
- $(corekit_cflags)
-
-libWebCore_la_CPPFLAGS = \
- $(corekit_cppflags)
-
-# WebKit
nodist_libwebkit_1_0_la_SOURCES = \
+ $(webcore_built_sources) \
$(webkitgtk_built_sources)
libwebkit_1_0_ladir = $(prefix)/include/webkit-1.0/webkit
WebKit/gtk/webkit/webkitenumtypes.h
libwebkit_1_0_la_SOURCES = \
+ $(webcore_sources) \
+ $(webcoregtk_sources) \
$(webkitgtk_sources)
libwebkit_1_0_la_CXXFLAGS = \
libwebkit_1_0_la_LIBADD = \
-lpthread \
libJavaScriptCore.la \
- libWebCore.la \
libWebCoreJS.la \
$(webcore_ldflags) \
$(CAIRO_LIBS) \
+2010-01-05 Gustavo Noronha Silva <gns@gnome.org>
+
+ Reviewed by Xan Lopez.
+
+ Based on idea and original patch by Evan Martin.
+
+ Remove libWebCore intermediate library, to improve link time.
+
+ [GTK] Build time must be reduced
+ https://bugs.webkit.org/show_bug.cgi?id=32921
+
+ * GNUmakefile.am:
+
2010-01-05 Nate Chapin <japhet@chromium.org>
Reviewed by Adam Barth.
webcore_built_nosources += $(patsubst %.idl,DerivedSources/JS%.cpp,$(notdir $(IDL_BINDINGS_JS)))
+webcore_built_objects = := $(patsubst %.cpp,%.lo,$(webcore_built_nosources))
+
+$(webcore_built_objects): AM_CPPFLAGS+=$(corekit_cppflags)
+
+$(webcore_built_objects): AM_CXXFLAGS+=$(libwebkit_1_0_la_CXXFLAGS)
+
libWebCoreJS_objects := $(patsubst %.idl,DerivedSources/JS%.lo,$(notdir $(IDL_BINDINGS_JS)))
libWebCoreJS_depfiles := $(patsubst %.idl,DerivedSources/$(DEPDIR)/JS%.Plo,$(notdir $(IDL_BINDINGS_JS)))
-include $(libWebCoreJS_depfiles)
-$(libWebCoreJS_objects): AM_CPPFLAGS+=$(libWebCore_la_CPPFLAGS)
+$(libWebCoreJS_objects): AM_CPPFLAGS+=$(corekit_cppflags)
-$(libWebCoreJS_objects): AM_CXXFLAGS+=$(libWebCore_la_CXXFLAGS)
+$(libWebCoreJS_objects): AM_CXXFLAGS+=$(libwebkit_1_0_la_CXXFLAGS)
libWebCoreJS.la: $(libWebCoreJS_objects)
$(CXXLINK) $(libWebCoreJS_objects) $(LIBS)