JavaScriptCore/ChangeLog:
authorzecke@webkit.org <zecke@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Mar 2008 18:21:25 +0000 (18:21 +0000)
committerzecke@webkit.org <zecke@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Mar 2008 18:21:25 +0000 (18:21 +0000)
2008-03-21  Rodney Dawes  <dobey@wayofthemonkey.com>

        Reviewed by Holger.

        http://bugs.webkit.org/show_bug.cgi?id=17981

        Add javascriptcore_cppflags to Programs_minidom_CPPFLAGS.

        * GNUmakefile.am:

WebCore/ChaneLog:
2008-03-21  Rodney Dawes  <dobey@wayofthemonkey.com>

        Reviewed by Holger.

        http://bugs.webkit.org/show_bug.cgi?id=17981

        Remove WebCore/ForwardingHeaders from cppflags as it is not needed,
        and causes build problems with GTK+.

        * GNUmakefile.am:

WebKitTools/ChangeLog:
2008-03-21  Rodney Dawes  <dobey@wayofthemonkey.com>

        Reviewed by Holger.

        http://bugs.webkit.org/show_bug.cgi?id=17981

        Add webcore and javascriptcore cppflags to programs' _CPPFLAGS.

        * GNUmakefile.am:

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

GNUmakefile.am
JavaScriptCore/ChangeLog
JavaScriptCore/GNUmakefile.am
WebCore/ChangeLog
WebCore/GNUmakefile.am
WebKitTools/ChangeLog
WebKitTools/GNUmakefile.am

index d27837a..4cdd3db 100644 (file)
@@ -52,13 +52,6 @@ EXTRA_DIST :=
 global_cppflags :=
 
 global_cppflags += \
-       -I$(srcdir)/JavaScriptCore \
-       -I$(srcdir)/JavaScriptCore/ForwardingHeaders \
-       -I$(srcdir)/JavaScriptCore/wtf \
-       -I$(srcdir)/JavaScriptCore/kjs \
-       -I$(top_builddir)/DerivedSources
-
-global_cppflags += \
        -DWTF_USE_ICU_UNICODE=1
 
 # Default compiler flags
@@ -97,6 +90,13 @@ javascriptcore_sources :=
 javascriptcore_built_sources :=
 javascriptcore_built_nosources :=
 
+javascriptcore_cppflags += \
+       -I$(srcdir)/JavaScriptCore \
+       -I$(srcdir)/JavaScriptCore/ForwardingHeaders \
+       -I$(srcdir)/JavaScriptCore/wtf \
+       -I$(srcdir)/JavaScriptCore/kjs \
+       -I$(top_builddir)/DerivedSources
+
 # The variables above are already included below so no need to touch
 # these variables unless you really have to
 libJavaScriptCore_ladir = $(prefix)/include/webkit-1.0/JavaScriptCore
@@ -185,6 +185,7 @@ libWebCore_la_CFLAGS = \
 libWebCore_la_CPPFLAGS = \
        $(global_cppflags) \
        $(webcore_cppflags) \
+       $(javascriptcore_cppflags) \
        $(webkitgtk_cppflags)
 
 libWebCore_la_LIBADD = \
index 6925ea5..986c437 100644 (file)
@@ -1,3 +1,13 @@
+2008-03-21  Rodney Dawes  <dobey@wayofthemonkey.com>
+
+        Reviewed by Holger.
+
+        http://bugs.webkit.org/show_bug.cgi?id=17981
+
+        Add javascriptcore_cppflags to Programs_minidom_CPPFLAGS.
+
+        * GNUmakefile.am:
+
 2008-03-21  Alexey Proskuryakov  <ap@webkit.org>
 
         Reviewed by Oliver Hunt.
index c6c9d7e..823e4c2 100644 (file)
@@ -139,7 +139,7 @@ Programs_minidom_SOURCES = \
        JavaScriptCore/API/Node.c \
        JavaScriptCore/API/NodeList.c \
        JavaScriptCore/API/minidom.c
-Programs_minidom_CPPFLAGS = $(global_cppflags)
+Programs_minidom_CPPFLAGS = $(global_cppflags) $(javascriptcore_cppflags)
 Programs_minidom_CFLAGS = \
        $(global_cflags) \
        $(GLOBALDEPS_CFLAGS)
index 135c008..2c04ab3 100644 (file)
@@ -1,3 +1,14 @@
+2008-03-21  Rodney Dawes  <dobey@wayofthemonkey.com>
+
+        Reviewed by Holger.
+
+        http://bugs.webkit.org/show_bug.cgi?id=17981
+
+        Remove WebCore/ForwardingHeaders from cppflags as it is not needed,
+        and causes build problems with GTK+.
+
+        * GNUmakefile.am:
+
 2008-03-21  Dan Bernstein  <mitz@apple.com>
 
         Reviewed by Adele Peterson.
index b6338dd..1a21c93 100644 (file)
@@ -6,7 +6,6 @@ SVG_FEATURES :=
 
 webcore_cppflags += \
        -I$(srcdir)/WebCore \
-       -I$(srcdir)/WebCore/ForwardingHeaders \
        -I$(srcdir)/WebCore/platform \
        -I$(srcdir)/WebCore/platform/network \
        -I$(srcdir)/WebCore/platform/graphics \
index f7f6f16..09b6c33 100644 (file)
@@ -1,3 +1,13 @@
+2008-03-21  Rodney Dawes  <dobey@wayofthemonkey.com>
+
+        Reviewed by Holger.
+
+        http://bugs.webkit.org/show_bug.cgi?id=17981
+
+        Add webcore and javascriptcore cppflags to programs' _CPPFLAGS.
+
+        * GNUmakefile.am:
+
 2008-03-21  Adam Roben  <aroben@apple.com>
 
         Remove a non-working mirror from cygwin-downloader and add the ruby package
index 26758b5..2ba6400 100644 (file)
@@ -5,7 +5,8 @@ noinst_PROGRAMS += \
 # GtkLauncher
 Programs_GtkLauncher_CPPFLAGS = \
        -I$(srcdir)/WebKit/gtk \
-       $(global_cppflags)
+       $(global_cppflags) \
+       $(javascriptcore_cppflags)
 
 Programs_GtkLauncher_SOURCES = \
        WebKitTools/GtkLauncher/main.c
@@ -25,7 +26,8 @@ Programs_DumpRenderTree_CPPFLAGS = \
        -I$(srcdir)/WebKitTools/DumpRenderTree \
        -I$(srcdir)/WebKitTools/DumpRenderTree/gtk \
        -I$(srcdir)/WebKit/gtk \
-       $(global_cppflags)
+       $(global_cppflags) \
+       $(javascriptcore_cppflags)
 
 Programs_DumpRenderTree_SOURCES = \
        WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp \