Changeset 29701 in webkit
- Timestamp:
- Jan 21, 2008 3:06:23 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r29670 r29701 1 2008-01-21 Jan Michael Alonzo <jmalonzo@unpluggable.com> 2 3 Reviewed by Alp Toker. 4 5 http://bugs.webkit.org/show_bug.cgi?id=16955 6 Get errors when cross-compile webkit-gtk 7 8 * GNUmakefile.am: added ICU_CPPFLAGS 9 * configure.ac: added ICU_CPPFLAGS, removed ICU_CFLAGS 10 1 11 2008-01-19 Jan Michael Alonzo <jmalonzo@unpluggable.com> 2 12 -
trunk/GNUmakefile.am
r29505 r29701 95 95 $(javascriptcore_sources) 96 96 97 libJavaScriptCore_la_LDFLAGS = -lpthread97 libJavaScriptCore_la_LDFLAGS = $(ICU_LIBS) -lpthread 98 98 99 99 libJavaScriptCore_la_CXXFLAGS = $(global_cflags) -fstrict-aliasing … … 101 101 libJavaScriptCore_la_CFLAGS = $(global_cflags) -fstrict-aliasing 102 102 103 libJavaScriptCore_la_CPPFLAGS = $(global_cppflags) $(javascriptcore_cppflags) 103 libJavaScriptCore_la_CPPFLAGS = \ 104 $(global_cppflags) \ 105 $(javascriptcore_cppflags) \ 106 $(ICU_CPPFLAGS) 104 107 105 108 # … … 158 161 $(global_cppflags) \ 159 162 $(webcore_cppflags) \ 160 $(webkitgtk_cppflags) 163 $(webkitgtk_cppflags) \ 164 $(ICU_CPPFLAGS) 161 165 162 166 libWebKitGtk_la_LIBADD = libJavaScriptCore.la -
trunk/JavaScriptCore/ChangeLog
r29663 r29701 1 2008-01-21 Jan Michael Alonzo <jmalonzo@unpluggable.com> 2 3 Reviewed by Alp Toker. 4 5 http://bugs.webkit.org/show_bug.cgi?id=16955 6 Get errors when cross-compile webkit-gtk 7 8 * GNUmakefile.am: removed ICU_CFLAGS 9 1 10 2008-01-18 Kevin McCullough <kmccullough@apple.com> 2 11 -
trunk/JavaScriptCore/GNUmakefile.am
r29445 r29701 150 150 JavaScriptCore/API/minidom.c 151 151 Programs_minidom_CPPFLAGS = $(global_cppflags) 152 Programs_minidom_CXXFLAGS = $(global_cflags) $(ICU_CFLAGS)153 Programs_minidom_LDADD = $(ICU_LIBS)libJavaScriptCore.la152 Programs_minidom_CXXFLAGS = $(global_cflags) 153 Programs_minidom_LDADD = libJavaScriptCore.la 154 154 Programs_minidom_LDFLAGS = -rpath $(CURDIR)/.libs 155 155 … … 157 157 Programs_testkjs_SOURCES = JavaScriptCore/kjs/testkjs.cpp 158 158 Programs_testkjs_CPPFLAGS = $(global_cppflags) 159 Programs_testkjs_CXXFLAGS = $(global_cflags) $(ICU_CFLAGS)160 Programs_testkjs_LDADD = $(ICU_LIBS)libJavaScriptCore.la159 Programs_testkjs_CXXFLAGS = $(global_cflags) 160 Programs_testkjs_LDADD = libJavaScriptCore.la 161 161 Programs_testkjs_LDFLAGS = -rpath $(CURDIR)/.libs 162 162 -
trunk/WebKitTools/ChangeLog
r29694 r29701 1 2008-01-21 Jan Michael Alonzo <jmalonzo@unpluggable.com> 2 3 Reviewed by Alp Toker. 4 5 http://bugs.webkit.org/show_bug.cgi?id=16955 6 Get errors when cross-compile webkit-gtk 7 8 * GNUmakefile.am: Removed ICU_CFLAGS 9 1 10 2008-01-21 Darin Adler <darin@apple.com> 2 11 -
trunk/WebKitTools/GNUmakefile.am
r29445 r29701 13 13 Programs_GtkLauncher_CFLAGS = \ 14 14 $(DEPENDENCIES_CFLAGS) \ 15 $(ICU_CFLAGS) \ 16 $(SQLITE3_CFLAGS) \ 17 $(GSTREAMER_CFLAGS) \ 18 $(LIBXSLT_CFLAGS) 15 $(global_cflags) 19 16 20 17 Programs_GtkLauncher_LDADD = \ 21 18 $(DEPENDENCIES_LIBS) \ 22 $(ICU_LIBS) \23 $(SQLITE3_LIBS) \24 $(GSTREAMER_LIBS) \25 $(LIBXSLT_LIBS) \26 19 libJavaScriptCore.la \ 27 20 libWebKitGtk.la … … 45 38 WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp 46 39 47 Programs_DumpRenderTree_CXXFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CXXFLAGS) 48 Programs_DumpRenderTree_LDADD = $(DEPENDENCIES_LIBS) libJavaScriptCore.la libWebKitGtk.la 40 Programs_DumpRenderTree_CXXFLAGS = \ 41 $(DEPENDENCIES_CFLAGS) \ 42 $(global_cflags) 43 44 Programs_DumpRenderTree_LDADD = \ 45 $(DEPENDENCIES_LIBS) \ 46 libJavaScriptCore.la \ 47 libWebKitGtk.la 48 49 49 Programs_DumpRenderTree_LDFLAGS = -rpath $(CURDIR)/.libs -
trunk/configure.ac
r29670 r29701 130 130 AC_MSG_ERROR([Cannot find icu-config. ICU library is needed.]) 131 131 fi 132 ICU_CFLAGS=`$icu_config --cflags` 132 133 # We don't use --cflags as this gives us a lot of things that we don't 134 # necessarily want, like debugging and optimization flags 135 # See man (1) icu-config for more info. 136 ICU_CPPFLAGS=`$icu_config --cppflags` 133 137 ICU_LIBS=`$icu_config --ldflags` 134 AC_SUBST([ICU_C FLAGS])138 AC_SUBST([ICU_CPPFLAGS]) 135 139 AC_SUBST([ICU_LIBS]) 136 140
Note: See TracChangeset
for help on using the changeset viewer.