.:
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: http://svn.webkit.org/repository/webkit/trunk@30540 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index 7e11e84..20c787f 100644
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -150,15 +150,30 @@
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
