+2008-01-21 Jan Michael Alonzo <jmalonzo@unpluggable.com>
+
+ Reviewed by Alp Toker.
+
+ http://bugs.webkit.org/show_bug.cgi?id=16955
+ Get errors when cross-compile webkit-gtk
+
+ * GNUmakefile.am: added ICU_CPPFLAGS
+ * configure.ac: added ICU_CPPFLAGS, removed ICU_CFLAGS
+
2008-01-19 Jan Michael Alonzo <jmalonzo@unpluggable.com>
Reviewed by Alp Toker.
$(javascriptcore_built_sources) \
$(javascriptcore_sources)
-libJavaScriptCore_la_LDFLAGS = -lpthread
+libJavaScriptCore_la_LDFLAGS = $(ICU_LIBS) -lpthread
libJavaScriptCore_la_CXXFLAGS = $(global_cflags) -fstrict-aliasing
libJavaScriptCore_la_CFLAGS = $(global_cflags) -fstrict-aliasing
-libJavaScriptCore_la_CPPFLAGS = $(global_cppflags) $(javascriptcore_cppflags)
+libJavaScriptCore_la_CPPFLAGS = \
+ $(global_cppflags) \
+ $(javascriptcore_cppflags) \
+ $(ICU_CPPFLAGS)
#
# WebCore
libWebKitGtk_la_CPPFLAGS = \
$(global_cppflags) \
$(webcore_cppflags) \
- $(webkitgtk_cppflags)
+ $(webkitgtk_cppflags) \
+ $(ICU_CPPFLAGS)
libWebKitGtk_la_LIBADD = libJavaScriptCore.la
+2008-01-21 Jan Michael Alonzo <jmalonzo@unpluggable.com>
+
+ Reviewed by Alp Toker.
+
+ http://bugs.webkit.org/show_bug.cgi?id=16955
+ Get errors when cross-compile webkit-gtk
+
+ * GNUmakefile.am: removed ICU_CFLAGS
+
2008-01-18 Kevin McCullough <kmccullough@apple.com>
- Build fix.
JavaScriptCore/API/NodeList.c \
JavaScriptCore/API/minidom.c
Programs_minidom_CPPFLAGS = $(global_cppflags)
-Programs_minidom_CXXFLAGS = $(global_cflags) $(ICU_CFLAGS)
-Programs_minidom_LDADD = $(ICU_LIBS) libJavaScriptCore.la
+Programs_minidom_CXXFLAGS = $(global_cflags)
+Programs_minidom_LDADD = libJavaScriptCore.la
Programs_minidom_LDFLAGS = -rpath $(CURDIR)/.libs
# testkjs
Programs_testkjs_SOURCES = JavaScriptCore/kjs/testkjs.cpp
Programs_testkjs_CPPFLAGS = $(global_cppflags)
-Programs_testkjs_CXXFLAGS = $(global_cflags) $(ICU_CFLAGS)
-Programs_testkjs_LDADD = $(ICU_LIBS) libJavaScriptCore.la
+Programs_testkjs_CXXFLAGS = $(global_cflags)
+Programs_testkjs_LDADD = libJavaScriptCore.la
Programs_testkjs_LDFLAGS = -rpath $(CURDIR)/.libs
# Clean rules for JavaScriptCore
+2008-01-21 Jan Michael Alonzo <jmalonzo@unpluggable.com>
+
+ Reviewed by Alp Toker.
+
+ http://bugs.webkit.org/show_bug.cgi?id=16955
+ Get errors when cross-compile webkit-gtk
+
+ * GNUmakefile.am: Removed ICU_CFLAGS
+
2008-01-21 Darin Adler <darin@apple.com>
Reviewed by Mitz and Adam.
Programs_GtkLauncher_CFLAGS = \
$(DEPENDENCIES_CFLAGS) \
- $(ICU_CFLAGS) \
- $(SQLITE3_CFLAGS) \
- $(GSTREAMER_CFLAGS) \
- $(LIBXSLT_CFLAGS)
+ $(global_cflags)
Programs_GtkLauncher_LDADD = \
$(DEPENDENCIES_LIBS) \
- $(ICU_LIBS) \
- $(SQLITE3_LIBS) \
- $(GSTREAMER_LIBS) \
- $(LIBXSLT_LIBS) \
libJavaScriptCore.la \
libWebKitGtk.la
WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp \
WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
-Programs_DumpRenderTree_CXXFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CXXFLAGS)
-Programs_DumpRenderTree_LDADD = $(DEPENDENCIES_LIBS) libJavaScriptCore.la libWebKitGtk.la
+Programs_DumpRenderTree_CXXFLAGS = \
+ $(DEPENDENCIES_CFLAGS) \
+ $(global_cflags)
+
+Programs_DumpRenderTree_LDADD = \
+ $(DEPENDENCIES_LIBS) \
+ libJavaScriptCore.la \
+ libWebKitGtk.la
+
Programs_DumpRenderTree_LDFLAGS = -rpath $(CURDIR)/.libs
if test "$icu_config" = "no"; then
AC_MSG_ERROR([Cannot find icu-config. ICU library is needed.])
fi
-ICU_CFLAGS=`$icu_config --cflags`
+
+# We don't use --cflags as this gives us a lot of things that we don't
+# necessarily want, like debugging and optimization flags
+# See man (1) icu-config for more info.
+ICU_CPPFLAGS=`$icu_config --cppflags`
ICU_LIBS=`$icu_config --ldflags`
-AC_SUBST([ICU_CFLAGS])
+AC_SUBST([ICU_CPPFLAGS])
AC_SUBST([ICU_LIBS])
# determine the GDK/GTK+ target