2009-05-13 Xan Lopez <xlopez@igalia.com>
authorxan@webkit.org <xan@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 May 2009 13:49:06 +0000 (13:49 +0000)
committerxan@webkit.org <xan@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 May 2009 13:49:06 +0000 (13:49 +0000)
        Rubber-stamped by Gustavo Noronha.

        Revert commit r43563, since it breaks WebKitGTK+ when compiled
        with gcc 4.4.

        * GNUmakefile.am:

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

ChangeLog
GNUmakefile.am

index 15b3972..05165d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-05-13  Xan Lopez  <xlopez@igalia.com>
+
+        Rubber-stamped by Gustavo Noronha.
+
+        Revert commit r43563, since it breaks WebKitGTK+ when compiled
+        with gcc 4.4.
+
+        * GNUmakefile.am:
+
 2009-05-12  Jan Michael Alonzo  <jmalonzo@webkit.org>
 
         Reviewed by Holger Freyther.
index 5676853..957078f 100644 (file)
@@ -38,38 +38,21 @@ CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/create_hash_table
 
 # Libraries and support components
 bin_PROGRAMS :=
+
 noinst_PROGRAMS :=
+
 noinst_HEADERS :=
+
 lib_LIBRARIES :=
+
 IDL_BINDINGS :=
+
 TEST_PROGS :=
-POFILES :=
-MOFILES :=
 
-# local vars used throughout the build
-javascriptcore_h_api :=
-javascriptcore_cppflags:=
-javascriptcore_sources :=
-javascriptcore_built_sources :=
-javascriptcore_built_nosources :=
-javascriptcore_dist :=
-webcore_cppflags :=
-webcore_ldflags :=
-webcore_sources :=
-webcore_built_sources :=
-webcore_built_nosources :=
-webcore_dist :=
-webcoregtk_cppflags :=
-webcoregtk_sources :=
-webkitgtk_h_api :=
-webkitgtk_sources :=
-webkitgtk_cppflags :=
-webkitgtk_built_sources :=
-webkitgtk_built_nosources :=
-webkitgtk_cleanfiles :=
+# Gettext stuff
+POFILES :=
 
-no_undefined :=
-version_script :=
+MOFILES :=
 
 # Global flags to CPP
 global_cppflags :=
@@ -97,40 +80,13 @@ endif
 # -no-undefined required for building DLLs on Windows
 # It breaks the build on other platforms, so we use it conditionally
 if OS_WIN32
-no_undefined += -no-undefined
+no_undefined = -no-undefined
 endif
 
 if OS_GNU
-version_script += -Wl,--version-script,$(srcdir)/autotools/symbols.filter
+version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter
 endif
 
-
-# CFLAGS/CXXFLAGS used by WebCore and WebKit
-#
-# Gtk+.pc already include glib, cairo, freetype and pango CFLAGS
-# Don't include them for now to reduce the noise when compiling
-# $(GLIB_CFLAGS) $(CAIRO_CFLAGS) $(PANGO_CFLAGS)  $(FREETYPE_CFLAGS)
-webkit_cflags := \
-       $(COVERAGE_CFLAGS) \
-       $(ENCHANT_CFLAGS) \
-       $(GEOCLUE_CFLAGS) \
-       $(GNOMEKEYRING_CFLAGS) \
-       $(GSTREAMER_CFLAGS) \
-       $(GTK_CFLAGS) \
-       $(HILDON_CFLAGS) \
-       $(LIBSOUP_CFLAGS) \
-       $(LIBXML_CFLAGS) \
-       $(LIBXSLT_CFLAGS) \
-       $(SQLITE3_CFLAGS) \
-       $(UNICODE_CFLAGS) \
-       $(XT_CFLAGS)
-
-webkit_cppflags := \
-       $(global_cppflags) \
-       $(javascriptcore_cppflags) \
-       $(webcore_cppflags) \
-       $(webcoregtk_cppflags)
-
 # Shared libraries
 lib_LTLIBRARIES = \
        libwebkit-1.0.la
@@ -140,7 +96,15 @@ noinst_LTLIBRARIES = \
        libJavaScriptCore.la \
        libWebCore.la
 
-# JavaScriptCore convenience lib
+#
+# JavaScriptCore
+javascriptcore_h_api :=
+javascriptcore_cppflags:=
+javascriptcore_sources :=
+javascriptcore_built_sources :=
+javascriptcore_built_nosources :=
+javascriptcore_dist :=
+
 javascriptcore_cppflags += \
        -I$(srcdir)/JavaScriptCore \
        -I$(srcdir)/JavaScriptCore/ForwardingHeaders \
@@ -162,6 +126,11 @@ libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api)
 libJavaScriptCore_la_SOURCES = \
        $(javascriptcore_sources)
 
+libJavaScriptCore_la_LIBADD = \
+       $(UNICODE_LIBS) \
+       $(GLIB_LIBS) \
+       -lpthread
+
 libJavaScriptCore_la_CXXFLAGS = \
        $(global_cxxflags) \
        $(libJavaScriptCore_la_CFLAGS)
@@ -177,11 +146,17 @@ libJavaScriptCore_la_CPPFLAGS = \
        $(global_cppflags) \
        $(javascriptcore_cppflags)
 
-libJavaScriptCore_la_LIBADD = \
-       $(GLIB_LIBS) \
-       $(UNICODE_LIBS)
+#
+# WebCore
+webcore_cppflags :=
+webcore_sources :=
+webcore_libadd :=
+webcore_built_sources :=
+webcore_built_nosources :=
+webcore_dist :=
+webcoregtk_cppflags :=
+webcoregtk_sources :=
 
-# WebCore convenience lib
 nodist_EXTRA_libWebCore_la_SOURCES = \
        $(webcore_built_nosources)
 
@@ -192,19 +167,67 @@ libWebCore_la_SOURCES = \
        $(webcore_sources) \
        $(webcoregtk_sources)
 
-libWebCore_la_CPPFLAGS = \
-       $(webkit_cppflags)
-
 libWebCore_la_CXXFLAGS = \
        $(global_cxxflags) \
-       $(webkit_cflags)
+       $(libWebCore_la_CFLAGS)
 
 libWebCore_la_CFLAGS = \
        -fno-strict-aliasing \
        $(global_cflags) \
-       $(webkit_cflags)
+       $(GLIB_CFLAGS) \
+       $(UNICODE_CFLAGS) \
+       $(LIBXML_CFLAGS) \
+       $(CAIRO_CFLAGS) \
+       $(PANGO_CFLAGS) \
+       $(GTK_CFLAGS) \
+       $(XT_CFLAGS) \
+       $(LIBSOUP_CFLAGS) \
+       $(FREETYPE_CFLAGS) \
+       $(SQLITE3_CFLAGS) \
+       $(GSTREAMER_CFLAGS) \
+       $(LIBXSLT_CFLAGS) \
+       $(COVERAGE_CFLAGS) \
+       $(HILDON_CFLAGS) \
+       $(ENCHANT_CFLAGS) \
+       $(GEOCLUE_CFLAGS)
+
+libWebCore_la_CPPFLAGS = \
+       $(global_cppflags) \
+       $(webcore_cppflags) \
+       $(javascriptcore_cppflags) \
+       $(webcoregtk_cppflags) \
+       $(HILDON_CPPFLAGS)
+
+libWebCore_la_LIBADD = \
+       libJavaScriptCore.la \
+       libWebCoreJS.la \
+       $(webcore_libadd) \
+       $(GLIB_LIBS) \
+       $(LIBXML_LIBS) \
+       $(CAIRO_LIBS) \
+       $(PANGO_LIBS) \
+       $(GTK_LIBS) \
+       $(XT_LIBS) \
+       $(LIBSOUP_LIBS) \
+       $(FREETYPE_LIBS) \
+       $(UNICODE_LIBS) \
+       $(SQLITE3_LIBS) \
+       $(GSTREAMER_LIBS) \
+       $(LIBXSLT_LIBS) \
+       $(HILDON_LIBS) \
+       $(JPEG_LIBS) \
+       $(PNG_LIBS) \
+       $(GEOCLUE_LIBS) \
+       -lpthread
+
+# WebKit
+webkitgtk_h_api :=
+webkitgtk_sources :=
+webkitgtk_cppflags :=
+webkitgtk_built_sources :=
+webkitgtk_built_nosources :=
+webkitgtk_cleanfiles :=
 
-# WebKit convenience lib
 nodist_libwebkit_1_0_la_SOURCES = \
        $(webkitgtk_built_sources)
 
@@ -217,50 +240,27 @@ libwebkit_1_0_la_SOURCES = \
        $(webkitgtk_sources)
 
 libwebkit_1_0_la_CXXFLAGS = \
-       $(global_cxxflags) \
-       $(webkit_cflags)
+       $(libWebCore_la_CXXFLAGS)
 
 libwebkit_1_0_la_CFLAGS = \
-       -fno-strict-aliasing \
-       $(global_cflags) \
-       $(webkit_cflags)
+       $(libWebCore_la_CFLAGS) \
+       $(GNOMEKEYRING_CFLAGS)
 
 libwebkit_1_0_la_CPPFLAGS = \
-       $(webkit_cppflags) \
-       $(webkitgtk_cppflags) \
-       $(HILDON_CPPFLAGS)
+       $(libWebCore_la_CPPFLAGS) \
+       $(webkitgtk_cppflags)
 
-libwebkit_1_0_la_LIBADD = \
-       $(webcore_ldflags) \
-       $(CAIRO_LIBS) \
+libwebkit_1_0_la_LDFLAGS = \
        $(COVERAGE_LDFLAGS) \
-       $(ENCHANT_LIBS) \
-       $(FREETYPE_LIBS) \
-       $(GEOCLUE_LIBS) \
-       $(GLIB_LIBS) \
-       $(GNOMEKEYRING_LIBS) \
-       $(GSTREAMER_LIBS) \
-       $(GTK_LIBS) \
-       $(HILDON_LIBS) \
-       $(JPEG_LIBS) \
-       $(LIBSOUP_LIBS) \
-       $(LIBXML_LIBS) \
-       $(LIBXSLT_LIBS) \
-       $(PANGO_LIBS) \
-       $(PNG_LIBS) \
-       $(SQLITE3_LIBS) \
-       $(UNICODE_LIBS) \
-       $(XT_LIBS) \
-       -lpthread \
-       libJavaScriptCore.la \
-       libWebCoreJS.la \
-       libWebCore.la
-
- libwebkit_1_0_la_LDFLAGS = \
        -version-info @LIBWEBKITGTK_VERSION@ \
        $(version_script) \
        $(no_undefined)
 
+libwebkit_1_0_la_LIBADD = \
+       libWebCore.la \
+       $(ENCHANT_LIBS) \
+       $(GNOMEKEYRING_LIBS)
+
 #
 # Extra checks and flags
 global_cppflags += \
@@ -308,7 +308,7 @@ global_cppflags += \
 endif
 
 if ENABLE_VIDEO
-webcore_ldflags += -lgstinterfaces-0.10 -lgstvideo-0.10
+webcore_libadd += -lgstinterfaces-0.10 -lgstvideo-0.10
 endif
 
 webkitgtk_h_api += \