.:
authordarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 24 Feb 2008 05:42:29 +0000 (05:42 +0000)
committerdarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 24 Feb 2008 05:42:29 +0000 (05:42 +0000)
        Rubber-stamped by Darin.

        * GNUmakefile.am: Add both GLOBALDEPS and WEBKITDEPS instead of DEPENDENCIES.
        * configure.ac: Break dependent modules into GLOBALDEPS and WEBKITDEPS.

JavaScriptCore:

        * GNUmakefile.am: Add GLOBALDEPS for testkjs and minidom.

WebKitTools:

        Rubber-stamped by Darin.

        * GNUmakefile.am: Add both GLOBALDEPS and WEBKITDEPS instead of DEPENDENCIES.

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

ChangeLog
GNUmakefile.am
JavaScriptCore/ChangeLog
JavaScriptCore/GNUmakefile.am
WebKitTools/ChangeLog
WebKitTools/GNUmakefile.am
configure.ac

index 24320db..68a5e3e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-23  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
+
+        Rubber-stamped by Darin.
+
+        * GNUmakefile.am: Add both GLOBALDEPS and WEBKITDEPS instead of DEPENDENCIES.
+        * configure.ac: Break dependent modules into GLOBALDEPS and WEBKITDEPS.
+
 2008-02-21  Alp Toker  <alp@atoker.com>
 
         Fix a configure script typo.
index 8e16585..6e9dce4 100644 (file)
@@ -102,11 +102,21 @@ libJavaScriptCore_la_SOURCES = \
        $(javascriptcore_built_sources) \
        $(javascriptcore_sources)
 
-libJavaScriptCore_la_LIBADD = $(ICU_LIBS) -lpthread
-
-libJavaScriptCore_la_CXXFLAGS = $(global_cxxflags) $(global_cflags) -fstrict-aliasing
-
-libJavaScriptCore_la_CFLAGS = $(global_cflags) -fstrict-aliasing
+libJavaScriptCore_la_LIBADD = 
+        $(ICU_LIBS) \
+        $(GLOBALDEPS_LIBS) \
+        -lpthread
+
+libJavaScriptCore_la_CXXFLAGS = \
+        $(global_cxxflags) \
+        $(global_cflags) \
+        $(GLOBALDEPS_CFLAGS) \
+        -fstrict-aliasing
+
+libJavaScriptCore_la_CFLAGS = \
+        $(global_cflags) \
+        $(GLOBALDEPS_CFLAGS) \
+        -fstrict-aliasing
 
 libJavaScriptCore_la_CPPFLAGS = \
        $(global_cppflags) \
@@ -151,7 +161,8 @@ libWebKitGtk_la_CXXFLAGS = \
        -fno-strict-aliasing \
        $(global_cxxflags) \
        $(global_cflags) \
-       $(DEPENDENCIES_CFLAGS) \
+       $(GLOBALDEPS_CFLAGS) \
+       $(WEBKITDEPS_CFLAGS) \
        $(LIBCURL_CFLAGS) \
        $(SQLITE3_CFLAGS) \
        $(GSTREAMER_CFLAGS) \
@@ -162,7 +173,8 @@ libWebKitGtk_la_CXXFLAGS = \
 libWebKitGtk_la_CFLAGS = \
        -fno-strict-aliasing \
        $(global_cflags) \
-       $(DEPENDENCIES_CFLAGS) \
+       $(GLOBALDEPS_CFLAGS) \
+       $(WEBKITDEPS_CFLAGS) \
        $(LIBCURL_CFLAGS) \
        $(SQLITE3_CFLAGS) \
        $(GSTREAMER_CFLAGS) \
@@ -178,7 +190,8 @@ libWebKitGtk_la_CPPFLAGS = \
 
 libWebKitGtk_la_LIBADD = libJavaScriptCore.la \
        $(webkitgtk_libadd) \
-       $(DEPENDENCIES_LIBS) \
+       $(GLOBALDEPS_LIBS) \
+       $(WEBKITDEPS_LIBS) \
        $(LIBCURL_LIBS) \
        $(ICU_LIBS) \
        $(SQLITE3_LIBS) \
index ec0e34a..ec7a29e 100644 (file)
@@ -1,3 +1,7 @@
+2008-02-23  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
+
+        * GNUmakefile.am: Add GLOBALDEPS for testkjs and minidom.
+
 2008-02-23  Darin Adler  <darin@apple.com>
 
         Reviewed by Anders.
index 7e11e84..20c787f 100644 (file)
@@ -150,15 +150,30 @@ Programs_minidom_SOURCES = \
        JavaScriptCore/API/NodeList.c \
        JavaScriptCore/API/minidom.c
 Programs_minidom_CPPFLAGS = $(global_cppflags)
-Programs_minidom_CXXFLAGS = $(global_cxxflags) $(global_cflags)
-Programs_minidom_LDADD = libJavaScriptCore.la
+Programs_minidom_CFLAGS = \
+        $(global_cflags) \
+        $(GLOBALDEPS_CFLAGS)
+Programs_minidom_CXXFLAGS = \
+        $(global_cxxflags) \
+        $(global_cflags) \
+        $(GLOBALDEPS_CFLAGS)
+Programs_minidom_LDADD = \
+         libJavaScriptCore.la \
+        $(GLOBALDEPS_LIBS) \
+        $(ICU_LIBS)
 Programs_minidom_LDFLAGS = -rpath $(CURDIR)/.libs
 
 # testkjs
 Programs_testkjs_SOURCES = JavaScriptCore/kjs/testkjs.cpp
 Programs_testkjs_CPPFLAGS = $(global_cppflags)
-Programs_testkjs_CXXFLAGS = $(global_cxxflags) $(global_cflags)
-Programs_testkjs_LDADD = libJavaScriptCore.la
+Programs_testkjs_CXXFLAGS = \
+        $(global_cxxflags) \
+        $(global_cflags) \
+        $(GLOBALDEPS_CFLAGS)
+Programs_testkjs_LDADD = \
+        libJavaScriptCore.la \
+        $(GLOBALDEPS_LIBS) \
+        $(ICU_LIBS)
 Programs_testkjs_LDFLAGS = -rpath $(CURDIR)/.libs
 
 # Clean rules for JavaScriptCore
index 5fefd6a..92384e3 100644 (file)
@@ -1,3 +1,9 @@
+2008-02-23  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
+
+        Rubber-stamped by Darin.
+
+        * GNUmakefile.am: Add both GLOBALDEPS and WEBKITDEPS instead of DEPENDENCIES.
+
 2008-02-23  David Kilzer  <ddkilzer@apple.com>
 
         Please clarify licensing for some files
index cc4c440..4eaa9a6 100644 (file)
@@ -11,11 +11,13 @@ Programs_GtkLauncher_SOURCES = \
        WebKitTools/GtkLauncher/main.c
 
 Programs_GtkLauncher_CFLAGS = \
-       $(DEPENDENCIES_CFLAGS) \
+        $(GLOBALDEPS_CFLAGS) \
+        $(WEBKITDEPS_CFLAGS) \
        $(global_cflags)
 
 Programs_GtkLauncher_LDADD = \
-       $(DEPENDENCIES_LIBS) \
+        $(GLOBALDEPS_LIBS) \
+        $(WEBKITDEPS_LIBS) \
        libJavaScriptCore.la \
        libWebKitGtk.la
 
@@ -38,12 +40,14 @@ Programs_DumpRenderTree_SOURCES = \
        WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp
 
 Programs_DumpRenderTree_CXXFLAGS = \
-       $(DEPENDENCIES_CFLAGS) \
+        $(GLOBALDEPS_CFLAGS) \
+        $(WEBKITDEPS_CFLAGS) \
        $(global_cxxflags) \
        $(global_cflags)
 
 Programs_DumpRenderTree_LDADD = \
-       $(DEPENDENCIES_LIBS) \
+        $(GLOBALDEPS_LIBS) \
+        $(WEBKITDEPS_LIBS) \
        libJavaScriptCore.la \
        libWebKitGtk.la
 
index 5a2a6b2..98dcf87 100644 (file)
@@ -203,19 +203,23 @@ SQLITE_REQUIRED_VERSION=3.0
 GSTREAMER_REQUIRED_VERSION=0.10
 GNOME_VFS_REQUIRED_VERSION=2.0
 
-PKG_CHECK_MODULES([DEPENDENCIES],
+PKG_CHECK_MODULES([GLOBALDEPS],
                   [glib-2.0 >= $GLIB_REQUIRED_VERSION
                   gobject-2.0 >= $GOBJECT_REQUIRED_VERSION
-                  gthread-2.0 >= $GTHREAD_REQUIRED_VERSION
-                  gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                  gthread-2.0 >= $GTHREAD_REQUIRED_VERSION])
+AC_SUBST([GLOBALDEPS_CFLAGS])
+AC_SUBST([GLOBALDEPS_LIBS])
+
+PKG_CHECK_MODULES([WEBKITDEPS],
+                  [gtk+-2.0 >= $GTK_REQUIRED_VERSION
                   pango >= $PANGO_REQUIRED_VERSION
                   cairo >= $CAIRO_REQUIRED_VERSION
                   cairo-ft,
                   fontconfig >= $FONTCONFIG_REQUIRED_VERSION
                   freetype2 >= $FREETYPE2_REQUIRED_VERSION
                   libxml-2.0 >= $LIBXML_REQUIRED_VERSION])
-AC_SUBST([DEPENDENCIES_CFLAGS])
-AC_SUBST([DEPENDENCIES_LIBS])
+AC_SUBST([WEBKITDEPS_CFLAGS])
+AC_SUBST([WEBKITDEPS_LIBS])
 
 # check whether to build with debugging enabled
 AC_MSG_CHECKING([whether to do a debug build])