Merge jsdom and gklayout libraries (bug 232247). r=dbaron, sr=jst.

git-svn-id: svn://10.0.0.236/trunk@153136 18797224-902f-48f8-a5cc-f745e15eee43
2004-02-24 03:22:35 +00:00
parent 8059442ec8
commit b4a1781861
34 changed files with 473 additions and 1826 deletions
--- a/mozilla/modules/staticmod/Makefile.in
+++ b/mozilla/modules/staticmod/Makefile.in
@@ -108,8 +108,7 @@ EXTRA_DSO_LDOPTS += \
 		$(XPCOM_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(NSPR_LIBS) \
-		$(PNG_LIBS) \
-		-ljsdom
+		$(PNG_LIBS)
 endif

 ifdef MOZ_META_COMPONENTS
@@ -152,7 +151,7 @@ EXTRA_DSO_LDOPTS += \
 	$(MOZ_COMPONENT_LIBS) \
 	$(TK_LIBS) \
 	$(NULL)
-	
+
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 OS_LIBS	+= -framework QuickTime
 endif