2008-03-02 Brent Fulgham <bfulgham@gmail.com>

        Reviewed by Alp Toker.

        http://bugs.webkit.org/show_bug.cgi?id=17415
        GTK Build (using autotools) on Mac OS (DarwinPorts) Fails

        Add -lstdc++ to link flags for minidom program.  This corrects
        a build error for the GTK+ on Mac OS.

        Add ICU_CPPFLAGS earlier in include path for WebCore
        so that we find $(icu_cppflags)/unicode/utf8.h, rather than
        the wtf/unicode/UTF8.h on case-insensitive file systems.

        Remove some needless LIBS.

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

diff --git a/ChangeLog b/ChangeLog
index c711b187cf0d74b03a480b5042ebe16dbb3a10bf..36124f73b1d724bc8a433d6f0e205d28a5ead877 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-03-02  Brent Fulgham  <bfulgham@gmail.com>
+
+        Reviewed by Alp Toker.
+
+        Add ICU_CPPFLAGS earlier in include path for WebCore
+        so that we find $(icu_cppflags)/unicode/utf8.h, rather than
+        the wtf/unicode/UTF8.h on case-insensitive file systems.
+
+        * GNUmakefile.am:
+
 2008-03-02  Alp Toker  <alp@atoker.com>
 
         Reviewed by Mark Rowe.

diff --git a/GNUmakefile.am b/GNUmakefile.am
index 64c836aeeccfdcfa00c8d21cc58c3545408b6f95..977770a1eddb868d39f244862bcd7de80759f229 100644 (file)
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -175,10 +175,10 @@ libWebCore_la_CFLAGS = \
        $(HILDON_CFLAGS)
 
 libWebCore_la_CPPFLAGS = \
+       $(ICU_CPPFLAGS) \
        $(global_cppflags) \
        $(webcore_cppflags) \
-       $(webkitgtk_cppflags) \
-       $(ICU_CPPFLAGS)
+       $(webkitgtk_cppflags)
 
 libWebCore_la_LIBADD = \
        libJavaScriptCore.la \

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index a764a7b922cc07eef5862850875945dd3fa69cd8..b4663b7594fa7b7311f53ff80fc9486067e21ba8 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2008-03-02  Brent Fulgham  <bfulgham@gmail.com>
+
+        Reviewed by Alp Toker.
+
+        http://bugs.webkit.org/show_bug.cgi?id=17415
+        GTK Build (using autotools) on Mac OS (DarwinPorts) Fails
+
+        Add -lstdc++ to link flags for minidom program.  This corrects
+        a build error for the GTK+ on Mac OS.
+
+        * GNUmakefile.am:
+
 2008-03-01  Mark Rowe  <mrowe@apple.com>
 
         Reviewed by Tim Hatcher.

diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index 63e604c14732cdf60843048a39cb36d5c8bc5a05..9fac10d9199c5242e3a523d408e13afd69faf20c 100644 (file)
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -159,8 +159,7 @@ Programs_minidom_CXXFLAGS = \
        $(GLOBALDEPS_CFLAGS)
 Programs_minidom_LDADD = \
         libJavaScriptCore.la \
-       $(GLOBALDEPS_LIBS) \
-       $(ICU_LIBS)
+        -lstdc++
 Programs_minidom_LDFLAGS = -rpath $(CURDIR)/.libs
 
 # testkjs
@@ -171,9 +170,7 @@ Programs_testkjs_CXXFLAGS = \
        $(global_cflags) \
        $(GLOBALDEPS_CFLAGS)
 Programs_testkjs_LDADD = \
-       libJavaScriptCore.la \
-       $(GLOBALDEPS_LIBS) \
-       $(ICU_LIBS)
+       libJavaScriptCore.la
 Programs_testkjs_LDFLAGS = -rpath $(CURDIR)/.libs
 
 # Clean rules for JavaScriptCore

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 5d6d8199e60294a029e4d4ba458131be3b89ddc3..45bc2c219e0dad267ce60293f36bd31375610b98 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-02  Brent Fulgham  <bfulgham@gmail.com>
+
+        Reviewed by Alp Toker.
+
+        Remove some needless LIBS.
+
+        * GNUmakefile.am:
+
 2008-03-02  Alp Toker  <alp@atoker.com>
 
         Reviewed by Mark Rowe.

diff --git a/WebKitTools/GNUmakefile.am b/WebKitTools/GNUmakefile.am
index ad229c2a6d8fa0d8b7bd49acde8257e76d82108e..26758b57e5890669c913e71a5c806fdb75b703be 100644 (file)
--- a/WebKitTools/GNUmakefile.am
+++ b/WebKitTools/GNUmakefile.am
@@ -16,8 +16,6 @@ Programs_GtkLauncher_CFLAGS = \
        $(global_cflags)
 
 Programs_GtkLauncher_LDADD = \
-       $(GLOBALDEPS_LIBS) \
-       $(WEBKITDEPS_LIBS) \
        libwebkit-1.0.la
 
 Programs_GtkLauncher_LDFLAGS = -rpath $(CURDIR)/.libs
@@ -45,8 +43,6 @@ Programs_DumpRenderTree_CXXFLAGS = \
        $(global_cflags)
 
 Programs_DumpRenderTree_LDADD = \
-       $(GLOBALDEPS_LIBS) \
-       $(WEBKITDEPS_LIBS) \
        libwebkit-1.0.la
 
 Programs_DumpRenderTree_LDFLAGS = -rpath $(CURDIR)/.libs