From fcfd84efab9eec57e0e032f3bac063d50c8e0140 Mon Sep 17 00:00:00 2001 From: "bsmedberg%covad.net" Date: Wed, 21 Dec 2005 18:12:27 +0000 Subject: [PATCH] Reverting the activex parts of bug 320988 as well. The combination of gkgfx and no xpcom_core is bad too :-( git-svn-id: svn://10.0.0.236/trunk@186372 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/embedding/browser/activex/src/control/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/embedding/browser/activex/src/control/Makefile.in b/mozilla/embedding/browser/activex/src/control/Makefile.in index 1e68d94141c..672d10f1059 100644 --- a/mozilla/embedding/browser/activex/src/control/Makefile.in +++ b/mozilla/embedding/browser/activex/src/control/Makefile.in @@ -93,13 +93,13 @@ CPPSRCS = \ WindowCreator.cpp \ $(NULL) + EXTRA_DSO_LDOPTS = \ $(DIST)/lib/$(LIB_PREFIX)gkgfx.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)embed_base_s.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)ax_common_s.$(LIB_SUFFIX) \ $(MOZ_UNICHARUTIL_LIBS) \ - $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ - $(XPCOM_FROZEN_LDOPTS) \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL)